From 4c3becd3e8bc6fdb3ba4262b9655fc0147496178 Mon Sep 17 00:00:00 2001 From: jbicker Date: Thu, 13 Jun 2019 10:10:29 +0200 Subject: [PATCH] Sidebar with Filenavigator, Librarylist and Boardlist does not get rendered initially anymore. Signed-off-by: jbicker --- arduino-ide-extension/package.json | 4 +++- .../src/browser/arduino-frontend-module.ts | 9 +++++---- .../boards/boards-widget-frontend-contribution.ts | 2 +- .../customization/silent-navigator-contribution.ts | 10 ++++++++++ .../library/list-widget-frontend-contribution.ts | 2 +- .../src/browser/menu/browser-arduino-menu-module.ts | 8 ++++++++ ...ntend-module.ts => electron-arduino-menu-module.ts} | 0 7 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 arduino-ide-extension/src/browser/customization/silent-navigator-contribution.ts create mode 100644 arduino-ide-extension/src/browser/menu/browser-arduino-menu-module.ts rename arduino-ide-extension/src/electron-browser/{electron-arduino-frontend-module.ts => electron-arduino-menu-module.ts} (100%) diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json index b821ae6b..3e8bebf9 100644 --- a/arduino-ide-extension/package.json +++ b/arduino-ide-extension/package.json @@ -16,6 +16,7 @@ "@theia/monaco": "next", "@theia/outline-view": "next", "@theia/workspace": "next", + "@theia/navigator": "next", "p-queue": "^5.0.0" }, "scripts": { @@ -46,7 +47,8 @@ "frontend": "lib/browser/arduino-frontend-module" }, { - "frontendElectron": "lib/electron-browser/electron-arduino-frontend-module" + "frontend": "lib/browser/menu/browser-arduino-menu-module", + "frontendElectron": "lib/electron-browser/electron-arduino-menu-module" } ] } diff --git a/arduino-ide-extension/src/browser/arduino-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-frontend-module.ts index 7d1a1d6b..820be823 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-module.ts +++ b/arduino-ide-extension/src/browser/arduino-frontend-module.ts @@ -33,8 +33,8 @@ import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline import { SilentOutlineViewContribution } from './customization/silent-outline-contribution'; import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution'; import { SilentProblemContribution } from './customization/silent-problem-contribution'; -import { BrowserMenuBarContribution } from '@theia/core/lib/browser/menu/browser-menu-plugin'; -import { ArduinoMenuContribution } from './menu/arduino-menu-contribution'; +import { SilentNavigatorContribution } from './customization/silent-navigator-contribution'; +import {FileNavigatorContribution} from '@theia/navigator/lib/browser/navigator-contribution'; export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => { // Commands and toolbar items @@ -43,8 +43,6 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution); bind(MenuContribution).to(ArduinoFileMenuContribution).inSingletonScope(); - rebind(BrowserMenuBarContribution).to(ArduinoMenuContribution); - // `ino` TextMate grammar bind(LanguageGrammarDefinitionContribution).to(ArduinoLanguageGrammarContribution).inSingletonScope(); @@ -110,4 +108,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un bind(OutlineViewContribution).to(SilentOutlineViewContribution).inSingletonScope(); unbind(ProblemContribution); bind(ProblemContribution).to(SilentProblemContribution).inSingletonScope(); + + unbind(FileNavigatorContribution); + bind(FileNavigatorContribution).to(SilentNavigatorContribution).inSingletonScope(); }); diff --git a/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts b/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts index d0406ecc..703dd0ad 100644 --- a/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts @@ -8,7 +8,7 @@ import { BoardsListWidget } from './boards-list-widget'; export abstract class ListWidgetFrontendContribution extends AbstractViewContribution implements FrontendApplicationContribution { async initializeLayout(): Promise { - await this.openView(); + // await this.openView(); } } diff --git a/arduino-ide-extension/src/browser/customization/silent-navigator-contribution.ts b/arduino-ide-extension/src/browser/customization/silent-navigator-contribution.ts new file mode 100644 index 00000000..d7d42131 --- /dev/null +++ b/arduino-ide-extension/src/browser/customization/silent-navigator-contribution.ts @@ -0,0 +1,10 @@ +import { injectable } from "inversify"; +import { FileNavigatorContribution } from "@theia/navigator/lib/browser/navigator-contribution"; +import { FrontendApplication } from "@theia/core/lib/browser"; + +@injectable() +export class SilentNavigatorContribution extends FileNavigatorContribution { + async initializeLayout(app: FrontendApplication): Promise { + // await this.openView(); + } +} \ No newline at end of file diff --git a/arduino-ide-extension/src/browser/library/list-widget-frontend-contribution.ts b/arduino-ide-extension/src/browser/library/list-widget-frontend-contribution.ts index 36e6794f..38ac4347 100644 --- a/arduino-ide-extension/src/browser/library/list-widget-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/library/list-widget-frontend-contribution.ts @@ -8,7 +8,7 @@ import { LibraryListWidget } from './library-list-widget'; export abstract class ListWidgetFrontendContribution extends AbstractViewContribution implements FrontendApplicationContribution { async initializeLayout(): Promise { - await this.openView(); + // await this.openView(); } } diff --git a/arduino-ide-extension/src/browser/menu/browser-arduino-menu-module.ts b/arduino-ide-extension/src/browser/menu/browser-arduino-menu-module.ts new file mode 100644 index 00000000..340721ac --- /dev/null +++ b/arduino-ide-extension/src/browser/menu/browser-arduino-menu-module.ts @@ -0,0 +1,8 @@ +import { BrowserMenuBarContribution } from '@theia/core/lib/browser/menu/browser-menu-plugin'; +import { ArduinoMenuContribution } from './arduino-menu-contribution'; +import { ContainerModule, interfaces } from 'inversify'; + +export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind) => { + unbind(BrowserMenuBarContribution); + bind(BrowserMenuBarContribution).to(ArduinoMenuContribution).inSingletonScope(); +}) diff --git a/arduino-ide-extension/src/electron-browser/electron-arduino-frontend-module.ts b/arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts similarity index 100% rename from arduino-ide-extension/src/electron-browser/electron-arduino-frontend-module.ts rename to arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts