@theia/filesystem 1.53.0-next.55 → 1.53.0-next.64

package/src/browser/file-dialog/file-dialog-service.ts

@@ -1,99 +1,99 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { MaybeArray, UNTITLED_SCHEME, nls } from '@theia/core/lib/common';
-import { LabelProvider } from '@theia/core/lib/browser';
-import { FileStat } from '../../common/files';
-import { DirNode } from '../file-tree';
-import { OpenFileDialogFactory, OpenFileDialogProps, SaveFileDialogFactory, SaveFileDialogProps } from './file-dialog';
-import { FileService } from '../file-service';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
-
-export const FileDialogService = Symbol('FileDialogService');
-export interface FileDialogService {
-
-    showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true }, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
-    showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
-    showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
-
-    showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined>
-
-}
-
-@injectable()
-export class DefaultFileDialogService implements FileDialogService {
-
-    @inject(EnvVariablesServer)
-    protected readonly environments: EnvVariablesServer;
-
-    @inject(FileService)
-    protected readonly fileService: FileService;
-
-    @inject(OpenFileDialogFactory) protected readonly openFileDialogFactory: OpenFileDialogFactory;
-    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
-    @inject(SaveFileDialogFactory) protected readonly saveFileDialogFactory: SaveFileDialogFactory;
-    @inject(UserWorkingDirectoryProvider) protected readonly rootProvider: UserWorkingDirectoryProvider;
-
-    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 title = props.title || nls.localizeByDefault('Open');
-        const rootNode = await this.getRootNode(folder);
-        if (rootNode) {
-            const dialog = this.openFileDialogFactory(Object.assign(props, { title }));
-            await dialog.model.navigateTo(rootNode);
-            const value = await dialog.open();
-            if (value) {
-                if (!Array.isArray(value)) {
-                    return value.uri;
-                }
-                return value.map(node => node.uri);
-            }
-        }
-        return undefined;
-    }
-
-    async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
-        const title = props.title || nls.localizeByDefault('Save');
-        const rootNode = await this.getRootNode(folder);
-        if (rootNode) {
-            const dialog = this.saveFileDialogFactory(Object.assign(props, { title }));
-            await dialog.model.navigateTo(rootNode);
-            return dialog.open();
-        }
-        return undefined;
-    }
-
-    protected async getRootNode(folderToOpen?: FileStat): Promise<DirNode | undefined> {
-        const folderExists = folderToOpen
-            && folderToOpen.resource.scheme !== UNTITLED_SCHEME
-            && await this.fileService.exists(folderToOpen.resource);
-        const folder = folderToOpen && folderExists ? folderToOpen : {
-            resource: await this.rootProvider.getUserWorkingDir(),
-            isDirectory: true
-        };
-        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;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { MaybeArray, UNTITLED_SCHEME, nls } from '@theia/core/lib/common';
+import { LabelProvider } from '@theia/core/lib/browser';
+import { FileStat } from '../../common/files';
+import { DirNode } from '../file-tree';
+import { OpenFileDialogFactory, OpenFileDialogProps, SaveFileDialogFactory, SaveFileDialogProps } from './file-dialog';
+import { FileService } from '../file-service';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
+
+export const FileDialogService = Symbol('FileDialogService');
+export interface FileDialogService {
+
+    showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true }, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
+    showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
+    showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
+
+    showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined>
+
+}
+
+@injectable()
+export class DefaultFileDialogService implements FileDialogService {
+
+    @inject(EnvVariablesServer)
+    protected readonly environments: EnvVariablesServer;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(OpenFileDialogFactory) protected readonly openFileDialogFactory: OpenFileDialogFactory;
+    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
+    @inject(SaveFileDialogFactory) protected readonly saveFileDialogFactory: SaveFileDialogFactory;
+    @inject(UserWorkingDirectoryProvider) protected readonly rootProvider: UserWorkingDirectoryProvider;
+
+    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 title = props.title || nls.localizeByDefault('Open');
+        const rootNode = await this.getRootNode(folder);
+        if (rootNode) {
+            const dialog = this.openFileDialogFactory(Object.assign(props, { title }));
+            await dialog.model.navigateTo(rootNode);
+            const value = await dialog.open();
+            if (value) {
+                if (!Array.isArray(value)) {
+                    return value.uri;
+                }
+                return value.map(node => node.uri);
+            }
+        }
+        return undefined;
+    }
+
+    async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
+        const title = props.title || nls.localizeByDefault('Save');
+        const rootNode = await this.getRootNode(folder);
+        if (rootNode) {
+            const dialog = this.saveFileDialogFactory(Object.assign(props, { title }));
+            await dialog.model.navigateTo(rootNode);
+            return dialog.open();
+        }
+        return undefined;
+    }
+
+    protected async getRootNode(folderToOpen?: FileStat): Promise<DirNode | undefined> {
+        const folderExists = folderToOpen
+            && folderToOpen.resource.scheme !== UNTITLED_SCHEME
+            && await this.fileService.exists(folderToOpen.resource);
+        const folder = folderToOpen && folderExists ? folderToOpen : {
+            resource: await this.rootProvider.getUserWorkingDir(),
+            isDirectory: true
+        };
+        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;
+    }
+}

package/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx

@@ -1,100 +1,100 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ReactRenderer } from '@theia/core/lib/browser/widgets/react-renderer';
-import { FileDialogTree } from './file-dialog-tree';
-import * as React from '@theia/core/shared/react';
-import { inject, injectable } from '@theia/core/shared/inversify';
-
-export const FILE_TREE_FILTERS_LIST_CLASS = 'theia-FileTreeFiltersList';
-
-/**
- * A set of file filters that are used by the dialog. Each entry is a human readable label,
- * like "TypeScript", and an array of extensions, e.g.
- * ```ts
- * {
- *  'Images': ['png', 'jpg']
- *  'TypeScript': ['ts', 'tsx']
- * }
- * ```
- */
-export class FileDialogTreeFilters {
-    [name: string]: string[];
-}
-
-export const FileDialogTreeFiltersRendererFactory = Symbol('FileDialogTreeFiltersRendererFactory');
-export interface FileDialogTreeFiltersRendererFactory {
-    (options: FileDialogTreeFiltersRendererOptions): FileDialogTreeFiltersRenderer;
-}
-
-export const FileDialogTreeFiltersRendererOptions = Symbol('FileDialogTreeFiltersRendererOptions');
-export interface FileDialogTreeFiltersRendererOptions {
-    suppliedFilters: FileDialogTreeFilters;
-    fileDialogTree: FileDialogTree;
-}
-
-@injectable()
-export class FileDialogTreeFiltersRenderer extends ReactRenderer {
-
-    readonly appliedFilters: FileDialogTreeFilters;
-    readonly suppliedFilters: FileDialogTreeFilters;
-    readonly fileDialogTree: FileDialogTree;
-
-    constructor(
-        @inject(FileDialogTreeFiltersRendererOptions) readonly options: FileDialogTreeFiltersRendererOptions
-    ) {
-        super();
-        this.suppliedFilters = options.suppliedFilters;
-        this.fileDialogTree = options.fileDialogTree;
-        this.appliedFilters = { ...this.suppliedFilters, 'All Files': [], };
-    }
-
-    protected readonly handleFilterChanged = (e: React.ChangeEvent<HTMLSelectElement>) => this.onFilterChanged(e);
-
-    protected override doRender(): React.ReactNode {
-        if (!this.appliedFilters) {
-            return undefined;
-        }
-
-        const options = Object.keys(this.appliedFilters).map(value => this.renderLocation(value));
-        return <select className={'theia-select ' + FILE_TREE_FILTERS_LIST_CLASS} onChange={this.handleFilterChanged}>{...options}</select>;
-    }
-
-    protected renderLocation(value: string): React.ReactNode {
-        return <option value={value} key={value}>{value}</option>;
-    }
-
-    protected onFilterChanged(e: React.ChangeEvent<HTMLSelectElement>): void {
-        const locationList = this.locationList;
-        if (locationList) {
-            const value = locationList.value;
-            const filters = this.appliedFilters[value];
-            this.fileDialogTree.setFilter(filters);
-        }
-
-        e.preventDefault();
-        e.stopPropagation();
-    }
-
-    get locationList(): HTMLSelectElement | undefined {
-        const locationList = this.host.getElementsByClassName(FILE_TREE_FILTERS_LIST_CLASS)[0];
-        if (locationList instanceof HTMLSelectElement) {
-            return locationList;
-        }
-        return undefined;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ReactRenderer } from '@theia/core/lib/browser/widgets/react-renderer';
+import { FileDialogTree } from './file-dialog-tree';
+import * as React from '@theia/core/shared/react';
+import { inject, injectable } from '@theia/core/shared/inversify';
+
+export const FILE_TREE_FILTERS_LIST_CLASS = 'theia-FileTreeFiltersList';
+
+/**
+ * A set of file filters that are used by the dialog. Each entry is a human readable label,
+ * like "TypeScript", and an array of extensions, e.g.
+ * ```ts
+ * {
+ *  'Images': ['png', 'jpg']
+ *  'TypeScript': ['ts', 'tsx']
+ * }
+ * ```
+ */
+export class FileDialogTreeFilters {
+    [name: string]: string[];
+}
+
+export const FileDialogTreeFiltersRendererFactory = Symbol('FileDialogTreeFiltersRendererFactory');
+export interface FileDialogTreeFiltersRendererFactory {
+    (options: FileDialogTreeFiltersRendererOptions): FileDialogTreeFiltersRenderer;
+}
+
+export const FileDialogTreeFiltersRendererOptions = Symbol('FileDialogTreeFiltersRendererOptions');
+export interface FileDialogTreeFiltersRendererOptions {
+    suppliedFilters: FileDialogTreeFilters;
+    fileDialogTree: FileDialogTree;
+}
+
+@injectable()
+export class FileDialogTreeFiltersRenderer extends ReactRenderer {
+
+    readonly appliedFilters: FileDialogTreeFilters;
+    readonly suppliedFilters: FileDialogTreeFilters;
+    readonly fileDialogTree: FileDialogTree;
+
+    constructor(
+        @inject(FileDialogTreeFiltersRendererOptions) readonly options: FileDialogTreeFiltersRendererOptions
+    ) {
+        super();
+        this.suppliedFilters = options.suppliedFilters;
+        this.fileDialogTree = options.fileDialogTree;
+        this.appliedFilters = { ...this.suppliedFilters, 'All Files': [], };
+    }
+
+    protected readonly handleFilterChanged = (e: React.ChangeEvent<HTMLSelectElement>) => this.onFilterChanged(e);
+
+    protected override doRender(): React.ReactNode {
+        if (!this.appliedFilters) {
+            return undefined;
+        }
+
+        const options = Object.keys(this.appliedFilters).map(value => this.renderLocation(value));
+        return <select className={'theia-select ' + FILE_TREE_FILTERS_LIST_CLASS} onChange={this.handleFilterChanged}>{...options}</select>;
+    }
+
+    protected renderLocation(value: string): React.ReactNode {
+        return <option value={value} key={value}>{value}</option>;
+    }
+
+    protected onFilterChanged(e: React.ChangeEvent<HTMLSelectElement>): void {
+        const locationList = this.locationList;
+        if (locationList) {
+            const value = locationList.value;
+            const filters = this.appliedFilters[value];
+            this.fileDialogTree.setFilter(filters);
+        }
+
+        e.preventDefault();
+        e.stopPropagation();
+    }
+
+    get locationList(): HTMLSelectElement | undefined {
+        const locationList = this.host.getElementsByClassName(FILE_TREE_FILTERS_LIST_CLASS)[0];
+        if (locationList instanceof HTMLSelectElement) {
+            return locationList;
+        }
+        return undefined;
+    }
+
+}

package/src/browser/file-dialog/file-dialog-tree.ts

@@ -1,89 +1,89 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { DirNode, FileTree } from '../file-tree';
-import { TreeNode, CompositeTreeNode } from '@theia/core/lib/browser/tree/tree';
-import { FileStat } from '../../common/files';
-
-@injectable()
-export class FileDialogTree extends FileTree {
-    protected _showHidden = false;
-    set showHidden(show: boolean) {
-        this._showHidden = show;
-        this.refresh();
-    }
-
-    get showHidden(): boolean {
-        return this._showHidden;
-    }
-
-    protected isHiddenFile = (fileStat: FileStat): boolean => {
-        const { name } = fileStat;
-        const filename = name ?? '';
-        const isHidden = filename.startsWith('.');
-        return isHidden;
-    };
-    /**
-     * Extensions for files to be shown
-     */
-    protected fileExtensions: string[] = [];
-
-    /**
-     * Sets extensions for filtering files
-     *
-     * @param fileExtensions array of extensions
-     */
-    setFilter(fileExtensions: string[]): void {
-        this.fileExtensions = fileExtensions.slice();
-        this.refresh();
-    }
-
-    protected override async toNodes(fileStat: FileStat, parent: CompositeTreeNode): Promise<TreeNode[]> {
-        if (!fileStat.children) {
-            return [];
-        }
-
-        const result = await Promise.all(
-            fileStat.children
-                .filter(child => this.isVisible(child))
-                .map(child => this.toNode(child, parent))
-        );
-
-        return result.sort(DirNode.compare);
-    }
-
-    /**
-     * Determines whether file or folder can be shown
-     *
-     * @param fileStat resource to check
-     */
-    protected isVisible(fileStat: FileStat): boolean {
-        if (!this._showHidden && this.isHiddenFile(fileStat)) {
-            return false;
-        }
-        if (fileStat.isDirectory) {
-            return true;
-        }
-
-        if (this.fileExtensions.length === 0) {
-            return true;
-        }
-
-        return !this.fileExtensions.every(value => fileStat.resource.path.ext !== '.' + value);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { DirNode, FileTree } from '../file-tree';
+import { TreeNode, CompositeTreeNode } from '@theia/core/lib/browser/tree/tree';
+import { FileStat } from '../../common/files';
+
+@injectable()
+export class FileDialogTree extends FileTree {
+    protected _showHidden = false;
+    set showHidden(show: boolean) {
+        this._showHidden = show;
+        this.refresh();
+    }
+
+    get showHidden(): boolean {
+        return this._showHidden;
+    }
+
+    protected isHiddenFile = (fileStat: FileStat): boolean => {
+        const { name } = fileStat;
+        const filename = name ?? '';
+        const isHidden = filename.startsWith('.');
+        return isHidden;
+    };
+    /**
+     * Extensions for files to be shown
+     */
+    protected fileExtensions: string[] = [];
+
+    /**
+     * Sets extensions for filtering files
+     *
+     * @param fileExtensions array of extensions
+     */
+    setFilter(fileExtensions: string[]): void {
+        this.fileExtensions = fileExtensions.slice();
+        this.refresh();
+    }
+
+    protected override async toNodes(fileStat: FileStat, parent: CompositeTreeNode): Promise<TreeNode[]> {
+        if (!fileStat.children) {
+            return [];
+        }
+
+        const result = await Promise.all(
+            fileStat.children
+                .filter(child => this.isVisible(child))
+                .map(child => this.toNode(child, parent))
+        );
+
+        return result.sort(DirNode.compare);
+    }
+
+    /**
+     * Determines whether file or folder can be shown
+     *
+     * @param fileStat resource to check
+     */
+    protected isVisible(fileStat: FileStat): boolean {
+        if (!this._showHidden && this.isHiddenFile(fileStat)) {
+            return false;
+        }
+        if (fileStat.isDirectory) {
+            return true;
+        }
+
+        if (this.fileExtensions.length === 0) {
+            return true;
+        }
+
+        return !this.fileExtensions.every(value => fileStat.resource.path.ext !== '.' + value);
+    }
+
+}