fix: use sketch file path instead of folder

let the frontend's workspace service handle the error

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/open-sketch-files.ts

@@ -73,8 +73,8 @@ export class OpenSketchFiles extends SketchContribution {
       }
     } catch (err) {
       // This happens when the user gracefully closed IDE2, all went well
-      // but the main sketch file or the sketch folder was modified and when user restarts the IDE2
-      // the sketch path is not valid anymore. (#964)
+      // but the main sketch file or was modified outside of IDE2 and user restarts the IDE2
+      // the workspace path still exists, but the sketch path is not valid anymore. (#964)
       if (SketchesError.InvalidName.is(err)) {
         const movedSketch = await this.promptMove(err);
         if (!movedSketch) {

arduino-ide-extension/src/electron-main/theia/electron-main-application.ts

@@ -8,7 +8,7 @@ import {
 } from '@theia/core/electron-shared/electron';
 import { fork } from 'child_process';
 import { AddressInfo } from 'net';
-import { join, dirname, isAbsolute, resolve } from 'path';
+import { join, isAbsolute, resolve } from 'path';
 import { promises as fs, Stats } from 'fs';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { ElectronSecurityToken } from '@theia/core/lib/electron-common/electron-token';
@@ -86,7 +86,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     return this.launch({
       secondInstance: false,
       argv: this.processArgv.getProcessArgvWithoutBin(process.argv),
-      cwd
+      cwd,
     });
   }
 
@@ -158,11 +158,11 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
   /**
    * The `path` argument is valid, if accessible and either pointing to a `.ino` file,
    * or it's a directory, and one of the files in the directory is an `.ino` file.
-   * The resolved filesystem path is pointing to the sketch folder to open in IDE2.
+   *
    * If `undefined`, `path` was pointing to neither an accessible sketch file nor a sketch folder.
    *
-   * The sketch folder name and sketch file name can be different. This method is not that strict.
-   * The `path` must be an absolute path.
+   * The sketch folder name and sketch file name can be different. This method is not sketch folder name compliant.
+   * The `path` must be an absolute, resolved path.
    */
   private async isValidSketchPath(path: string): Promise<string | undefined> {
     let stats: Stats | undefined = undefined;
@@ -178,14 +178,16 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
       return undefined;
     }
     if (stats.isFile() && path.endsWith('.ino')) {
-      return dirname(path);
+      return path;
     }
     try {
       const entries = await fs.readdir(path, { withFileTypes: true });
-      if (
-        entries.some((entry) => entry.isFile() && entry.name.endsWith('.ino'))
-      ) {
-        return path;
+      const sketchFilename = entries
+        .filter((entry) => entry.isFile() && entry.name.endsWith('.ino'))
+        .map(({ name }) => name)
+        .sort((left, right) => left.localeCompare(right))[0];
+      if (sketchFilename) {
+        return join(path, sketchFilename);
       }
     } catch (err) {
       throw err;