@theia/filesystem 1.48.1 → 1.48.2

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

@@ -1,96 +1,96 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox 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, postConstruct } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { Emitter, Event } from '@theia/core/lib/common';
-import { TreeNode, SelectableTreeNode } from '@theia/core/lib/browser';
-import { DirNode, FileNode, FileTreeModel, FileStatNode } from '../file-tree';
-import { FileDialogTree } from './file-dialog-tree';
-
-@injectable()
-export class FileDialogModel extends FileTreeModel {
-
-    @inject(FileDialogTree) override readonly tree: FileDialogTree;
-    protected readonly onDidOpenFileEmitter = new Emitter<void>();
-    protected _initialLocation: URI | undefined;
-    private _disableFileSelection: boolean = false;
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        this.toDispose.push(this.onDidOpenFileEmitter);
-    }
-
-    /**
-     * Returns the first valid location that was set by calling the `navigateTo` method. Once the initial location has a defined value, it will not change.
-     * Can be `undefined`.
-     */
-    get initialLocation(): URI | undefined {
-        return this._initialLocation;
-    }
-
-    set disableFileSelection(isSelectable: boolean) {
-        this._disableFileSelection = isSelectable;
-    }
-
-    override async navigateTo(nodeOrId: TreeNode | string | undefined): Promise<TreeNode | undefined> {
-        const result = await super.navigateTo(nodeOrId);
-        if (!this._initialLocation && FileStatNode.is(result)) {
-            this._initialLocation = result.uri;
-        }
-        return result;
-    }
-
-    get onDidOpenFile(): Event<void> {
-        return this.onDidOpenFileEmitter.event;
-    }
-
-    protected override doOpenNode(node: TreeNode): void {
-        if (FileNode.is(node)) {
-            this.onDidOpenFileEmitter.fire(undefined);
-        } else if (DirNode.is(node)) {
-            this.navigateTo(node);
-        } else {
-            super.doOpenNode(node);
-        }
-    }
-
-    override getNextSelectableNode(node: SelectableTreeNode | undefined = this.getFocusedNode()): SelectableTreeNode | undefined {
-        let nextNode: SelectableTreeNode | undefined = node;
-        do {
-            nextNode = super.getNextSelectableNode(nextNode);
-        } while (FileStatNode.is(nextNode) && !this.isFileStatNodeSelectable(nextNode));
-        return nextNode;
-    }
-
-    override getPrevSelectableNode(node: SelectableTreeNode | undefined = this.getFocusedNode()): SelectableTreeNode | undefined {
-        let prevNode: SelectableTreeNode | undefined = node;
-        do {
-            prevNode = super.getPrevSelectableNode(prevNode);
-        } while (FileStatNode.is(prevNode) && !this.isFileStatNodeSelectable(prevNode));
-        return prevNode;
-    }
-
-    private isFileStatNodeSelectable(node: FileStatNode): boolean {
-        return !(!node.fileStat.isDirectory && this._disableFileSelection);
-    }
-
-    canNavigateUpward(): boolean {
-        const treeRoot = this.tree.root;
-        return FileStatNode.is(treeRoot) && !treeRoot.uri.path.isRoot;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox 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, postConstruct } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { Emitter, Event } from '@theia/core/lib/common';
+import { TreeNode, SelectableTreeNode } from '@theia/core/lib/browser';
+import { DirNode, FileNode, FileTreeModel, FileStatNode } from '../file-tree';
+import { FileDialogTree } from './file-dialog-tree';
+
+@injectable()
+export class FileDialogModel extends FileTreeModel {
+
+    @inject(FileDialogTree) override readonly tree: FileDialogTree;
+    protected readonly onDidOpenFileEmitter = new Emitter<void>();
+    protected _initialLocation: URI | undefined;
+    private _disableFileSelection: boolean = false;
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        this.toDispose.push(this.onDidOpenFileEmitter);
+    }
+
+    /**
+     * Returns the first valid location that was set by calling the `navigateTo` method. Once the initial location has a defined value, it will not change.
+     * Can be `undefined`.
+     */
+    get initialLocation(): URI | undefined {
+        return this._initialLocation;
+    }
+
+    set disableFileSelection(isSelectable: boolean) {
+        this._disableFileSelection = isSelectable;
+    }
+
+    override async navigateTo(nodeOrId: TreeNode | string | undefined): Promise<TreeNode | undefined> {
+        const result = await super.navigateTo(nodeOrId);
+        if (!this._initialLocation && FileStatNode.is(result)) {
+            this._initialLocation = result.uri;
+        }
+        return result;
+    }
+
+    get onDidOpenFile(): Event<void> {
+        return this.onDidOpenFileEmitter.event;
+    }
+
+    protected override doOpenNode(node: TreeNode): void {
+        if (FileNode.is(node)) {
+            this.onDidOpenFileEmitter.fire(undefined);
+        } else if (DirNode.is(node)) {
+            this.navigateTo(node);
+        } else {
+            super.doOpenNode(node);
+        }
+    }
+
+    override getNextSelectableNode(node: SelectableTreeNode | undefined = this.getFocusedNode()): SelectableTreeNode | undefined {
+        let nextNode: SelectableTreeNode | undefined = node;
+        do {
+            nextNode = super.getNextSelectableNode(nextNode);
+        } while (FileStatNode.is(nextNode) && !this.isFileStatNodeSelectable(nextNode));
+        return nextNode;
+    }
+
+    override getPrevSelectableNode(node: SelectableTreeNode | undefined = this.getFocusedNode()): SelectableTreeNode | undefined {
+        let prevNode: SelectableTreeNode | undefined = node;
+        do {
+            prevNode = super.getPrevSelectableNode(prevNode);
+        } while (FileStatNode.is(prevNode) && !this.isFileStatNodeSelectable(prevNode));
+        return prevNode;
+    }
+
+    private isFileStatNodeSelectable(node: FileStatNode): boolean {
+        return !(!node.fileStat.isDirectory && this._disableFileSelection);
+    }
+
+    canNavigateUpward(): boolean {
+        const treeRoot = this.tree.root;
+        return FileStatNode.is(treeRoot) && !treeRoot.uri.path.isRoot;
+    }
+}

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

@@ -1,44 +1,44 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox 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 { ContainerModule } from '@theia/core/shared/inversify';
-import { LocationListRenderer, LocationListRendererFactory, LocationListRendererOptions } from '../location';
-import { FileDialogHiddenFilesToggleRenderer, HiddenFilesToggleRendererFactory } from './file-dialog-hidden-files-renderer';
-import { DefaultFileDialogService, FileDialogService } from './file-dialog-service';
-import { FileDialogTree } from './file-dialog-tree';
-import { FileDialogTreeFiltersRenderer, FileDialogTreeFiltersRendererFactory, FileDialogTreeFiltersRendererOptions } from './file-dialog-tree-filters-renderer';
-export default new ContainerModule(bind => {
-    bind(DefaultFileDialogService).toSelf().inSingletonScope();
-    bind(FileDialogService).toService(DefaultFileDialogService);
-    bind(LocationListRendererFactory).toFactory(context => (options: LocationListRendererOptions) => {
-        const childContainer = context.container.createChild();
-        childContainer.bind(LocationListRendererOptions).toConstantValue(options);
-        childContainer.bind(LocationListRenderer).toSelf().inSingletonScope();
-        return childContainer.get(LocationListRenderer);
-    });
-    bind(FileDialogTreeFiltersRendererFactory).toFactory(context => (options: FileDialogTreeFiltersRendererOptions) => {
-        const childContainer = context.container.createChild();
-        childContainer.bind(FileDialogTreeFiltersRendererOptions).toConstantValue(options);
-        childContainer.bind(FileDialogTreeFiltersRenderer).toSelf().inSingletonScope();
-        return childContainer.get(FileDialogTreeFiltersRenderer);
-    });
-    bind(HiddenFilesToggleRendererFactory).toFactory(({ container }) => (fileDialogTree: FileDialogTree) => {
-        const child = container.createChild();
-        child.bind(FileDialogTree).toConstantValue(fileDialogTree);
-        child.bind(FileDialogHiddenFilesToggleRenderer).toSelf().inSingletonScope();
-        return child.get(FileDialogHiddenFilesToggleRenderer);
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox 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 { ContainerModule } from '@theia/core/shared/inversify';
+import { LocationListRenderer, LocationListRendererFactory, LocationListRendererOptions } from '../location';
+import { FileDialogHiddenFilesToggleRenderer, HiddenFilesToggleRendererFactory } from './file-dialog-hidden-files-renderer';
+import { DefaultFileDialogService, FileDialogService } from './file-dialog-service';
+import { FileDialogTree } from './file-dialog-tree';
+import { FileDialogTreeFiltersRenderer, FileDialogTreeFiltersRendererFactory, FileDialogTreeFiltersRendererOptions } from './file-dialog-tree-filters-renderer';
+export default new ContainerModule(bind => {
+    bind(DefaultFileDialogService).toSelf().inSingletonScope();
+    bind(FileDialogService).toService(DefaultFileDialogService);
+    bind(LocationListRendererFactory).toFactory(context => (options: LocationListRendererOptions) => {
+        const childContainer = context.container.createChild();
+        childContainer.bind(LocationListRendererOptions).toConstantValue(options);
+        childContainer.bind(LocationListRenderer).toSelf().inSingletonScope();
+        return childContainer.get(LocationListRenderer);
+    });
+    bind(FileDialogTreeFiltersRendererFactory).toFactory(context => (options: FileDialogTreeFiltersRendererOptions) => {
+        const childContainer = context.container.createChild();
+        childContainer.bind(FileDialogTreeFiltersRendererOptions).toConstantValue(options);
+        childContainer.bind(FileDialogTreeFiltersRenderer).toSelf().inSingletonScope();
+        return childContainer.get(FileDialogTreeFiltersRenderer);
+    });
+    bind(HiddenFilesToggleRendererFactory).toFactory(({ container }) => (fileDialogTree: FileDialogTree) => {
+        const child = container.createChild();
+        child.bind(FileDialogTree).toConstantValue(fileDialogTree);
+        child.bind(FileDialogHiddenFilesToggleRenderer).toSelf().inSingletonScope();
+        return child.get(FileDialogHiddenFilesToggleRenderer);
+    });
+});

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;
+    }
+}