fix: better typing for the startup handlers

 - added missing `super#init` call,
 - no `MaybePromise` return type for the plotter handler,
 - corrected outdated dev comments

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

Diff for: arduino-ide-extension/src/browser/app-service.ts

@@ -1,13 +1,13 @@
 import type { Disposable } from '@theia/core/lib/common/disposable';
-import type { MaybePromise } from '@theia/core/lib/common/types';
+import type { StartupTasks } from '../electron-common/startup-task';
 import type { Sketch } from './contributions/contribution';
 
 export const AppService = Symbol('AppService');
 export interface AppService {
   quit(): void;
   version(): Promise<string>;
   registerStartupTasksHandler(
-    handler: (args: unknown) => MaybePromise<void>
+    handler: (tasks: StartupTasks) => void
   ): Disposable;
   scheduleDeletion(sketch: Sketch): void; // TODO: find a better place
 }

Diff for: arduino-ide-extension/src/browser/contributions/startup-tasks-executor.ts

@@ -4,7 +4,10 @@ import {
   injectable,
   postConstruct,
 } from '@theia/core/shared/inversify';
-import { hasStartupTasks } from '../../electron-common/startup-task';
+import {
+  hasStartupTasks,
+  StartupTasks,
+} from '../../electron-common/startup-task';
 import { AppService } from '../app-service';
 import { Contribution } from './contribution';
 
@@ -17,9 +20,10 @@ export class StartupTasksExecutor extends Contribution {
 
   @postConstruct()
   protected override init(): void {
+    super.init();
     this.toDispose.push(
-      this.appService.registerStartupTasksHandler((args) =>
-        this.handleStartupTasks(args)
+      this.appService.registerStartupTasksHandler((tasks) =>
+        this.handleStartupTasks(tasks)
       )
     );
   }
@@ -28,20 +32,19 @@ export class StartupTasksExecutor extends Contribution {
     this.toDispose.dispose();
   }
 
-  private async handleStartupTasks(args: unknown): Promise<void> {
+  private async handleStartupTasks(tasks: StartupTasks): Promise<void> {
     console.debug(
       `Received the startup tasks from the electron main process. Args: ${JSON.stringify(
-        args
+        tasks
       )}`
     );
-    if (!hasStartupTasks(args)) {
+    if (!hasStartupTasks(tasks)) {
       console.warn(`Could not detect 'tasks' from the signal. Skipping.`);
       return;
     }
-    const { tasks } = args;
     await this.appStateService.reachedState('ready');
     console.log(`Executing startup tasks:`);
-    tasks.forEach(({ command, args = [] }) => {
+    tasks.tasks.forEach(({ command, args = [] }) => {
       console.log(
         ` - '${command}' ${
           args.length ? `, args: ${JSON.stringify(args)}` : ''

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

@@ -102,7 +102,7 @@ interface ThemeProvider {
 /**
  * Returns with a list of built-in themes officially supported by IDE2 (https://github.com/arduino/arduino-ide/issues/1283).
  * The themes in the array follow the following order:
- *  - built-in themes first (in `Light`, `Dark`, `High Contrast (Light)`, and `High Contrast (Dark)`), // TODO -> High Contrast will be split up to HC Dark and HC Light after the Theia version uplift
+ *  - built-in themes first (in `Light`, `Dark`, `Light High Contrast`, and `Dark High Contrast`),
  *  - followed by user installed (VSIX) themes grouped by theme type, then alphabetical order,
  *  - if the `currentTheme` is either Light (Theia) or Dark (Theia), the last item of the array will be the selected theme with `(deprecated)` suffix.
  */

Diff for: arduino-ide-extension/src/electron-browser/electron-app-service.ts

@@ -1,8 +1,8 @@
 import type { Disposable } from '@theia/core/lib/common/disposable';
-import type { MaybePromise } from '@theia/core/lib/common/types';
 import { injectable } from '@theia/core/shared/inversify';
 import type { AppService } from '../browser/app-service';
 import type { Sketch } from '../common/protocol/sketches-service';
+import type { StartupTasks } from '../electron-common/startup-task';
 
 @injectable()
 export class ElectronAppService implements AppService {
@@ -15,7 +15,7 @@ export class ElectronAppService implements AppService {
   }
 
   registerStartupTasksHandler(
-    handler: (args: unknown) => MaybePromise<void>
+    handler: (tasks: StartupTasks) => void
   ): Disposable {
     return window.electronArduino.registerStartupTasksHandler(handler);
   }

Diff for: arduino-ide-extension/src/electron-browser/preload.ts

@@ -3,7 +3,6 @@ import {
   ipcRenderer,
 } from '@theia/core/electron-shared/electron';
 import { Disposable } from '@theia/core/lib/common/disposable';
-import type { MaybePromise } from '@theia/core/lib/common/types';
 import { CHANNEL_REQUEST_RELOAD } from '@theia/core/lib/electron-common/electron-api';
 import type { Sketch } from '../common/protocol/sketches-service';
 import {
@@ -37,9 +36,7 @@ const api: ElectronArduino = {
   isFirstWindow: () => ipcRenderer.invoke(CHANNEL_IS_FIRST_WINDOW),
   requestReload: (options: StartupTasks) =>
     ipcRenderer.send(CHANNEL_REQUEST_RELOAD, options),
-  registerStartupTasksHandler: (
-    handler: (tasks: StartupTasks) => MaybePromise<void>
-  ) => {
+  registerStartupTasksHandler: (handler: (tasks: StartupTasks) => void) => {
     const listener = (_: Electron.IpcRendererEvent, args: unknown) => {
       if (hasStartupTasks(args)) {
         handler(args);
@@ -62,7 +59,7 @@ const api: ElectronArduino = {
     ipcRenderer.send(CHANNEL_SET_REPRESENTED_FILENAME, fsPath),
   showPlotterWindow: (params: { url: string; forceReload?: boolean }) =>
     ipcRenderer.send(CHANNEL_SHOW_PLOTTER_WINDOW, params),
-  registerPlotterWindowCloseHandler: (handler: () => MaybePromise<void>) => {
+  registerPlotterWindowCloseHandler: (handler: () => void) => {
     const listener = () => handler();
     ipcRenderer.on(CHANNEL_PLOTTER_WINDOW_DID_CLOSE, listener);
     return Disposable.create(() =>

Diff for: arduino-ide-extension/src/electron-common/electron-arduino.ts

@@ -7,7 +7,6 @@ import type {
   SaveDialogReturnValue as ElectronSaveDialogReturnValue,
 } from '@theia/core/electron-shared/electron';
 import type { Disposable } from '@theia/core/lib/common/disposable';
-import type { MaybePromise } from '@theia/core/lib/common/types';
 import type { Sketch } from '../common/protocol/sketches-service';
 import type { StartupTasks } from './startup-task';
 
@@ -45,14 +44,12 @@ export interface ElectronArduino {
   isFirstWindow(): Promise<boolean>;
   requestReload(tasks: StartupTasks): void;
   registerStartupTasksHandler(
-    handler: (tasks: StartupTasks) => MaybePromise<void>
+    handler: (tasks: StartupTasks) => void
   ): Disposable;
   scheduleDeletion(sketch: Sketch): void;
   setRepresentedFilename(fsPath: string): void;
   showPlotterWindow(params: { url: string; forceReload?: boolean }): void;
-  registerPlotterWindowCloseHandler(
-    handler: () => MaybePromise<void>
-  ): Disposable;
+  registerPlotterWindowCloseHandler(handler: () => void): Disposable;
 }
 
 declare global {