Skip to content

Commit 670d823

Browse files
chore: use [email protected]
1 parent cb91633 commit 670d823

File tree

11 files changed

+384
-697
lines changed

11 files changed

+384
-697
lines changed

arduino-ide-extension/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@
2424
},
2525
"dependencies": {
2626
"@grpc/grpc-js": "^1.8.14",
27-
"@theia/application-package": "1.55.1",
28-
"@theia/core": "1.55.1",
29-
"@theia/debug": "1.55.1",
30-
"@theia/editor": "1.55.1",
31-
"@theia/electron": "1.55.1",
32-
"@theia/filesystem": "1.55.1",
33-
"@theia/keymaps": "1.55.1",
34-
"@theia/markers": "1.55.1",
35-
"@theia/messages": "1.55.1",
36-
"@theia/monaco": "1.55.1",
27+
"@theia/application-package": "1.56.0",
28+
"@theia/core": "1.56.0",
29+
"@theia/debug": "1.56.0",
30+
"@theia/editor": "1.56.0",
31+
"@theia/electron": "1.56.0",
32+
"@theia/filesystem": "1.56.0",
33+
"@theia/keymaps": "1.56.0",
34+
"@theia/markers": "1.56.0",
35+
"@theia/messages": "1.56.0",
36+
"@theia/monaco": "1.56.0",
3737
"@theia/monaco-editor-core": "1.83.101",
38-
"@theia/navigator": "1.55.1",
39-
"@theia/outline-view": "1.55.1",
40-
"@theia/output": "1.55.1",
41-
"@theia/plugin-ext": "1.55.1",
42-
"@theia/plugin-ext-vscode": "1.55.1",
43-
"@theia/preferences": "1.55.1",
44-
"@theia/scm": "1.55.1",
45-
"@theia/search-in-workspace": "1.55.1",
46-
"@theia/terminal": "1.55.1",
47-
"@theia/test": "1.55.1",
48-
"@theia/typehierarchy": "1.55.1",
49-
"@theia/workspace": "1.55.1",
38+
"@theia/navigator": "1.56.0",
39+
"@theia/outline-view": "1.56.0",
40+
"@theia/output": "1.56.0",
41+
"@theia/plugin-ext": "1.56.0",
42+
"@theia/plugin-ext-vscode": "1.56.0",
43+
"@theia/preferences": "1.56.0",
44+
"@theia/scm": "1.56.0",
45+
"@theia/search-in-workspace": "1.56.0",
46+
"@theia/terminal": "1.56.0",
47+
"@theia/test": "1.56.0",
48+
"@theia/typehierarchy": "1.56.0",
49+
"@theia/workspace": "1.56.0",
5050
"@tippyjs/react": "^4.2.5",
5151
"@types/auth0-js": "^9.21.3",
5252
"@types/btoa": "^1.2.3",

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

+2-55
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import '../../src/browser/style/index.css';
2-
import {
3-
Container,
4-
ContainerModule,
5-
interfaces,
6-
} from '@theia/core/shared/inversify';
2+
import { Container, ContainerModule } from '@theia/core/shared/inversify';
73
import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
84
import { CommandContribution } from '@theia/core/lib/common/command';
95
import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
@@ -55,8 +51,6 @@ import {
5551
DockPanelRenderer as TheiaDockPanelRenderer,
5652
TabBarRendererFactory,
5753
ContextMenuRenderer,
58-
createTreeContainer,
59-
TreeWidget,
6054
} from '@theia/core/lib/browser';
6155
import { MenuContribution } from '@theia/core/lib/common/menu';
6256
import {
@@ -373,15 +367,7 @@ import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-
373367
import { DebugConfigurationWidget } from './theia/debug/debug-configuration-widget';
374368
import { DebugConfigurationWidget as TheiaDebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
375369
import { DebugToolBar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
376-
import {
377-
PluginTree,
378-
PluginTreeModel,
379-
TreeViewWidgetOptions,
380-
VIEW_ITEM_CONTEXT_MENU,
381-
} from '@theia/plugin-ext/lib/main/browser/view/tree-view-widget';
382-
import { TreeViewDecoratorService } from '@theia/plugin-ext/lib/main/browser/view/tree-view-decorator-service';
383-
import { PLUGIN_VIEW_DATA_FACTORY_ID } from '@theia/plugin-ext/lib/main/browser/view/plugin-view-registry';
384-
import { TreeViewWidget } from './theia/plugin-ext/tree-view-widget';
370+
385371
import {
386372
VersionWelcomeDialog,
387373
VersionWelcomeDialogProps,
@@ -1090,46 +1076,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
10901076
TerminalFrontendContribution
10911077
);
10921078

1093-
bindViewsWelcome_TheiaGH14309({ bind, widget: TreeViewWidget });
1094-
10951079
// Hides the Test Explorer from the side-bar
10961080
bind(TestViewContribution).toSelf().inSingletonScope();
10971081
rebind(TheiaTestViewContribution).toService(TestViewContribution);
10981082
});
1099-
1100-
// Align the viewsWelcome rendering with VS Code (https://github.com/eclipse-theia/theia/issues/14309)
1101-
// Copied from Theia code but with customized TreeViewWidget with the customized viewsWelcome rendering
1102-
// https://github.com/eclipse-theia/theia/blob/0c5f69455d9ee355b1a7ca510ffa63d2b20f0c77/packages/plugin-ext/src/main/browser/plugin-ext-frontend-module.ts#L159-L181
1103-
function bindViewsWelcome_TheiaGH14309({
1104-
bind,
1105-
widget,
1106-
}: {
1107-
bind: interfaces.Bind;
1108-
widget: interfaces.Newable<TreeWidget>;
1109-
}) {
1110-
bind(WidgetFactory)
1111-
.toDynamicValue(({ container }) => ({
1112-
id: PLUGIN_VIEW_DATA_FACTORY_ID,
1113-
createWidget: (options: TreeViewWidgetOptions) => {
1114-
const props = {
1115-
contextMenuPath: VIEW_ITEM_CONTEXT_MENU,
1116-
expandOnlyOnExpansionToggleClick: true,
1117-
expansionTogglePadding: 22,
1118-
globalSelection: true,
1119-
leftPadding: 8,
1120-
search: true,
1121-
multiSelect: options.multiSelect,
1122-
};
1123-
const child = createTreeContainer(container, {
1124-
props,
1125-
tree: PluginTree,
1126-
model: PluginTreeModel,
1127-
widget,
1128-
decoratorService: TreeViewDecoratorService,
1129-
});
1130-
child.bind(TreeViewWidgetOptions).toConstantValue(options);
1131-
return child.get(TreeWidget);
1132-
},
1133-
}))
1134-
.inSingletonScope();
1135-
}

arduino-ide-extension/src/browser/boards/boards-config-dialog.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ export class BoardsConfigDialog extends ReactDialog<BoardsConfigDialogState> {
9898
}
9999

100100
override async open(
101+
disposeOnResolve = true,
101102
params?: EditBoardsConfigActionParams
102103
): Promise<BoardsConfig | undefined> {
103104
this._searchSet = undefined;
@@ -119,7 +120,7 @@ export class BoardsConfigDialog extends ReactDialog<BoardsConfigDialogState> {
119120
this._searchSet = params.searchSet.slice();
120121
}
121122
}
122-
return super.open();
123+
return super.open(disposeOnResolve);
123124
}
124125

125126
protected override onAfterAttach(msg: Message): void {

arduino-ide-extension/src/browser/contributions/check-for-ide-updates.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class CheckForIDEUpdates extends Contribution {
7070
SKIP_IDE_VERSION
7171
);
7272
if (versionToSkip === updateInfo.version) return;
73-
this.updaterDialog.open(updateInfo);
73+
this.updaterDialog.open(true, updateInfo);
7474
})
7575
.catch((e) => {
7676
this.messageService.error(

arduino-ide-extension/src/browser/contributions/open-boards-config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class OpenBoardsConfig extends Contribution {
1212
override registerCommands(registry: CommandRegistry): void {
1313
registry.registerCommand(OpenBoardsConfig.Commands.OPEN_DIALOG, {
1414
execute: async (params?: EditBoardsConfigActionParams) =>
15-
this.boardsConfigDialog.open(params),
15+
this.boardsConfigDialog.open(true, params),
1616
});
1717
}
1818
}

arduino-ide-extension/src/browser/dialogs/ide-updater/ide-updater-dialog.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
261261
}
262262

263263
override async open(
264+
disposeOnResolve = true,
264265
data: UpdateInfo | undefined = undefined
265266
): Promise<UpdateInfo | undefined> {
266267
if (data && data.version) {
@@ -271,7 +272,7 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
271272
error: undefined,
272273
});
273274
this.updateInfo = data;
274-
return super.open();
275+
return super.open(disposeOnResolve);
275276
}
276277
}
277278

arduino-ide-extension/src/browser/ide-updater/ide-updater-commands.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class IDEUpdaterCommands implements CommandContribution {
3030
try {
3131
const updateInfo = await this.updater.checkForUpdates(initialCheck);
3232
if (!!updateInfo) {
33-
this.updaterDialog.open(updateInfo);
33+
this.updaterDialog.open(true, updateInfo);
3434
} else {
3535
this.messageService.info(
3636
nls.localize(

0 commit comments

Comments
 (0)