fix: move prompt

force a fallback if user rejects move after restoring and invalid sketch

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

Author: Akos Kitta

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

@@ -2,7 +2,7 @@ import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import type { EditorOpenerOptions } from '@theia/editor/lib/browser/editor-manager';
 import { Later } from '../../common/nls';
-import { SketchesError } from '../../common/protocol';
+import { Sketch, SketchesError } from '../../common/protocol';
 import {
   Command,
   CommandRegistry,
@@ -66,12 +66,20 @@ export class OpenSketchFiles extends SketchContribution {
         });
       }
       const { workspaceError } = this.workspaceService;
+      // This happens when the IDE2 has been started from a terminal with a /path/to/invalid/sketch. (#964)
+      // Or user has started the IDE2 from clicking on an `ino` file.
       if (SketchesError.InvalidName.is(workspaceError)) {
-        return this.promptMove(workspaceError);
+        await this.promptMove(workspaceError);
       }
     } 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)
       if (SketchesError.InvalidName.is(err)) {
-        return this.promptMove(err);
+        const movedSketch = await this.promptMove(err);
+        if (!movedSketch) {
+          return this.openFallbackSketch();
+        }
       }
 
       if (SketchesError.NotFound.is(err)) {
@@ -96,7 +104,7 @@ export class OpenSketchFiles extends SketchContribution {
         invalidMainSketchUri: string;
       }
     >
-  ): Promise<void> {
+  ): Promise<Sketch | undefined> {
     const { invalidMainSketchUri } = err.data;
     requestAnimationFrame(() => this.messageService.error(err.message));
     await wait(10); // let IDE2 toast the error message.
@@ -106,10 +114,12 @@ export class OpenSketchFiles extends SketchContribution {
       labelProvider: this.labelProvider,
     });
     if (movedSketch) {
-      return this.workspaceService.open(new URI(movedSketch.uri), {
+      this.workspaceService.open(new URI(movedSketch.uri), {
         preserveWindow: true,
       });
+      return movedSketch;
     }
+    return undefined;
   }
 
   private async openFallbackSketch(): Promise<void> {