Update Theia to 1.22.1

msujew · msujew · commit bbeeb08f1acb · 2022-01-31T18:38:55.000+01:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -37,6 +37,13 @@
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std"
     },
+    {
+      "type": "chrome",
+      "request": "attach",
+      "name": "Attach to Electron Frontend",
+      "port": 9222,
+      "webRoot": "${workspaceFolder}/electron-app"
+    },
     {
       "type": "node",
       "request": "launch",
@@ -104,5 +111,14 @@
       "program": "${workspaceRoot}/electron/packager/index.js",
       "cwd": "${workspaceFolder}/electron/packager"
     }
+  ],
+  "compounds": [
+    {
+      "name": "Launch Electron Backend & Frontend",
+      "configurations": [
+        "App (Electron)",
+        "Attach to Electron Frontend"
+      ]
+    }
   ]
 }
diff --git a/BUILDING.md b/BUILDING.md
@@ -57,9 +57,7 @@ Once you have all the tools installed, you can build the editor following these
 
 3. Rebuild the electron dependencies
     ```sh
-    cd electron-app
-    yarn theia rebuild:electron
-    cd ..
+    yarn rebuild:electron
     ```
 
 4. Start the application
diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json
@@ -21,22 +21,23 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.3.7",
-    "@theia/application-package": "1.19.0",
-    "@theia/core": "1.19.0",
-    "@theia/editor": "1.19.0",
-    "@theia/editor-preview": "1.19.0",
-    "@theia/filesystem": "1.19.0",
-    "@theia/git": "1.19.0",
-    "@theia/keymaps": "1.19.0",
-    "@theia/markers": "1.19.0",
-    "@theia/monaco": "1.19.0",
-    "@theia/navigator": "1.19.0",
-    "@theia/outline-view": "1.19.0",
-    "@theia/output": "1.19.0",
-    "@theia/preferences": "1.19.0",
-    "@theia/search-in-workspace": "1.19.0",
-    "@theia/terminal": "1.19.0",
-    "@theia/workspace": "1.19.0",
+    "@theia/application-package": "1.22.1",
+    "@theia/core": "1.22.1",
+    "@theia/editor": "1.22.1",
+    "@theia/editor-preview": "1.22.1",
+    "@theia/electron": "1.22.1",
+    "@theia/filesystem": "1.22.1",
+    "@theia/git": "1.22.1",
+    "@theia/keymaps": "1.22.1",
+    "@theia/markers": "1.22.1",
+    "@theia/monaco": "1.22.1",
+    "@theia/navigator": "1.22.1",
+    "@theia/outline-view": "1.22.1",
+    "@theia/output": "1.22.1",
+    "@theia/preferences": "1.22.1",
+    "@theia/search-in-workspace": "1.22.1",
+    "@theia/terminal": "1.22.1",
+    "@theia/workspace": "1.22.1",
     "@tippyjs/react": "^4.2.5",
     "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",
diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
@@ -1,6 +1,6 @@
 import { inject, injectable, postConstruct } from 'inversify';
 import * as React from 'react';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import {
   BoardsService,
   SketchesService,
diff --git a/arduino-ide-extension/src/browser/contributions/about.ts b/arduino-ide-extension/src/browser/contributions/about.ts
@@ -1,6 +1,6 @@
 import { inject, injectable } from 'inversify';
 import * as moment from 'moment';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { isOSX, isWindows } from '@theia/core/lib/common/os';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
diff --git a/arduino-ide-extension/src/browser/contributions/add-file.ts b/arduino-ide-extension/src/browser/contributions/add-file.ts
@@ -1,5 +1,5 @@
 import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   SketchContribution,
diff --git a/arduino-ide-extension/src/browser/contributions/add-zip-library.ts b/arduino-ide-extension/src/browser/contributions/add-zip-library.ts
@@ -1,5 +1,5 @@
 import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { ConfirmDialog } from '@theia/core/lib/browser/dialogs';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
diff --git a/arduino-ide-extension/src/browser/contributions/archive-sketch.ts b/arduino-ide-extension/src/browser/contributions/archive-sketch.ts
@@ -1,5 +1,5 @@
 import { injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import * as dateFormat from 'dateformat';
 import URI from '@theia/core/lib/common/uri';
 import { ArduinoMenus } from '../menu/arduino-menus';
diff --git a/arduino-ide-extension/src/browser/contributions/board-selection.ts b/arduino-ide-extension/src/browser/contributions/board-selection.ts
@@ -1,5 +1,5 @@
 import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import {
   DisposableCollection,
diff --git a/arduino-ide-extension/src/browser/contributions/close.ts b/arduino-ide-extension/src/browser/contributions/close.ts
@@ -1,6 +1,6 @@
 import { inject, injectable } from 'inversify';
 import { toArray } from '@phosphor/algorithm';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
diff --git a/arduino-ide-extension/src/browser/contributions/open-sketch-external.ts b/arduino-ide-extension/src/browser/contributions/open-sketch-external.ts
@@ -1,5 +1,5 @@
 import { injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
diff --git a/arduino-ide-extension/src/browser/contributions/open-sketch.ts b/arduino-ide-extension/src/browser/contributions/open-sketch.ts
@@ -1,5 +1,5 @@
 import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { Widget, ContextMenuRenderer } from '@theia/core/lib/browser';
 import {
diff --git a/arduino-ide-extension/src/browser/contributions/quit-app.ts b/arduino-ide-extension/src/browser/contributions/quit-app.ts
@@ -1,5 +1,5 @@
 import { injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { isOSX } from '@theia/core/lib/common/os';
 import {
   Contribution,
diff --git a/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts b/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts
@@ -1,5 +1,5 @@
 import { injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import * as dateFormat from 'dateformat';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
diff --git a/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts b/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts
@@ -10,7 +10,7 @@ import { SerialModel } from '../serial-model';
 import { ArduinoMenus } from '../../menu/arduino-menus';
 import { Contribution } from '../../contributions/contribution';
 import { Endpoint, FrontendApplication } from '@theia/core/lib/browser';
-import { ipcRenderer } from '@theia/core/shared/electron';
+import { ipcRenderer } from '@theia/electron/shared/electron';
 import { SerialConfig } from '../../../common/protocol';
 import { SerialConnectionManager } from '../serial-connection-manager';
 import { SerialPlotter } from './protocol';
diff --git a/arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts b/arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts
@@ -62,9 +62,15 @@ export class DebugSessionManager extends TheiaDebugSessionManager {
       }
     );
   }
-  // TODO: remove as https://github.com/eclipse-theia/theia/issues/10164 is fixed
-  async terminateSessions(): Promise<void> {
-    await super.terminateSessions();
-    this.destroy(this.currentSession?.id);
+  async terminateSession(session?: DebugSession): Promise<void> {
+    if (!session) {
+        this.updateCurrentSession(this._currentSession);
+        session = this._currentSession;
+    }
+    // The cortex-debug extension does not respond to close requests
+    // So we simply terminate the debug session immediately
+    // Alternatively the `super.terminateSession` call will terminate it after 5 seconds without a response
+    await this.debug.terminateDebugSession(session!.id);
+    await super.terminateSession(session);
   }
 }
diff --git a/arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts b/arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts
@@ -1,5 +1,5 @@
 import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler';
 import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl';
diff --git a/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts b/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts
@@ -18,6 +18,7 @@ import { ArduinoWorkspaceRootResolver } from '../../arduino-workspace-resolver';
 import { BoardsServiceProvider } from '../../boards/boards-service-provider';
 import { BoardsConfig } from '../../boards/boards-config';
 import { nls } from '@theia/core/lib/common';
+import { URI as VSCodeUri } from '@theia/core/shared/vscode-uri';
 
 @injectable()
 export class WorkspaceService extends TheiaWorkspaceService {
@@ -67,14 +68,16 @@ export class WorkspaceService extends TheiaWorkspaceService {
     this.workspaceUri = (async () => {
       try {
         const hash = window.location.hash;
-        const [recentWorkspaces, recentSketches] = await Promise.all([
+        const [recentWorkspacesPaths, recentSketches] = await Promise.all([
           this.server.getRecentWorkspaces(),
           this.sketchService
             .getSketches({})
             .then((container) =>
               SketchContainer.toArray(container).map((s) => s.uri)
             ),
         ]);
+        // On Dindows, `getRecentWorkspaces` returns only file paths, not URIs as expected by the `isValid` method.
+        const recentWorkspaces = recentWorkspacesPaths.map(e => VSCodeUri.file(e).toString());
         const toOpen = await new ArduinoWorkspaceRootResolver({
           isValid: this.isValid.bind(this),
         }).resolve({ hash, recentWorkspaces, recentSketches });
diff --git a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts
@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { inject, injectable } from 'inversify';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
@@ -80,7 +80,7 @@ export class SketchbookWidgetContribution
   }
 
   onStart(): void {
-    this.shell.currentChanged.connect(() =>
+    this.shell.onDidChangeCurrentWidget(() =>
       this.onCurrentWidgetChangedHandler()
     );
 
diff --git a/arduino-ide-extension/src/electron-browser/electron-window-service.ts b/arduino-ide-extension/src/electron-browser/electron-window-service.ts
@@ -1,5 +1,5 @@
 import { inject, injectable, postConstruct } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import {
   ConnectionStatus,
diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts
@@ -1,5 +1,5 @@
 import { injectable } from 'inversify';
-import { remote } from 'electron';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { isOSX } from '@theia/core/lib/common/os';
 import { Keybinding } from '@theia/core/lib/common/keybinding';
 import {
@@ -15,7 +15,6 @@ import {
   ArduinoMenus,
   PlaceholderMenuNode,
 } from '../../../browser/menu/arduino-menus';
-import electron = require('@theia/core/shared/electron');
 
 @injectable()
 export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
@@ -35,9 +34,9 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
     await this.preferencesService.ready;
     const createdMenuBar = this.createElectronMenuBar();
     if (isOSX) {
-      electron.remote.Menu.setApplicationMenu(createdMenuBar);
+      remote.Menu.setApplicationMenu(createdMenuBar);
     } else {
-      electron.remote.getCurrentWindow().setMenu(createdMenuBar);
+      remote.getCurrentWindow().setMenu(createdMenuBar);
     }
   }
 
@@ -81,7 +80,7 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
   protected createOSXMenu(): Electron.MenuItemConstructorOptions {
     const { submenu } = super.createOSXMenu();
     const label = 'Arduino IDE';
-    if (!!submenu && !(submenu instanceof remote.Menu)) {
+    if (!!submenu && !(submenu instanceof Electron.Menu)) {
       const [, , /* about */ /* preferences */ ...rest] = submenu;
       const about = this.fillMenuTemplate(
         [],
diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
@@ -1,10 +1,5 @@
 import { inject, injectable } from 'inversify';
-import {
-  app,
-  BrowserWindow,
-  BrowserWindowConstructorOptions,
-  screen,
-} from 'electron';
+import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, screen } from '@theia/electron/shared/electron';
 import { fork } from 'child_process';
 import { AddressInfo } from 'net';
 import { join } from 'path';
@@ -17,7 +12,7 @@ import {
   TheiaBrowserWindowOptions,
 } from '@theia/core/lib/electron-main/electron-main-application';
 import { SplashServiceImpl } from '../splash/splash-service-impl';
-import { ipcMain } from '@theia/core/shared/electron';
+import * as electronRemoteMain from '@theia/core/electron-shared/@electron/remote/main';
 
 app.commandLine.appendSwitch('disable-http-cache');
 
@@ -152,6 +147,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     this.attachSaveWindowState(electronWindow);
     this.attachGlobalShortcuts(electronWindow);
     this.restoreMaximizedState(electronWindow, options);
+    electronRemoteMain.enable(electronWindow.webContents);
     return electronWindow;
   }
 
diff --git a/browser-app/package.json b/browser-app/package.json
@@ -4,26 +4,26 @@
   "version": "2.0.0-rc3",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@theia/core": "1.19.0",
-    "@theia/debug": "1.19.0",
-    "@theia/editor": "1.19.0",
-		"@theia/editor-preview": "1.19.0",
-    "@theia/file-search": "1.19.0",
-    "@theia/filesystem": "1.19.0",
-    "@theia/keymaps": "1.19.0",
-    "@theia/messages": "1.19.0",
-    "@theia/monaco": "1.19.0",
-    "@theia/navigator": "1.19.0",
-    "@theia/plugin-ext": "1.19.0",
-    "@theia/plugin-ext-vscode": "1.19.0",
-    "@theia/preferences": "1.19.0",
-    "@theia/process": "1.19.0",
-    "@theia/terminal": "1.19.0",
-    "@theia/workspace": "1.19.0",
+    "@theia/core": "1.22.1",
+    "@theia/debug": "1.22.1",
+    "@theia/editor": "1.22.1",
+	"@theia/editor-preview": "1.22.1",
+    "@theia/file-search": "1.22.1",
+    "@theia/filesystem": "1.22.1",
+    "@theia/keymaps": "1.22.1",
+    "@theia/messages": "1.22.1",
+    "@theia/monaco": "1.22.1",
+    "@theia/navigator": "1.22.1",
+    "@theia/plugin-ext": "1.22.1",
+    "@theia/plugin-ext-vscode": "1.22.1",
+    "@theia/preferences": "1.22.1",
+    "@theia/process": "1.22.1",
+    "@theia/terminal": "1.22.1",
+    "@theia/workspace": "1.22.1",
     "arduino-ide-extension": "2.0.0-rc3"
   },
   "devDependencies": {
-    "@theia/cli": "1.19.0"
+    "@theia/cli": "1.22.1"
   },
   "scripts": {
     "prepare": "theia build --mode development",
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -5,27 +5,28 @@
   "license": "AGPL-3.0-or-later",
   "main": "src-gen/frontend/electron-main.js",
   "dependencies": {
-    "@theia/core": "1.19.0",
-    "@theia/debug": "1.19.0",
-    "@theia/editor": "1.19.0",
-		"@theia/editor-preview": "1.19.0",
-    "@theia/electron": "1.19.0",
-    "@theia/file-search": "1.19.0",
-    "@theia/filesystem": "1.19.0",
-    "@theia/keymaps": "1.19.0",
-    "@theia/messages": "1.19.0",
-    "@theia/monaco": "1.19.0",
-    "@theia/navigator": "1.19.0",
-    "@theia/plugin-ext": "1.19.0",
-    "@theia/plugin-ext-vscode": "1.19.0",
-    "@theia/preferences": "1.19.0",
-    "@theia/process": "1.19.0",
-    "@theia/terminal": "1.19.0",
-    "@theia/workspace": "1.19.0",
+    "@theia/core": "1.22.1",
+    "@theia/debug": "1.22.1",
+    "@theia/editor": "1.22.1",
+    "@theia/editor-preview": "1.22.1",
+    "@theia/electron": "1.22.1",
+    "@theia/file-search": "1.22.1",
+    "@theia/filesystem": "1.22.1",
+    "@theia/keymaps": "1.22.1",
+    "@theia/messages": "1.22.1",
+    "@theia/monaco": "1.22.1",
+    "@theia/navigator": "1.22.1",
+    "@theia/plugin-ext": "1.22.1",
+    "@theia/plugin-ext-vscode": "1.22.1",
+    "@theia/preferences": "1.22.1",
+    "@theia/process": "1.22.1",
+    "@theia/terminal": "1.22.1",
+    "@theia/workspace": "1.22.1",
     "arduino-ide-extension": "2.0.0-rc3"
   },
   "devDependencies": {
-    "@theia/cli": "1.19.0"
+    "@theia/cli": "1.22.1",
+    "electron": "^15.3.5"
   },
   "scripts": {
     "prepare": "theia build --mode development",
diff --git a/electron/build/template-package.json b/electron/build/template-package.json
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
