Skip to content

Commit 1142296

Browse files
author
Akos Kitta
committed
chore: updated to Theia 1.35.0
Signed-off-by: Akos Kitta <[email protected]>
1 parent 80afd38 commit 1142296

23 files changed

+698
-1432
lines changed

Diff for: ‎arduino-ide-extension/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
"test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
2222
},
2323
"dependencies": {
24-
"@grpc/grpc-js": "^1.6.7",
25-
"@theia/application-package": "1.31.1",
26-
"@theia/core": "1.31.1",
27-
"@theia/debug": "1.31.1",
28-
"@theia/editor": "1.31.1",
29-
"@theia/electron": "1.31.1",
30-
"@theia/filesystem": "1.31.1",
31-
"@theia/keymaps": "1.31.1",
32-
"@theia/markers": "1.31.1",
33-
"@theia/messages": "1.31.1",
34-
"@theia/monaco": "1.31.1",
35-
"@theia/monaco-editor-core": "1.67.2",
36-
"@theia/navigator": "1.31.1",
37-
"@theia/outline-view": "1.31.1",
38-
"@theia/output": "1.31.1",
39-
"@theia/plugin-ext": "1.31.1",
40-
"@theia/preferences": "1.31.1",
41-
"@theia/scm": "1.31.1",
42-
"@theia/search-in-workspace": "1.31.1",
43-
"@theia/terminal": "1.31.1",
44-
"@theia/typehierarchy": "1.31.1",
45-
"@theia/workspace": "1.31.1",
24+
"@grpc/grpc-js": "^1.8.12",
25+
"@theia/application-package": "1.35.0",
26+
"@theia/core": "1.35.0",
27+
"@theia/debug": "1.35.0",
28+
"@theia/editor": "1.35.0",
29+
"@theia/electron": "1.35.0",
30+
"@theia/filesystem": "1.35.0",
31+
"@theia/keymaps": "1.35.0",
32+
"@theia/markers": "1.35.0",
33+
"@theia/messages": "1.35.0",
34+
"@theia/monaco": "1.35.0",
35+
"@theia/monaco-editor-core": "1.72.3",
36+
"@theia/navigator": "1.35.0",
37+
"@theia/outline-view": "1.35.0",
38+
"@theia/output": "1.35.0",
39+
"@theia/plugin-ext": "1.35.0",
40+
"@theia/preferences": "1.35.0",
41+
"@theia/scm": "1.35.0",
42+
"@theia/search-in-workspace": "1.35.0",
43+
"@theia/terminal": "1.35.0",
44+
"@theia/typehierarchy": "1.35.0",
45+
"@theia/workspace": "1.35.0",
4646
"@tippyjs/react": "^4.2.5",
4747
"@types/auth0-js": "^9.14.0",
4848
"@types/btoa": "^1.2.3",

Diff for: ‎arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

+1-40
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import '../../src/browser/style/index.css';
2-
import { Container, ContainerModule } from '@theia/core/shared/inversify';
2+
import { ContainerModule } from '@theia/core/shared/inversify';
33
import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
44
import { CommandContribution } from '@theia/core/lib/common/command';
55
import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
@@ -341,16 +341,6 @@ import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-
341341
import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution';
342342
import { DefaultDebugSessionFactory } from './theia/debug/debug-session-contribution';
343343
import { DebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
344-
import { DebugToolbar } from './theia/debug/debug-toolbar-widget';
345-
import { DebugToolBar as TheiaDebugToolbar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
346-
import { PluginMenuCommandAdapter } from './theia/plugin-ext/plugin-menu-command-adapter';
347-
import { PluginMenuCommandAdapter as TheiaPluginMenuCommandAdapter } from '@theia/plugin-ext/lib/main/browser/menus/plugin-menu-command-adapter';
348-
import { DebugSessionManager } from './theia/debug/debug-session-manager';
349-
import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
350-
import { DebugWidget } from '@theia/debug/lib/browser/view/debug-widget';
351-
import { DebugViewModel } from '@theia/debug/lib/browser/view/debug-view-model';
352-
import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-widget';
353-
import { DebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
354344
import { ConfigServiceClient } from './config/config-service-client';
355345
import { ValidateSketch } from './contributions/validate-sketch';
356346
import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
@@ -998,37 +988,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
998988
bind(TypeHierarchyContribution).toSelf().inSingletonScope();
999989
rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution);
1000990

1001-
// patched the debugger for `[email protected]`
1002-
// https://github.com/eclipse-theia/theia/issues/11871
1003-
// https://github.com/eclipse-theia/theia/issues/11879
1004-
// https://github.com/eclipse-theia/theia/issues/11880
1005-
// https://github.com/eclipse-theia/theia/issues/11885
1006-
// https://github.com/eclipse-theia/theia/issues/11886
1007-
// https://github.com/eclipse-theia/theia/issues/11916
1008-
// based on: https://github.com/eclipse-theia/theia/compare/master...kittaakos:theia:%2311871
1009991
bind(DefaultDebugSessionFactory).toSelf().inSingletonScope();
1010992
rebind(DebugSessionFactory).toService(DefaultDebugSessionFactory);
1011-
bind(DebugSessionManager).toSelf().inSingletonScope();
1012-
rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
1013-
bind(DebugToolbar).toSelf().inSingletonScope();
1014-
rebind(TheiaDebugToolbar).toService(DebugToolbar);
1015-
bind(PluginMenuCommandAdapter).toSelf().inSingletonScope();
1016-
rebind(TheiaPluginMenuCommandAdapter).toService(PluginMenuCommandAdapter);
1017-
bind(WidgetFactory)
1018-
.toDynamicValue(({ container }) => ({
1019-
id: DebugWidget.ID,
1020-
createWidget: () => {
1021-
const child = new Container({ defaultScope: 'Singleton' });
1022-
child.parent = container;
1023-
child.bind(DebugViewModel).toSelf();
1024-
child.bind(DebugToolbar).toSelf(); // patched toolbar
1025-
child.bind(DebugSessionWidget).toSelf();
1026-
child.bind(DebugConfigurationWidget).toSelf();
1027-
child.bind(DebugWidget).toSelf();
1028-
return child.get(DebugWidget);
1029-
},
1030-
}))
1031-
.inSingletonScope();
1032993

1033994
bind(SidebarBottomMenuWidget).toSelf();
1034995
rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget);

Diff for: ‎arduino-ide-extension/src/browser/contributions/examples.ts

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import * as PQueue from 'p-queue';
22
import { inject, injectable } from '@theia/core/shared/inversify';
33
import { CommandHandler, CommandService } from '@theia/core/lib/common/command';
4-
import {
5-
MenuPath,
6-
CompositeMenuNode,
7-
SubMenuOptions,
8-
} from '@theia/core/lib/common/menu';
4+
import { MenuPath, SubMenuOptions } from '@theia/core/lib/common/menu';
95
import {
106
Disposable,
117
DisposableCollection,
@@ -143,19 +139,6 @@ export abstract class Examples extends SketchContribution {
143139
}): void;
144140

145141
override registerMenus(registry: MenuModelRegistry): void {
146-
try {
147-
// This is a hack the ensures the desired menu ordering! We cannot use https://github.com/eclipse-theia/theia/pull/8377 due to ATL-222.
148-
const index = ArduinoMenus.FILE__EXAMPLES_SUBMENU.length - 1;
149-
const menuId = ArduinoMenus.FILE__EXAMPLES_SUBMENU[index];
150-
const groupPath =
151-
index === 0 ? [] : ArduinoMenus.FILE__EXAMPLES_SUBMENU.slice(0, index);
152-
const parent: CompositeMenuNode = (registry as any).findGroup(groupPath);
153-
const examples = new CompositeMenuNode(menuId, '', { order: '4' });
154-
parent.addNode(examples);
155-
} catch (e) {
156-
console.error(e);
157-
console.warn('Could not patch menu ordering.');
158-
}
159142
// Registering the same submenu multiple times has no side-effect.
160143
// TODO: unregister submenu? https://github.com/eclipse-theia/theia/issues/7300
161144
registry.registerSubmenu(

Diff for: ‎arduino-ide-extension/src/browser/theia/debug/debug-action.tsx

-29
This file was deleted.

Diff for: ‎arduino-ide-extension/src/browser/theia/debug/debug-session-contribution.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ export class DefaultDebugSessionFactory extends TheiaDefaultDebugSessionFactory
4343
this.messages,
4444
this.fileService,
4545
this.debugContributionProvider,
46-
this.workspaceService
46+
this.workspaceService,
47+
2_000
4748
);
4849
}
4950
}

Diff for: ‎arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts

-120
This file was deleted.

0 commit comments

Comments
 (0)