chore: updated to Theia 1.35.0

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

arduino-ide-extension/package.json

@@ -21,28 +21,28 @@
  "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
  },
  "dependencies": {
- "@grpc/grpc-js": "^1.6.7",
- "@theia/application-package": "1.31.1",
- "@theia/core": "1.31.1",
- "@theia/debug": "1.31.1",
- "@theia/editor": "1.31.1",
- "@theia/electron": "1.31.1",
- "@theia/filesystem": "1.31.1",
- "@theia/keymaps": "1.31.1",
- "@theia/markers": "1.31.1",
- "@theia/messages": "1.31.1",
- "@theia/monaco": "1.31.1",
- "@theia/monaco-editor-core": "1.67.2",
- "@theia/navigator": "1.31.1",
- "@theia/outline-view": "1.31.1",
- "@theia/output": "1.31.1",
- "@theia/plugin-ext": "1.31.1",
- "@theia/preferences": "1.31.1",
- "@theia/scm": "1.31.1",
- "@theia/search-in-workspace": "1.31.1",
- "@theia/terminal": "1.31.1",
- "@theia/typehierarchy": "1.31.1",
- "@theia/workspace": "1.31.1",
+ "@grpc/grpc-js": "^1.8.12",
+ "@theia/application-package": "1.35.0",
+ "@theia/core": "1.35.0",
+ "@theia/debug": "1.35.0",
+ "@theia/editor": "1.35.0",
+ "@theia/electron": "1.35.0",
+ "@theia/filesystem": "1.35.0",
+ "@theia/keymaps": "1.35.0",
+ "@theia/markers": "1.35.0",
+ "@theia/messages": "1.35.0",
+ "@theia/monaco": "1.35.0",
+ "@theia/monaco-editor-core": "1.72.3",
+ "@theia/navigator": "1.35.0",
+ "@theia/outline-view": "1.35.0",
+ "@theia/output": "1.35.0",
+ "@theia/plugin-ext": "1.35.0",
+ "@theia/preferences": "1.35.0",
+ "@theia/scm": "1.35.0",
+ "@theia/search-in-workspace": "1.35.0",
+ "@theia/terminal": "1.35.0",
+ "@theia/typehierarchy": "1.35.0",
+ "@theia/workspace": "1.35.0",
  "@tippyjs/react": "^4.2.5",
  "@types/auth0-js": "^9.14.0",
  "@types/btoa": "^1.2.3",

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

@@ -1,5 +1,5 @@
 import '../../src/browser/style/index.css';
-import { Container, ContainerModule } from '@theia/core/shared/inversify';
+import { ContainerModule } from '@theia/core/shared/inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
 import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
@@ -338,16 +338,6 @@ import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-
 import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution';
 import { DefaultDebugSessionFactory } from './theia/debug/debug-session-contribution';
 import { DebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
-import { DebugToolbar } from './theia/debug/debug-toolbar-widget';
-import { DebugToolBar as TheiaDebugToolbar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
-import { PluginMenuCommandAdapter } from './theia/plugin-ext/plugin-menu-command-adapter';
-import { PluginMenuCommandAdapter as TheiaPluginMenuCommandAdapter } from '@theia/plugin-ext/lib/main/browser/menus/plugin-menu-command-adapter';
-import { DebugSessionManager } from './theia/debug/debug-session-manager';
-import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-import { DebugWidget } from '@theia/debug/lib/browser/view/debug-widget';
-import { DebugViewModel } from '@theia/debug/lib/browser/view/debug-view-model';
-import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-widget';
-import { DebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
 import { ConfigServiceClient } from './config/config-service-client';
 import { ValidateSketch } from './contributions/validate-sketch';
 import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
@@ -995,37 +985,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
  bind(TypeHierarchyContribution).toSelf().inSingletonScope();
  rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution);
 
- // patched the debugger for `cortex-debug@1.5.1`
- // https://github.com/eclipse-theia/theia/issues/11871
- // https://github.com/eclipse-theia/theia/issues/11879
- // https://github.com/eclipse-theia/theia/issues/11880
- // https://github.com/eclipse-theia/theia/issues/11885
- // https://github.com/eclipse-theia/theia/issues/11886
- // https://github.com/eclipse-theia/theia/issues/11916
- // based on: https://github.com/eclipse-theia/theia/compare/master...kittaakos:theia:%2311871
  bind(DefaultDebugSessionFactory).toSelf().inSingletonScope();
  rebind(DebugSessionFactory).toService(DefaultDebugSessionFactory);
- bind(DebugSessionManager).toSelf().inSingletonScope();
- rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
- bind(DebugToolbar).toSelf().inSingletonScope();
- rebind(TheiaDebugToolbar).toService(DebugToolbar);
- bind(PluginMenuCommandAdapter).toSelf().inSingletonScope();
- rebind(TheiaPluginMenuCommandAdapter).toService(PluginMenuCommandAdapter);
- bind(WidgetFactory)
- .toDynamicValue(({ container }) => ({
- id: DebugWidget.ID,
- createWidget: () => {
- const child = new Container({ defaultScope: 'Singleton' });
- child.parent = container;
- child.bind(DebugViewModel).toSelf();
- child.bind(DebugToolbar).toSelf(); // patched toolbar
- child.bind(DebugSessionWidget).toSelf();
- child.bind(DebugConfigurationWidget).toSelf();
- child.bind(DebugWidget).toSelf();
- return child.get(DebugWidget);
- },
- }))
- .inSingletonScope();
 
  bind(SidebarBottomMenuWidget).toSelf();
  rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget);

arduino-ide-extension/src/browser/contributions/examples.ts

@@ -1,11 +1,7 @@
 import * as PQueue from 'p-queue';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { CommandHandler, CommandService } from '@theia/core/lib/common/command';
-import {
- MenuPath,
- CompositeMenuNode,
- SubMenuOptions,
-} from '@theia/core/lib/common/menu';
+import { MenuPath, SubMenuOptions } from '@theia/core/lib/common/menu';
 import {
  Disposable,
  DisposableCollection,
@@ -143,19 +139,6 @@ export abstract class Examples extends SketchContribution {
  }): void;
 
  override registerMenus(registry: MenuModelRegistry): void {
- try {
- // 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.
- const index = ArduinoMenus.FILE__EXAMPLES_SUBMENU.length - 1;
- const menuId = ArduinoMenus.FILE__EXAMPLES_SUBMENU[index];
- const groupPath =
- index === 0 ? [] : ArduinoMenus.FILE__EXAMPLES_SUBMENU.slice(0, index);
- const parent: CompositeMenuNode = (registry as any).findGroup(groupPath);
- const examples = new CompositeMenuNode(menuId, '', { order: '4' });
- parent.addNode(examples);
- } catch (e) {
- console.error(e);
- console.warn('Could not patch menu ordering.');
- }
  // Registering the same submenu multiple times has no side-effect.
  // TODO: unregister submenu? https://github.com/eclipse-theia/theia/issues/7300
  registry.registerSubmenu(

arduino-ide-extension/src/browser/theia/debug/debug-session-contribution.ts

@@ -43,7 +43,8 @@ export class DefaultDebugSessionFactory extends TheiaDefaultDebugSessionFactory
  this.messages,
  this.fileService,
  this.debugContributionProvider,
- this.workspaceService
+ this.workspaceService,
+ 2_000
  );
  }
 }