Use the parent of the existing sketch if not temp.

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

Author: Akos Kitta

Diff for: arduino-ide-extension/src/browser/contributions/save-as-sketch.ts

@@ -11,7 +11,11 @@ import {
   KeybindingRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { ApplicationShell, NavigatableWidget, Saveable } from '@theia/core/lib/browser';
+import {
+  ApplicationShell,
+  NavigatableWidget,
+  Saveable,
+} from '@theia/core/lib/browser';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import { WorkspaceInput } from '@theia/workspace/lib/browser';
@@ -58,28 +62,42 @@ export class SaveAsSketch extends SketchContribution {
       markAsRecentlyOpened,
     }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT
   ): Promise<boolean> {
-    const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
+    const [currentSketch, configuration] = await Promise.all([
+      this.sketchServiceClient.currentSketch(),
+      this.configService.getConfiguration(),
+    ]);
+    if (!CurrentSketch.isValid(currentSketch)) {
       return false;
     }
 
-    const isTemp = await this.sketchService.isTemp(sketch);
+    const isTemp = await this.sketchService.isTemp(currentSketch);
     if (!isTemp && !!execOnlyIfTemp) {
       return false;
     }
 
-    // If target does not exist, propose a `directories.user`/${sketch.name} path
-    // If target exists, propose `directories.user`/${sketch.name}_copy_${yyyymmddHHMMss}
-    const sketchDirUri = new URI(
-      (await this.configService.getConfiguration()).sketchDirUri
-    );
+    const currentSketchUri = new URI(currentSketch.uri);
+    const sketchbookDirUri = new URI(configuration.sketchDirUri);
+    // If the sketch is temp, IDE2 proposes the default sketchbook folder URI.
+    // If the sketch is not temp, but not contained in the default sketchbook folder, IDE2 proposes the default location.
+    // Otherwise, it proposes the parent folder of the current sketch.
+    const containerDirUri = isTemp
+      ? sketchbookDirUri
+      : !sketchbookDirUri.isEqualOrParent(currentSketchUri)
+      ? sketchbookDirUri
+      : currentSketchUri.parent;
     const exists = await this.fileService.exists(
-      sketchDirUri.resolve(sketch.name)
+      containerDirUri.resolve(currentSketch.name)
     );
-    const defaultUri = sketchDirUri.resolve(
+
+    // If target does not exist, propose a `directories.user`/${sketch.name} path
+    // If target exists, propose `directories.user`/${sketch.name}_copy_${yyyymmddHHMMss}
+    const defaultUri = containerDirUri.resolve(
       exists
-        ? `${sketch.name}_copy_${dateFormat(new Date(), 'yyyymmddHHMMss')}`
-        : sketch.name
+        ? `${currentSketch.name}_copy_${dateFormat(
+            new Date(),
+            'yyyymmddHHMMss'
+          )}`
+        : currentSketch.name
     );
     const defaultPath = await this.fileService.fsPath(defaultUri);
     const { filePath, canceled } = await remote.dialog.showSaveDialog(
@@ -99,11 +117,15 @@ export class SaveAsSketch extends SketchContribution {
     if (!destinationUri) {
       return false;
     }
-    const workspaceUri = await this.sketchService.copy(sketch, {
+    const workspaceUri = await this.sketchService.copy(currentSketch, {
       destinationUri,
     });
     if (workspaceUri) {
-      await this.saveOntoCopiedSketch(sketch.mainFileUri, sketch.uri, workspaceUri);
+      await this.saveOntoCopiedSketch(
+        currentSketch.mainFileUri,
+        currentSketch.uri,
+        workspaceUri
+      );
       if (markAsRecentlyOpened) {
         this.sketchService.markAsRecentlyOpened(workspaceUri);
       }
@@ -117,7 +139,7 @@ export class SaveAsSketch extends SketchContribution {
       if (wipeOriginal || (openAfterMove && execOnlyIfTemp)) {
         options.tasks.push({
           command: DeleteSketch.Commands.DELETE_SKETCH.id,
-          args: [sketch.uri],
+          args: [currentSketch.uri],
         });
       }
       this.workspaceService.open(new URI(workspaceUri), options);