electron: fix 'save as...' cwd

The following commit fixes the `defaultPath` when performing a `save
as...` in `electron`. Previously, the `defaultPath` was incorrect
leading the dialog to always open where the application started. With
these changes, the dialog will open at the current location where the
`save as...` is performed.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>

packages/filesystem/src/browser/file-dialog/file-dialog-service.ts

@@ -83,14 +83,12 @@ export class DefaultFileDialogService implements FileDialogService {
             resource: new URI(await this.environments.getHomeDirUri()),
             isDirectory: true
         };
-        if (folder) {
-            const folderUri = folder.resource;
-            const rootUri = folder.isDirectory ? folderUri : folderUri.parent;
-            try {
-                const rootStat = await this.fileService.resolve(rootUri);
-                return DirNode.createRoot(rootStat);
-            } catch { }
-        }
+        const folderUri = folder.resource;
+        const rootUri = folder.isDirectory ? folderUri : folderUri.parent;
+        try {
+            const rootStat = await this.fileService.resolve(rootUri);
+            return DirNode.createRoot(rootStat);
+        } catch { }
         return undefined;
     }
 }

packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts

@@ -108,7 +108,10 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
 
     protected toSaveDialogOptions(uri: URI, props: SaveFileDialogProps): SaveDialogOptions {
         const buttonLabel = props.saveLabel;
-        const defaultPath = props.inputValue;
+        if (props.inputValue) {
+            uri = uri.resolve(props.inputValue);
+        }
+        const defaultPath = FileUri.fsPath(uri);
         return { ...this.toDialogOptions(uri, props, 'Save'), buttonLabel, defaultPath };
     }