Handled case where the folder parameter is a file.

Signed-off-by: Federico Bozzini <federico.bozzini@gmail.com>
eclipse-theia · Jul 3, 2019 · 8b3cdca · 8b3cdca
1 parent fa52ca2
commit 8b3cdca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-service.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-service.ts
@@ -45,7 +45,7 @@ export class DefaultFileDialogService {
     async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
     async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> {
         const title = props.title || 'Open';
-        const rootNode = await this.getDirNode(folder);
+        const rootNode = await this.getRootNode(folder);
         if (rootNode) {
             const dialog = this.openFileDialogFactory(Object.assign(props, { title }));
             await dialog.model.navigateTo(rootNode);
@@ -62,7 +62,7 @@ export class DefaultFileDialogService {
 
     async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
         const title = props.title || 'Save';
-        const rootNode = await this.getDirNode(folder);
+        const rootNode = await this.getRootNode(folder);
         if (rootNode) {
             const dialog = this.saveFileDialogFactory(Object.assign(props, { title }));
             await dialog.model.navigateTo(rootNode);
@@ -71,10 +71,11 @@ export class DefaultFileDialogService {
         return undefined;
     }
 
-    protected async getDirNode(folderToOpen?: FileStat): Promise<DirNode | undefined> {
+    protected async getRootNode(folderToOpen?: FileStat): Promise<DirNode | undefined> {
         const folder = folderToOpen || await this.fileSystem.getCurrentUserHome();
         if (folder) {
-            const rootUri = new URI(folder.uri);
+            const folderUri = new URI(folder.uri);
+            const rootUri = folder.isDirectory ? folderUri : folderUri.parent;
             const name = this.labelProvider.getName(rootUri);
             const rootStat = await this.fileSystem.getFileStat(rootUri.toString());
             if (rootStat) {

diff --git a/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts b/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts
@@ -40,7 +40,7 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
     async showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true }, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
     async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
     async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> {
-        const rootNode = await this.getDirNode(folder);
+        const rootNode = await this.getRootNode(folder);
         if (rootNode) {
             return new Promise<MaybeArray<URI> | undefined>(resolve => {
                 remote.dialog.showOpenDialog(this.toOpenDialogOptions(rootNode.uri, props), (filePaths: string[] | undefined) => {
@@ -61,7 +61,7 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
     }
 
     async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
-        const rootNode = await this.getDirNode(folder);
+        const rootNode = await this.getRootNode(folder);
         if (rootNode) {
             return new Promise<URI | undefined>(resolve => {
                 remote.dialog.showSaveDialog(this.toSaveDialogOptions(rootNode.uri, props), (filename: string | undefined) => {