Skip to content

Commit 4c3becd

Browse files
committed
Sidebar with Filenavigator, Librarylist and Boardlist does not get rendered initially anymore.
Signed-off-by: jbicker <[email protected]>
1 parent 088951a commit 4c3becd

7 files changed

+28
-7
lines changed

arduino-ide-extension/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@theia/monaco": "next",
1717
"@theia/outline-view": "next",
1818
"@theia/workspace": "next",
19+
"@theia/navigator": "next",
1920
"p-queue": "^5.0.0"
2021
},
2122
"scripts": {
@@ -46,7 +47,8 @@
4647
"frontend": "lib/browser/arduino-frontend-module"
4748
},
4849
{
49-
"frontendElectron": "lib/electron-browser/electron-arduino-frontend-module"
50+
"frontend": "lib/browser/menu/browser-arduino-menu-module",
51+
"frontendElectron": "lib/electron-browser/electron-arduino-menu-module"
5052
}
5153
]
5254
}

arduino-ide-extension/src/browser/arduino-frontend-module.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline
3333
import { SilentOutlineViewContribution } from './customization/silent-outline-contribution';
3434
import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
3535
import { SilentProblemContribution } from './customization/silent-problem-contribution';
36-
import { BrowserMenuBarContribution } from '@theia/core/lib/browser/menu/browser-menu-plugin';
37-
import { ArduinoMenuContribution } from './menu/arduino-menu-contribution';
36+
import { SilentNavigatorContribution } from './customization/silent-navigator-contribution';
37+
import {FileNavigatorContribution} from '@theia/navigator/lib/browser/navigator-contribution';
3838

3939
export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => {
4040
// Commands and toolbar items
@@ -43,8 +43,6 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
4343
bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution);
4444
bind(MenuContribution).to(ArduinoFileMenuContribution).inSingletonScope();
4545

46-
rebind(BrowserMenuBarContribution).to(ArduinoMenuContribution);
47-
4846
// `ino` TextMate grammar
4947
bind(LanguageGrammarDefinitionContribution).to(ArduinoLanguageGrammarContribution).inSingletonScope();
5048

@@ -110,4 +108,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
110108
bind(OutlineViewContribution).to(SilentOutlineViewContribution).inSingletonScope();
111109
unbind(ProblemContribution);
112110
bind(ProblemContribution).to(SilentProblemContribution).inSingletonScope();
111+
112+
unbind(FileNavigatorContribution);
113+
bind(FileNavigatorContribution).to(SilentNavigatorContribution).inSingletonScope();
113114
});

arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { BoardsListWidget } from './boards-list-widget';
88
export abstract class ListWidgetFrontendContribution extends AbstractViewContribution<ListWidget> implements FrontendApplicationContribution {
99

1010
async initializeLayout(): Promise<void> {
11-
await this.openView();
11+
// await this.openView();
1212
}
1313

1414
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { injectable } from "inversify";
2+
import { FileNavigatorContribution } from "@theia/navigator/lib/browser/navigator-contribution";
3+
import { FrontendApplication } from "@theia/core/lib/browser";
4+
5+
@injectable()
6+
export class SilentNavigatorContribution extends FileNavigatorContribution {
7+
async initializeLayout(app: FrontendApplication): Promise<void> {
8+
// await this.openView();
9+
}
10+
}

arduino-ide-extension/src/browser/library/list-widget-frontend-contribution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { LibraryListWidget } from './library-list-widget';
88
export abstract class ListWidgetFrontendContribution extends AbstractViewContribution<ListWidget> implements FrontendApplicationContribution {
99

1010
async initializeLayout(): Promise<void> {
11-
await this.openView();
11+
// await this.openView();
1212
}
1313

1414
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { BrowserMenuBarContribution } from '@theia/core/lib/browser/menu/browser-menu-plugin';
2+
import { ArduinoMenuContribution } from './arduino-menu-contribution';
3+
import { ContainerModule, interfaces } from 'inversify';
4+
5+
export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind) => {
6+
unbind(BrowserMenuBarContribution);
7+
bind(BrowserMenuBarContribution).to(ArduinoMenuContribution).inSingletonScope();
8+
})

0 commit comments

Comments
 (0)