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

package/README.md

@@ -1,30 +1,30 @@
-<div align='center'>
-
-<br />
-
-<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
-
-<h2>ECLIPSE THEIA - FILESYSTEM EXTENSION</h2>
-
-<hr />
-
-</div>
-
-## Description
-
-The `@theia/filesystem` extension provides functionality to interact with the filesystem, including services such as watching, uploading, and the base `file-tree` widget.
-
-## Additional Information
-
-- [API documentation for `@theia/filesystem`](https://eclipse-theia.github.io/theia/docs/next/modules/filesystem.html)
-- [Theia - GitHub](https://github.com/eclipse-theia/theia)
-- [Theia - Website](https://theia-ide.org/)
-
-## License
-
-- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
-- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
-
-## Trademark
-"Theia" is a trademark of the Eclipse Foundation
-https://www.eclipse.org/theia
+<div align='center'>
+
+<br />
+
+<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
+
+<h2>ECLIPSE THEIA - FILESYSTEM EXTENSION</h2>
+
+<hr />
+
+</div>
+
+## Description
+
+The `@theia/filesystem` extension provides functionality to interact with the filesystem, including services such as watching, uploading, and the base `file-tree` widget.
+
+## Additional Information
+
+- [API documentation for `@theia/filesystem`](https://eclipse-theia.github.io/theia/docs/next/modules/filesystem.html)
+- [Theia - GitHub](https://github.com/eclipse-theia/theia)
+- [Theia - Website](https://theia-ide.org/)
+
+## License
+
+- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
+- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
+
+## Trademark
+"Theia" is a trademark of the Eclipse Foundation
+https://www.eclipse.org/theia

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.53.0-next.55+d1a989a68c",
+  "version": "1.53.0-next.64+23b351d26",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.53.0-next.55+d1a989a68c",
+    "@theia/core": "1.53.0-next.64+23b351d26",
     "@types/body-parser": "^1.17.0",
     "@types/multer": "^1.4.7",
     "@types/rimraf": "^2.0.2",
@@ -78,5 +78,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d1a989a68c1b5ec1f9098e9126653c6346844769"
+  "gitHead": "23b351d26346a2b5d6aca3ee81fba59c056132f7"
 }

package/src/browser/breadcrumbs/filepath-breadcrumb.ts

@@ -1,43 +1,43 @@
-// *****************************************************************************
-// Copyright (C) 2019 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 URI from '@theia/core/lib/common/uri';
-import { Breadcrumb } from '@theia/core/lib/browser/breadcrumbs/breadcrumbs-constants';
-import { FilepathBreadcrumbType } from './filepath-breadcrumbs-contribution';
-
-export class FilepathBreadcrumb implements Breadcrumb {
-    constructor(
-        readonly uri: URI,
-        readonly label: string,
-        readonly longLabel: string,
-        readonly iconClass: string,
-        readonly containerClass: string,
-    ) { }
-
-    get id(): string {
-        return this.type.toString() + '_' + this.uri.toString();
-    }
-
-    get type(): symbol {
-        return FilepathBreadcrumbType;
-    }
-}
-
-export namespace FilepathBreadcrumb {
-    export function is(breadcrumb: Breadcrumb): breadcrumb is FilepathBreadcrumb {
-        return 'uri' in breadcrumb;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 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 URI from '@theia/core/lib/common/uri';
+import { Breadcrumb } from '@theia/core/lib/browser/breadcrumbs/breadcrumbs-constants';
+import { FilepathBreadcrumbType } from './filepath-breadcrumbs-contribution';
+
+export class FilepathBreadcrumb implements Breadcrumb {
+    constructor(
+        readonly uri: URI,
+        readonly label: string,
+        readonly longLabel: string,
+        readonly iconClass: string,
+        readonly containerClass: string,
+    ) { }
+
+    get id(): string {
+        return this.type.toString() + '_' + this.uri.toString();
+    }
+
+    get type(): symbol {
+        return FilepathBreadcrumbType;
+    }
+}
+
+export namespace FilepathBreadcrumb {
+    export function is(breadcrumb: Breadcrumb): breadcrumb is FilepathBreadcrumb {
+        return 'uri' in breadcrumb;
+    }
+}

package/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts

@@ -1,65 +1,65 @@
-// *****************************************************************************
-// Copyright (C) 2019 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 { Container, interfaces, injectable, inject } from '@theia/core/shared/inversify';
-import { TreeProps, ContextMenuRenderer, TreeNode, OpenerService, open, NodeProps, defaultTreeProps } from '@theia/core/lib/browser';
-import { FileTreeModel, FileStatNode, createFileTreeContainer, FileTreeWidget } from '../file-tree';
-
-const BREADCRUMBS_FILETREE_CLASS = 'theia-FilepathBreadcrumbFileTree';
-
-export function createFileTreeBreadcrumbsContainer(parent: interfaces.Container): Container {
-    const child = createFileTreeContainer(parent);
-    child.unbind(FileTreeWidget);
-    child.rebind(TreeProps).toConstantValue({ ...defaultTreeProps, virtualized: false });
-    child.bind(BreadcrumbsFileTreeWidget).toSelf();
-    return child;
-}
-
-export function createFileTreeBreadcrumbsWidget(parent: interfaces.Container): BreadcrumbsFileTreeWidget {
-    return createFileTreeBreadcrumbsContainer(parent).get(BreadcrumbsFileTreeWidget);
-}
-
-@injectable()
-export class BreadcrumbsFileTreeWidget extends FileTreeWidget {
-
-    @inject(OpenerService)
-    protected readonly openerService: OpenerService;
-
-    constructor(
-        @inject(TreeProps) props: TreeProps,
-        @inject(FileTreeModel) override readonly model: FileTreeModel,
-        @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer
-    ) {
-        super(props, model, contextMenuRenderer);
-        this.addClass(BREADCRUMBS_FILETREE_CLASS);
-    }
-
-    protected override createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
-        const elementAttrs = super.createNodeAttributes(node, props);
-        return {
-            ...elementAttrs,
-            draggable: false
-        };
-    }
-
-    protected override tapNode(node?: TreeNode): void {
-        if (FileStatNode.is(node) && !node.fileStat.isDirectory) {
-            open(this.openerService, node.uri, { preview: true });
-        } else {
-            super.tapNode(node);
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 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 { Container, interfaces, injectable, inject } from '@theia/core/shared/inversify';
+import { TreeProps, ContextMenuRenderer, TreeNode, OpenerService, open, NodeProps, defaultTreeProps } from '@theia/core/lib/browser';
+import { FileTreeModel, FileStatNode, createFileTreeContainer, FileTreeWidget } from '../file-tree';
+
+const BREADCRUMBS_FILETREE_CLASS = 'theia-FilepathBreadcrumbFileTree';
+
+export function createFileTreeBreadcrumbsContainer(parent: interfaces.Container): Container {
+    const child = createFileTreeContainer(parent);
+    child.unbind(FileTreeWidget);
+    child.rebind(TreeProps).toConstantValue({ ...defaultTreeProps, virtualized: false });
+    child.bind(BreadcrumbsFileTreeWidget).toSelf();
+    return child;
+}
+
+export function createFileTreeBreadcrumbsWidget(parent: interfaces.Container): BreadcrumbsFileTreeWidget {
+    return createFileTreeBreadcrumbsContainer(parent).get(BreadcrumbsFileTreeWidget);
+}
+
+@injectable()
+export class BreadcrumbsFileTreeWidget extends FileTreeWidget {
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    constructor(
+        @inject(TreeProps) props: TreeProps,
+        @inject(FileTreeModel) override readonly model: FileTreeModel,
+        @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer
+    ) {
+        super(props, model, contextMenuRenderer);
+        this.addClass(BREADCRUMBS_FILETREE_CLASS);
+    }
+
+    protected override createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
+        const elementAttrs = super.createNodeAttributes(node, props);
+        return {
+            ...elementAttrs,
+            draggable: false
+        };
+    }
+
+    protected override tapNode(node?: TreeNode): void {
+        if (FileStatNode.is(node) && !node.fileStat.isDirectory) {
+            open(this.openerService, node.uri, { preview: true });
+        } else {
+            super.tapNode(node);
+        }
+    }
+}

package/src/browser/breadcrumbs/filepath-breadcrumbs-contribution.ts

@@ -1,129 +1,129 @@
-// *****************************************************************************
-// Copyright (C) 2019 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 { Disposable, Emitter, Event } from '@theia/core';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { Breadcrumb, BreadcrumbsContribution, CompositeTreeNode, LabelProvider, SelectableTreeNode, Widget } from '@theia/core/lib/browser';
-import { FilepathBreadcrumb } from './filepath-breadcrumb';
-import { BreadcrumbsFileTreeWidget } from './filepath-breadcrumbs-container';
-import { DirNode } from '../file-tree';
-import { FileService } from '../file-service';
-import { FileStat } from '../../common/files';
-
-export const FilepathBreadcrumbType = Symbol('FilepathBreadcrumb');
-
-export interface FilepathBreadcrumbClassNameFactory {
-    (location: URI, index: number): string;
-}
-
-@injectable()
-export class FilepathBreadcrumbsContribution implements BreadcrumbsContribution {
-
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
-
-    @inject(FileService)
-    protected readonly fileSystem: FileService;
-
-    @inject(BreadcrumbsFileTreeWidget)
-    protected readonly breadcrumbsFileTreeWidget: BreadcrumbsFileTreeWidget;
-
-    protected readonly onDidChangeBreadcrumbsEmitter = new Emitter<URI>();
-    get onDidChangeBreadcrumbs(): Event<URI> {
-        return this.onDidChangeBreadcrumbsEmitter.event;
-    }
-
-    readonly type = FilepathBreadcrumbType;
-    readonly priority: number = 100;
-
-    async computeBreadcrumbs(uri: URI): Promise<Breadcrumb[]> {
-        if (uri.scheme !== 'file') {
-            return [];
-        }
-        const getContainerClass = this.getContainerClassCreator(uri);
-        const getIconClass = this.getIconClassCreator(uri);
-        return uri.allLocations
-            .map((location, index) => {
-                const icon = getIconClass(location, index);
-                const containerClass = getContainerClass(location, index);
-                return new FilepathBreadcrumb(
-                    location,
-                    this.labelProvider.getName(location),
-                    this.labelProvider.getLongName(location),
-                    icon,
-                    containerClass,
-                );
-            })
-            .filter(b => this.filterBreadcrumbs(uri, b))
-            .reverse();
-    }
-
-    protected getContainerClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
-        return (location, index) => location.isEqual(fileURI) ? 'file' : 'folder';
-    }
-
-    protected getIconClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
-        return (location, index) => location.isEqual(fileURI) ? this.labelProvider.getIcon(location) + ' file-icon' : '';
-    }
-
-    protected filterBreadcrumbs(_: URI, breadcrumb: FilepathBreadcrumb): boolean {
-        return !breadcrumb.uri.path.isRoot;
-    }
-
-    async attachPopupContent(breadcrumb: Breadcrumb, parent: HTMLElement): Promise<Disposable | undefined> {
-        if (!FilepathBreadcrumb.is(breadcrumb)) {
-            return undefined;
-        }
-        const folderFileStat = await this.fileSystem.resolve(breadcrumb.uri.parent);
-        if (folderFileStat) {
-            const rootNode = await this.createRootNode(folderFileStat);
-            if (rootNode) {
-                const { model } = this.breadcrumbsFileTreeWidget;
-                await model.navigateTo({ ...rootNode, visible: false });
-                Widget.attach(this.breadcrumbsFileTreeWidget, parent);
-                const toDisposeOnTreePopulated = model.onChanged(() => {
-                    if (CompositeTreeNode.is(model.root) && model.root.children.length > 0) {
-                        toDisposeOnTreePopulated.dispose();
-                        const targetNode = model.getNode(breadcrumb.uri.path.toString());
-                        if (targetNode && SelectableTreeNode.is(targetNode)) {
-                            model.selectNode(targetNode);
-                        }
-                        this.breadcrumbsFileTreeWidget.activate();
-                    }
-                });
-                return {
-                    dispose: () => {
-                        // Clear model otherwise the next time a popup is opened the old model is rendered first
-                        // and is shown for a short time period.
-                        toDisposeOnTreePopulated.dispose();
-                        this.breadcrumbsFileTreeWidget.model.root = undefined;
-                        Widget.detach(this.breadcrumbsFileTreeWidget);
-                    }
-                };
-            }
-        }
-    }
-
-    protected async createRootNode(folderToOpen: FileStat): Promise<DirNode | undefined> {
-        const folderUri = folderToOpen.resource;
-        const rootUri = folderToOpen.isDirectory ? folderUri : folderUri.parent;
-        const rootStat = await this.fileSystem.resolve(rootUri);
-        if (rootStat) {
-            return DirNode.createRoot(rootStat);
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 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 { Disposable, Emitter, Event } from '@theia/core';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { Breadcrumb, BreadcrumbsContribution, CompositeTreeNode, LabelProvider, SelectableTreeNode, Widget } from '@theia/core/lib/browser';
+import { FilepathBreadcrumb } from './filepath-breadcrumb';
+import { BreadcrumbsFileTreeWidget } from './filepath-breadcrumbs-container';
+import { DirNode } from '../file-tree';
+import { FileService } from '../file-service';
+import { FileStat } from '../../common/files';
+
+export const FilepathBreadcrumbType = Symbol('FilepathBreadcrumb');
+
+export interface FilepathBreadcrumbClassNameFactory {
+    (location: URI, index: number): string;
+}
+
+@injectable()
+export class FilepathBreadcrumbsContribution implements BreadcrumbsContribution {
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    @inject(FileService)
+    protected readonly fileSystem: FileService;
+
+    @inject(BreadcrumbsFileTreeWidget)
+    protected readonly breadcrumbsFileTreeWidget: BreadcrumbsFileTreeWidget;
+
+    protected readonly onDidChangeBreadcrumbsEmitter = new Emitter<URI>();
+    get onDidChangeBreadcrumbs(): Event<URI> {
+        return this.onDidChangeBreadcrumbsEmitter.event;
+    }
+
+    readonly type = FilepathBreadcrumbType;
+    readonly priority: number = 100;
+
+    async computeBreadcrumbs(uri: URI): Promise<Breadcrumb[]> {
+        if (uri.scheme !== 'file') {
+            return [];
+        }
+        const getContainerClass = this.getContainerClassCreator(uri);
+        const getIconClass = this.getIconClassCreator(uri);
+        return uri.allLocations
+            .map((location, index) => {
+                const icon = getIconClass(location, index);
+                const containerClass = getContainerClass(location, index);
+                return new FilepathBreadcrumb(
+                    location,
+                    this.labelProvider.getName(location),
+                    this.labelProvider.getLongName(location),
+                    icon,
+                    containerClass,
+                );
+            })
+            .filter(b => this.filterBreadcrumbs(uri, b))
+            .reverse();
+    }
+
+    protected getContainerClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
+        return (location, index) => location.isEqual(fileURI) ? 'file' : 'folder';
+    }
+
+    protected getIconClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
+        return (location, index) => location.isEqual(fileURI) ? this.labelProvider.getIcon(location) + ' file-icon' : '';
+    }
+
+    protected filterBreadcrumbs(_: URI, breadcrumb: FilepathBreadcrumb): boolean {
+        return !breadcrumb.uri.path.isRoot;
+    }
+
+    async attachPopupContent(breadcrumb: Breadcrumb, parent: HTMLElement): Promise<Disposable | undefined> {
+        if (!FilepathBreadcrumb.is(breadcrumb)) {
+            return undefined;
+        }
+        const folderFileStat = await this.fileSystem.resolve(breadcrumb.uri.parent);
+        if (folderFileStat) {
+            const rootNode = await this.createRootNode(folderFileStat);
+            if (rootNode) {
+                const { model } = this.breadcrumbsFileTreeWidget;
+                await model.navigateTo({ ...rootNode, visible: false });
+                Widget.attach(this.breadcrumbsFileTreeWidget, parent);
+                const toDisposeOnTreePopulated = model.onChanged(() => {
+                    if (CompositeTreeNode.is(model.root) && model.root.children.length > 0) {
+                        toDisposeOnTreePopulated.dispose();
+                        const targetNode = model.getNode(breadcrumb.uri.path.toString());
+                        if (targetNode && SelectableTreeNode.is(targetNode)) {
+                            model.selectNode(targetNode);
+                        }
+                        this.breadcrumbsFileTreeWidget.activate();
+                    }
+                });
+                return {
+                    dispose: () => {
+                        // Clear model otherwise the next time a popup is opened the old model is rendered first
+                        // and is shown for a short time period.
+                        toDisposeOnTreePopulated.dispose();
+                        this.breadcrumbsFileTreeWidget.model.root = undefined;
+                        Widget.detach(this.breadcrumbsFileTreeWidget);
+                    }
+                };
+            }
+        }
+    }
+
+    protected async createRootNode(folderToOpen: FileStat): Promise<DirNode | undefined> {
+        const folderUri = folderToOpen.resource;
+        const rootUri = folderToOpen.isDirectory ? folderUri : folderUri.parent;
+        const rootStat = await this.fileSystem.resolve(rootUri);
+        if (rootStat) {
+            return DirNode.createRoot(rootStat);
+        }
+    }
+}