[WIP]: Theia 1.27.0 signed

arduino-ide-extension/package.json

@@ -21,21 +21,21 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.6.7",
-    "@theia/application-package": "1.25.0",
-    "@theia/core": "1.25.0",
-    "@theia/editor": "1.25.0",
-    "@theia/electron": "1.25.0",
-    "@theia/filesystem": "1.25.0",
-    "@theia/keymaps": "1.25.0",
-    "@theia/markers": "1.25.0",
-    "@theia/monaco": "1.25.0",
-    "@theia/navigator": "1.25.0",
-    "@theia/outline-view": "1.25.0",
-    "@theia/output": "1.25.0",
-    "@theia/preferences": "1.25.0",
-    "@theia/search-in-workspace": "1.25.0",
-    "@theia/terminal": "1.25.0",
-    "@theia/workspace": "1.25.0",
+    "@theia/application-package": "1.27.0",
+    "@theia/core": "1.27.0",
+    "@theia/editor": "1.27.0",
+    "@theia/electron": "1.27.0",
+    "@theia/filesystem": "1.27.0",
+    "@theia/keymaps": "1.27.0",
+    "@theia/markers": "1.27.0",
+    "@theia/monaco": "1.27.0",
+    "@theia/navigator": "1.27.0",
+    "@theia/outline-view": "1.27.0",
+    "@theia/output": "1.27.0",
+    "@theia/preferences": "1.27.0",
+    "@theia/search-in-workspace": "1.27.0",
+    "@theia/terminal": "1.27.0",
+    "@theia/workspace": "1.27.0",
     "@tippyjs/react": "^4.2.5",
     "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -47,6 +47,7 @@ import { MonitorViewContribution } from './serial/monitor/monitor-view-contribut
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { SerialPlotterContribution } from './serial/plotter/plotter-frontend-contribution';
+import { MonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry';
 
 @injectable()
 export class ArduinoFrontendContribution
@@ -78,6 +79,9 @@ export class ArduinoFrontendContribution
   @inject(FrontendApplicationStateService)
   private readonly appStateService: FrontendApplicationStateService;
 
+  @inject(MonacoThemeRegistry)
+  private readonly themeRegistry: MonacoThemeRegistry;
+
   @postConstruct()
   protected async init(): Promise<void> {
     if (!window.navigator.onLine) {
@@ -89,6 +93,18 @@ export class ArduinoFrontendContribution
         )
       );
     }
+    this.themeRegistry.register({
+      id: 'arduino-theme',
+      label: 'Light (Arduino)',
+      uiTheme: 'vs',
+      json: require('../../src/browser/data/default.color-theme.json'),
+    });
+    this.themeRegistry.register({
+      id: 'arduino-theme-dark',
+      label: 'Dark (Arduino)',
+      uiTheme: 'vs-dark',
+      json: require('../../src/browser/data/dark.color-theme.json'),
+    });
   }
 
   async onStart(app: FrontendApplication): Promise<void> {

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

@@ -82,7 +82,6 @@ import { BoardsAutoInstaller } from './boards/boards-auto-installer';
 import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer';
 import { ListItemRenderer } from './widgets/component-list/list-item-renderer';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 import {
   ArduinoDaemonPath,
   ArduinoDaemon,
@@ -310,20 +309,10 @@ import { SelectedBoard } from './contributions/selected-board';
 import { CheckForUpdates } from './contributions/check-for-updates';
 import { OpenBoardsConfig } from './contributions/open-boards-config';
 import { SketchFilesTracker } from './contributions/sketch-files-tracker';
-
-MonacoThemingService.register({
-  id: 'arduino-theme',
-  label: 'Light (Arduino)',
-  uiTheme: 'vs',
-  json: require('../../src/browser/data/default.color-theme.json'),
-});
-
-MonacoThemingService.register({
-  id: 'arduino-theme-dark',
-  label: 'Dark (Arduino)',
-  uiTheme: 'vs-dark',
-  json: require('../../src/browser/data/dark.color-theme.json'),
-});
+import { ThemeService } from './theia/core/theming';
+import { ThemeService as TheiaThemeService } from '@theia/core/lib/browser/theming';
+import { MonacoThemingService } from './theia/monaco/monaco-theming-service';
+import { MonacoThemingService as TheiaMonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   // Commands and toolbar items
@@ -566,7 +555,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   // Disabled reference counter in the editor manager to avoid opening the same editor (with different opener options) multiple times.
   bind(EditorManager).toSelf().inSingletonScope();
-  rebind(TheiaEditorManager).to(EditorManager);
+  rebind(TheiaEditorManager).toService(EditorManager);
 
   // replace search icon
   rebind(TheiaSearchInWorkspaceFactory)
@@ -614,6 +603,13 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(WindowContribution).toSelf().inSingletonScope();
   rebind(TheiaWindowContribution).toService(WindowContribution);
 
+  // Customized theme service to dispatch the default IDE2 theme based on the OS' theme.
+  bind(ThemeService).toSelf().inSingletonScope();
+  rebind(TheiaThemeService).toService(ThemeService);
+  // The monaco part of the theme customization
+  bind(MonacoThemingService).toSelf().inSingletonScope();
+  rebind(TheiaMonacoThemingService).toService(MonacoThemingService);
+
   bind(ArduinoDaemon)
     .toDynamicValue((context) =>
       WebSocketConnectionProvider.createProxy(

arduino-ide-extension/src/browser/contributions/first-startup-installer.ts

@@ -43,7 +43,7 @@ export class FirstStartupInstaller extends Contribution {
             // If arduino:avr installation fails because it's already installed we don't want to retry on next start-up
             console.error(e);
           } else {
-            // But if there is any other error (e.g.: no interntet cconnection), we want to retry next time
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
             avrPackageError = e;
           }
         }
@@ -64,7 +64,7 @@ export class FirstStartupInstaller extends Contribution {
             // If Arduino_BuiltIn installation fails because it's already installed we don't want to retry on next start-up
             console.log('error installing core', e);
           } else {
-            // But if there is any other error (e.g.: no interntet cconnection), we want to retry next time
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
             builtInLibraryError = e;
           }
         }

arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx

@@ -202,20 +202,18 @@ export class SettingsComponent extends React.Component<
               <select
                 className="theia-select"
                 value={
-                  ThemeService.get()
+                  this.props.themeService
                     .getThemes()
                     .find(({ id }) => id === this.state.themeId)?.label ||
                   nls.localize('arduino/common/unknown', 'Unknown')
                 }
                 onChange={this.themeDidChange}
               >
-                {ThemeService.get()
-                  .getThemes()
-                  .map(({ id, label }) => (
-                    <option key={id} value={label}>
-                      {label}
-                    </option>
-                  ))}
+                {this.props.themeService.getThemes().map(({ id, label }) => (
+                  <option key={id} value={label}>
+                    {label}
+                  </option>
+                ))}
               </select>
             </div>
             <div className="flex-line">
@@ -588,7 +586,7 @@ export class SettingsComponent extends React.Component<
     event: React.ChangeEvent<HTMLSelectElement>
   ): void => {
     const { selectedIndex } = event.target.options;
-    const theme = ThemeService.get().getThemes()[selectedIndex];
+    const theme = this.props.themeService.getThemes()[selectedIndex];
     if (theme) {
       this.setState({ themeId: theme.id });
     }
@@ -728,6 +726,7 @@ export namespace SettingsComponent {
     readonly fileDialogService: FileDialogService;
     readonly windowService: WindowService;
     readonly localizationProvider: AsyncLocalizationProvider;
+    readonly themeService: ThemeService;
   }
   export type State = Settings & {
     rawAdditionalUrlsValue: string;

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

@@ -16,6 +16,7 @@ import { SettingsComponent } from './settings-component';
 import { AsyncLocalizationProvider } from '@theia/core/lib/common/i18n/localization';
 import { AdditionalUrls } from '../../../common/protocol';
 import { AbstractDialog } from '../../theia/dialogs/dialogs';
+import { ThemeService } from '@theia/core/lib/browser/theming';
 
 @injectable()
 export class SettingsWidget extends ReactWidget {
@@ -34,6 +35,9 @@ export class SettingsWidget extends ReactWidget {
   @inject(AsyncLocalizationProvider)
   protected readonly localizationProvider: AsyncLocalizationProvider;
 
+  @inject(ThemeService)
+  private readonly themeService: ThemeService;
+
   protected render(): React.ReactNode {
     return (
       <SettingsComponent
@@ -42,6 +46,7 @@ export class SettingsWidget extends ReactWidget {
         fileDialogService={this.fileDialogService}
         windowService={this.windowService}
         localizationProvider={this.localizationProvider}
+        themeService={this.themeService}
       />
     );
   }

arduino-ide-extension/src/browser/dialogs/settings/settings.ts

@@ -5,7 +5,7 @@ import {
 } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { Emitter } from '@theia/core/lib/common/event';
-import { Deferred, timeout } from '@theia/core/lib/common/promise-util';
+import { Deferred } from '@theia/core/lib/common/promise-util';
 import { deepClone } from '@theia/core/lib/common/objects';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { ThemeService } from '@theia/core/lib/browser/theming';
@@ -25,6 +25,7 @@ import {
   LanguageInfo,
 } from '@theia/core/lib/common/i18n/localization';
 import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
+import { ArduinoThemes } from '../../theia/core/theming';
 
 export const EDITOR_SETTING = 'editor';
 export const FONT_SIZE_SETTING = `${EDITOR_SETTING}.fontSize`;
@@ -101,6 +102,9 @@ export class SettingsService {
   @inject(CommandService)
   protected commandService: CommandService;
 
+  @inject(ThemeService)
+  private readonly themeService: ThemeService;
+
   protected readonly onDidChangeEmitter = new Emitter<Readonly<Settings>>();
   readonly onDidChange = this.onDidChangeEmitter.event;
   protected readonly onDidResetEmitter = new Emitter<Readonly<Settings>>();
@@ -139,7 +143,7 @@ export class SettingsService {
       this.preferenceService.get<number>(FONT_SIZE_SETTING, 12),
       this.preferenceService.get<string>(
         'workbench.colorTheme',
-        'arduino-theme'
+        ArduinoThemes.Default.id
       ),
       this.preferenceService.get<Settings.AutoSave>(
         AUTO_SAVE_SETTING,
@@ -226,11 +230,7 @@ export class SettingsService {
           'Invalid editor font size. It must be a positive integer.'
         );
       }
-      if (
-        !ThemeService.get()
-          .getThemes()
-          .find(({ id }) => id === themeId)
-      ) {
+      if (!this.themeService.getThemes().find(({ id }) => id === themeId)) {
         return nls.localize(
           'arduino/preferences/invalid.theme',
           'Invalid theme.'
@@ -247,7 +247,6 @@ export class SettingsService {
 
   private async savePreference(name: string, value: unknown): Promise<void> {
     await this.preferenceService.set(name, value, PreferenceScope.User);
-    await timeout(5);
   }
 
   async save(): Promise<string | true> {
@@ -278,19 +277,21 @@ export class SettingsService {
     (config as any).network = network;
     (config as any).locale = currentLanguage;
 
-    await this.savePreference('editor.fontSize', editorFontSize);
-    await this.savePreference('workbench.colorTheme', themeId);
-    await this.savePreference(AUTO_SAVE_SETTING, autoSave);
-    await this.savePreference('editor.quickSuggestions', quickSuggestions);
-    await this.savePreference(AUTO_SCALE_SETTING, autoScaleInterface);
-    await this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale);
-    await this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale);
-    await this.savePreference(COMPILE_VERBOSE_SETTING, verboseOnCompile);
-    await this.savePreference(COMPILE_WARNINGS_SETTING, compilerWarnings);
-    await this.savePreference(UPLOAD_VERBOSE_SETTING, verboseOnUpload);
-    await this.savePreference(UPLOAD_VERIFY_SETTING, verifyAfterUpload);
-    await this.savePreference(SHOW_ALL_FILES_SETTING, sketchbookShowAllFiles);
-    await this.configService.setConfiguration(config);
+    await Promise.all([
+      this.savePreference('editor.fontSize', editorFontSize),
+      this.savePreference('workbench.colorTheme', themeId),
+      this.savePreference(AUTO_SAVE_SETTING, autoSave),
+      this.savePreference('editor.quickSuggestions', quickSuggestions),
+      this.savePreference(AUTO_SCALE_SETTING, autoScaleInterface),
+      this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale),
+      this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale),
+      this.savePreference(COMPILE_VERBOSE_SETTING, verboseOnCompile),
+      this.savePreference(COMPILE_WARNINGS_SETTING, compilerWarnings),
+      this.savePreference(UPLOAD_VERBOSE_SETTING, verboseOnUpload),
+      this.savePreference(UPLOAD_VERIFY_SETTING, verifyAfterUpload),
+      this.savePreference(SHOW_ALL_FILES_SETTING, sketchbookShowAllFiles),
+      this.configService.setConfiguration(config),
+    ]);
     this.onDidChangeEmitter.fire(this._settings);
 
     // after saving all the settings, if we need to change the language we need to perform a reload

arduino-ide-extension/src/browser/theia/core/connection-status-service.ts

@@ -13,6 +13,7 @@ import {
 import { ArduinoDaemon } from '../../../common/protocol';
 import { NotificationCenter } from '../../notification-center';
 import { nls } from '@theia/core/lib/common';
+import debounce = require('lodash.debounce');
 
 @injectable()
 export class FrontendConnectionStatusService extends TheiaFrontendConnectionStatusService {
@@ -36,10 +37,11 @@ export class FrontendConnectionStatusService extends TheiaFrontendConnectionStat
     this.notificationCenter.onDaemonDidStop(
       () => (this.connectedPort = undefined)
     );
-    this.wsConnectionProvider.onIncomingMessageActivity(() => {
+    const refresh = debounce(() => {
       this.updateStatus(!!this.connectedPort);
       this.schedulePing();
-    });
+    }, this.options.offlineTimeout - 10);
+    this.wsConnectionProvider.onIncomingMessageActivity(() => refresh());
   }
 }
 

arduino-ide-extension/src/browser/theia/core/theming.ts

@@ -0,0 +1,35 @@
+import { ApplicationProps } from '@theia/application-package/lib/application-props';
+import { ThemeService as TheiaThemeService } from '@theia/core/lib/browser/theming';
+import type { Theme } from '@theia/core/lib/common/theme';
+import { injectable } from '@theia/core/shared/inversify';
+
+@injectable()
+export class ThemeService extends TheiaThemeService {
+  override get defaultTheme(): Theme {
+    // TODO: provide a PR in Theia to support `light` and `dark` themes natively.
+    return (
+      this.themes[ArduinoThemes.Default.id] ||
+      this.themes[ApplicationProps.DEFAULT.frontend.config.defaultTheme]
+    );
+  }
+}
+
+export namespace ArduinoThemes {
+  export const Light: Theme = {
+    id: 'arduino-theme',
+    type: 'light',
+    label: 'Light (Arduino)',
+    editorTheme: 'arduino-theme',
+  };
+  export const Dark: Theme = {
+    id: 'arduino-dark-theme',
+    type: 'dark',
+    label: 'Dark (Arduino)',
+    editorTheme: 'arduino-dark-theme',
+  };
+  export const Default =
+    window.matchMedia &&
+    window.matchMedia('(prefers-color-scheme: dark)').matches
+      ? Dark
+      : Light;
+}

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

@@ -49,7 +49,8 @@ export class DebugSessionManager extends TheiaDebugSessionManager {
           }
 
           const sessionId = await this.debug.createDebugSession(
-            resolved.configuration
+            resolved.configuration,
+            undefined
           );
           return this.doStart(sessionId, resolved);
         } catch (e) {