Use supplied filter by default

Signed-off-by: Gabriel Bodeen <[email protected]>
eclipse-theia · Jun 30, 2021 · 3b49f05 · 3b49f05
1 parent 0ebdec5
commit 3b49f05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx b/packages/filesystem/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx
@@ -59,7 +59,7 @@ export class FileDialogTreeFiltersRenderer extends ReactRenderer {
         super();
         this.suppliedFilters = options.suppliedFilters;
         this.fileDialogTree = options.fileDialogTree;
-        this.appliedFilters = { 'All Files': [], ...this.suppliedFilters, };
+        this.appliedFilters = { ...this.suppliedFilters, 'All Files': [], };
     }
 
     protected readonly handleFilterChanged = (e: React.ChangeEvent<HTMLSelectElement>) => this.onFilterChanged(e);

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
@@ -95,7 +95,7 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
         const defaultPath = FileUri.fsPath(uri);
         const filters: FileFilter[] = [{ name: 'All Files', extensions: ['*'] }];
         if (props.filters) {
-            filters.push(...Object.keys(props.filters).map(key => ({ name: key, extensions: props.filters![key] })));
+            filters.unshift(...Object.keys(props.filters).map(key => ({ name: key, extensions: props.filters![key] })));
         }
         return { title, defaultPath, filters };
     }