fix: openPath and showItemInFolder regressions

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

Author: Akos Kitta

Diff for: arduino-ide-extension/src/browser/contributions/open-sketch-external.ts

@@ -1,6 +1,5 @@
 import { injectable } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
-import { CommandService } from '@theia/core/lib/common/command';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   SketchContribution,
@@ -15,7 +14,7 @@ import { nls } from '@theia/core/lib/common/nls';
 export class OpenSketchExternal extends SketchContribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketchExternal.Commands.OPEN_EXTERNAL, {
-      execute: () => this.openExternal(registry),
+      execute: () => this.openExternal(),
     });
   }
 
@@ -34,14 +33,14 @@ export class OpenSketchExternal extends SketchContribution {
     });
   }
 
-  protected async openExternal(commandService: CommandService): Promise<void> {
+  protected async openExternal(): Promise<void> {
     const uri = await this.sketchServiceClient.currentSketchFile();
     if (uri) {
       const exists = await this.fileService.exists(new URI(uri));
       if (exists) {
         const fsPath = await this.fileService.fsPath(new URI(uri));
         if (fsPath) {
-          commandService.executeCommand('revealFileInOS', fsPath);
+          window.electronTheiaCore.showItemInFolder(fsPath);
         }
       }
     }

Diff for: arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts

@@ -119,7 +119,7 @@ export class SketchbookWidgetContribution
           if (exists) {
             const fsPath = await this.fileService.fsPath(new URI(arg.node.uri));
             if (fsPath) {
-              registry.executeCommand('revealFileInOS', fsPath);
+              window.electronArduino.openPath(fsPath);
             }
           }
         }

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

@@ -8,6 +8,7 @@ import type { Sketch } from '../common/protocol/sketches-service';
 import {
   CHANNEL_APP_VERSION,
   CHANNEL_IS_FIRST_WINDOW,
+  CHANNEL_OPEN_PATH,
   CHANNEL_PLOTTER_WINDOW_DID_CLOSE,
   CHANNEL_QUIT_APP,
   CHANNEL_SCHEDULE_DELETION,
@@ -22,7 +23,7 @@ import {
   OpenDialogOptions,
   SaveDialogOptions,
 } from '../electron-common/electron-arduino';
-import { hasStartupTasks, StartupTasks } from '../electron-common/startup-task';
+import { StartupTasks, hasStartupTasks } from '../electron-common/startup-task';
 
 const api: ElectronArduino = {
   showMessageBox: (options: MessageBoxOptions) =>
@@ -66,6 +67,7 @@ const api: ElectronArduino = {
       ipcRenderer.removeListener(CHANNEL_PLOTTER_WINDOW_DID_CLOSE, listener)
     );
   },
+  openPath: (fsPath: string) => ipcRenderer.send(CHANNEL_OPEN_PATH, fsPath),
 };
 
 export function preload(): void {

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

@@ -50,6 +50,7 @@ export interface ElectronArduino {
   setRepresentedFilename(fsPath: string): void;
   showPlotterWindow(params: { url: string; forceReload?: boolean }): void;
   registerPlotterWindowCloseHandler(handler: () => void): Disposable;
+  openPath(fsPath: string): void;
 }
 
 declare global {
@@ -69,6 +70,7 @@ export const CHANNEL_SCHEDULE_DELETION = 'Arduino:ScheduleDeletion';
 export const CHANNEL_SET_REPRESENTED_FILENAME =
   'Arduino:SetRepresentedFilename';
 export const CHANNEL_SHOW_PLOTTER_WINDOW = 'Arduino:ShowPlotterWindow';
+export const CHANNEL_OPEN_PATH = 'Arduino:OpenPath';
 // main to renderer
 export const CHANNEL_SEND_STARTUP_TASKS = 'Arduino:SendStartupTasks';
 export const CHANNEL_PLOTTER_WINDOW_DID_CLOSE = 'Arduino:PlotterWindowDidClose';

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

@@ -3,19 +3,21 @@ import {
   dialog,
   ipcMain,
   IpcMainEvent,
+  shell,
 } from '@theia/core/electron-shared/electron';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { CHANNEL_REQUEST_RELOAD } from '@theia/core/lib/electron-common/electron-api';
 import {
-  ElectronMainApplication as TheiaElectronMainApplication,
   ElectronMainApplicationContribution,
+  ElectronMainApplication as TheiaElectronMainApplication,
 } from '@theia/core/lib/electron-main/electron-main-application';
 import { createDisposableListener } from '@theia/core/lib/electron-main/event-utils';
 import { injectable } from '@theia/core/shared/inversify';
 import { WebContents } from '@theia/electron/shared/electron';
 import {
   CHANNEL_APP_VERSION,
   CHANNEL_IS_FIRST_WINDOW,
+  CHANNEL_OPEN_PATH,
   CHANNEL_QUIT_APP,
   CHANNEL_SEND_STARTUP_TASKS,
   CHANNEL_SET_REPRESENTED_FILENAME,
@@ -94,6 +96,9 @@ export class ElectronArduino implements ElectronMainApplicationContribution {
         window.setRepresentedFilename(fsPath);
       }
     });
+    ipcMain.on(CHANNEL_OPEN_PATH, (_, fsPath: string) => {
+      shell.openPath(fsPath);
+    });
   }
 }