Got rid of _windows field, rely on superclass.

.github/workflows/build.yml

@@ -33,10 +33,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install Node.js 14.x
+      - name: Install Node.js 14.18.1
         uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
+          node-version: '14.18.1'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Python 3.x
@@ -78,6 +78,7 @@ jobs:
             fi
           fi
 
+          npx node-gyp install 14.18.1
           yarn --cwd ./electron/packager/
           yarn --cwd ./electron/packager/ package
 

.github/workflows/check-i18n-task.yml

@@ -25,10 +25,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Install Node.js 14.x
+      - name: Install Node.js 14.18.1
         uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '14.18.1'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies

.github/workflows/i18n-nightly-push.yml

@@ -12,10 +12,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install Node.js 14.x
+      - name: Install Node.js 14.18.1
         uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '14.18.1'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies

.github/workflows/i18n-weekly-pull.yml

@@ -12,10 +12,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install Node.js 14.x
+      - name: Install Node.js 14.18.1
         uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '14.18.1'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies

arduino-ide-extension/package.json

@@ -22,23 +22,23 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.3.7",
-    "@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",
+    "@theia/application-package": "1.24.0",
+    "@theia/core": "1.24.0",
+    "@theia/editor": "1.24.0",
+    "@theia/editor-preview": "1.24.0",
+    "@theia/electron": "1.24.0",
+    "@theia/filesystem": "1.24.0",
+    "@theia/git": "1.24.0",
+    "@theia/keymaps": "1.24.0",
+    "@theia/markers": "1.24.0",
+    "@theia/monaco": "1.24.0",
+    "@theia/navigator": "1.24.0",
+    "@theia/outline-view": "1.24.0",
+    "@theia/output": "1.24.0",
+    "@theia/preferences": "1.24.0",
+    "@theia/search-in-workspace": "1.24.0",
+    "@theia/terminal": "1.24.0",
+    "@theia/workspace": "1.24.0",
     "@tippyjs/react": "^4.2.5",
     "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",

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

@@ -12,6 +12,8 @@ import {
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { nls } from '@theia/core/lib/common';
+import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 // TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
 // Depends on https://github.com/eclipse-theia/theia/pull/7964
@@ -250,10 +252,10 @@ ${value}
     });
   }
 
-  protected async current(): Promise<monaco.editor.ICodeEditor | undefined> {
+  protected async current(): Promise<ICodeEditor | StandaloneCodeEditor  | undefined> {
     return (
       this.codeEditorService.getFocusedCodeEditor() ||
-      this.codeEditorService.getActiveCodeEditor()
+      this.codeEditorService.getActiveCodeEditor() || undefined
     );
   }
 

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

@@ -15,6 +15,7 @@ import {
 import { nls } from '@theia/core/lib/common';
 import { IDEUpdaterCommands } from '../ide-updater/ide-updater-commands';
 import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
+import * as monaco from '@theia/monaco-editor-core';
 
 @injectable()
 export class Help extends Contribution {

arduino-ide-extension/src/browser/contributions/include-library.ts

@@ -16,6 +16,7 @@ import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { SketchContribution, Command, CommandRegistry } from './contribution';
 import { NotificationCenter } from '../notification-center';
 import { nls } from '@theia/core/lib/common';
+import * as monaco from '@theia/monaco-editor-core';
 
 @injectable()
 export class IncludeLibrary extends SketchContribution {

arduino-ide-extension/src/browser/theia/editor/editor-command.ts

@@ -8,9 +8,9 @@ export class EditorCommandContribution extends TheiaEditorCommandContribution {
     // Workaround for https://github.com/eclipse-theia/theia/issues/8722.
     this.editorPreferences.onPreferenceChanged(
       ({ preferenceName, newValue, oldValue }) => {
-        if (preferenceName === 'editor.autoSave') {
-          const autoSaveWasOnBeforeChange = !oldValue || oldValue === 'on';
-          const autoSaveIsOnAfterChange = !newValue || newValue === 'on';
+        if (preferenceName === 'files.autoSave') {
+          const autoSaveWasOnBeforeChange = !oldValue || oldValue !== 'off';
+          const autoSaveIsOnAfterChange = !newValue || newValue !== 'off';
           if (!autoSaveWasOnBeforeChange && autoSaveIsOnAfterChange) {
             this.shell.saveAll();
           }

arduino-ide-extension/src/browser/theia/monaco/monaco-editor-provider.ts

@@ -4,16 +4,19 @@ import {
   Disposable,
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
-import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { EditorServiceOverrides, MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
 import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl';
+import * as monaco from '@theia/monaco-editor-core';
+import type { ReferencesModel } from '@theia/monaco-editor-core/esm/vs/editor/contrib/gotoSymbol/browser/referencesModel';
 
-type CancelablePromise = Promise<monaco.referenceSearch.ReferencesModel> & {
+
+type CancelablePromise = Promise<ReferencesModel> & {
   cancel: () => void;
 };
 interface EditorFactory {
   (
-    override: monaco.editor.IEditorOverrideServices,
+    override: EditorServiceOverrides,
     toDispose: DisposableCollection
   ): Promise<MonacoEditor>;
 }
@@ -36,8 +39,7 @@ export class MonacoEditorProvider extends TheiaMonacoEditorProvider {
 
   private installCustomReferencesController(editor: MonacoEditor): Disposable {
     const control = editor.getControl();
-    const referencesController =
-      control._contributions['editor.contrib.referencesController'];
+    const referencesController: any = control.getContribution('editor.contrib.referencesController');
     const originalToggleWidget = referencesController.toggleWidget;
     const toDispose = new DisposableCollection();
     const toDisposeBeforeToggleWidget = new DisposableCollection();

arduino-ide-extension/src/browser/theia/output/output-channel.ts

@@ -2,7 +2,7 @@ import * as PQueue from 'p-queue';
 import { injectable } from 'inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { OutputUri } from '@theia/output/lib/common/output-uri';
-import { IReference } from '@theia/monaco/lib/browser/monaco-text-model-service';
+import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
 import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
 import {
   OutputChannelManager as TheiaOutputChannelManager,

arduino-ide-extension/src/common/protocol/sketches-service-client-impl.ts

@@ -15,6 +15,7 @@ import {
   ARDUINO_CLOUD_FOLDER,
   REMOTE_SKETCHBOOK_FOLDER,
 } from '../../browser/utils/constants';
+import * as monaco from '@theia/monaco-editor-core';
 
 const READ_ONLY_FILES = ['sketch.json'];
 const READ_ONLY_FILES_REMOTE = ['thingProperties.h', 'thingsProperties.h'];