@theia/workspace 1.34.2 → 1.34.3

package/src/browser/quick-open-workspace.ts

@@ -1,112 +1,112 @@
-// *****************************************************************************
-// 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject, optional } from '@theia/core/shared/inversify';
-import { QuickPickItem, LabelProvider, QuickInputService, QuickInputButton, QuickPickSeparator } from '@theia/core/lib/browser';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { WorkspaceService } from './workspace-service';
-import { WorkspacePreferences } from './workspace-preferences';
-import URI from '@theia/core/lib/common/uri';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { FileStat } from '@theia/filesystem/lib/common/files';
-import { nls, Path } from '@theia/core/lib/common';
-import { CommonWorkspaceUtils } from '../common/utils';
-
-interface RecentlyOpenedPick extends QuickPickItem {
-    resource?: URI
-}
-
-@injectable()
-export class QuickOpenWorkspace {
-    protected items: Array<RecentlyOpenedPick | QuickPickSeparator>;
-    protected opened: boolean;
-
-    @inject(QuickInputService) @optional() protected readonly quickInputService: QuickInputService;
-    @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
-    @inject(FileService) protected readonly fileService: FileService;
-    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
-    @inject(WorkspacePreferences) protected preferences: WorkspacePreferences;
-    @inject(EnvVariablesServer) protected readonly envServer: EnvVariablesServer;
-    @inject(CommonWorkspaceUtils) protected workspaceUtils: CommonWorkspaceUtils;
-
-    protected readonly removeRecentWorkspaceButton: QuickInputButton = {
-        iconClass: 'codicon-remove-close',
-        tooltip: nls.localizeByDefault('Remove from Recently Opened')
-    };
-
-    async open(workspaces: string[]): Promise<void> {
-        this.items = [];
-        const [homeDirUri] = await Promise.all([
-            this.envServer.getHomeDirUri(),
-            this.workspaceService.getUntitledWorkspace()
-        ]);
-        const home = new URI(homeDirUri).path.toString();
-        await this.preferences.ready;
-        this.items.push({
-            type: 'separator',
-            label: nls.localizeByDefault('folders & workspaces')
-        });
-        for (const workspace of workspaces) {
-            const uri = new URI(workspace);
-            let stat: FileStat | undefined;
-            try {
-                stat = await this.fileService.resolve(uri);
-            } catch { }
-            if (this.workspaceUtils.isUntitledWorkspace(uri) || !stat) {
-                continue; // skip the temporary workspace files or an undefined stat.
-            }
-            const icon = this.labelProvider.getIcon(stat);
-            const iconClasses = icon === '' ? undefined : [icon + ' file-icon'];
-
-            this.items.push({
-                label: uri.path.base,
-                description: Path.tildify(uri.path.toString(), home),
-                iconClasses,
-                buttons: [this.removeRecentWorkspaceButton],
-                resource: uri,
-                execute: () => {
-                    const current = this.workspaceService.workspace;
-                    const uriToOpen = new URI(workspace);
-                    if ((current && current.resource.toString() !== workspace) || !current) {
-                        this.workspaceService.open(uriToOpen);
-                    }
-                },
-            });
-        }
-        this.quickInputService?.showQuickPick(this.items, {
-            placeholder: nls.localize(
-                'theia/workspace/openRecentPlaceholder',
-                'Type the name of the workspace you want to open'),
-            onDidTriggerItemButton: async context => {
-                const resource = (context.item as RecentlyOpenedPick).resource;
-                if (resource) {
-                    await this.workspaceService.removeRecentWorkspace(resource.toString());
-                    context.removeItem();
-                }
-            }
-        });
-    }
-
-    select(): void {
-        this.items = [];
-        this.opened = this.workspaceService.opened;
-        this.workspaceService.recentWorkspaces().then(workspaceRoots => {
-            if (workspaceRoots) {
-                this.open(workspaceRoots);
-            }
-        });
-    }
-}
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject, optional } from '@theia/core/shared/inversify';
+import { QuickPickItem, LabelProvider, QuickInputService, QuickInputButton, QuickPickSeparator } from '@theia/core/lib/browser';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { WorkspaceService } from './workspace-service';
+import { WorkspacePreferences } from './workspace-preferences';
+import URI from '@theia/core/lib/common/uri';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { FileStat } from '@theia/filesystem/lib/common/files';
+import { nls, Path } from '@theia/core/lib/common';
+import { CommonWorkspaceUtils } from '../common/utils';
+
+interface RecentlyOpenedPick extends QuickPickItem {
+    resource?: URI
+}
+
+@injectable()
+export class QuickOpenWorkspace {
+    protected items: Array<RecentlyOpenedPick | QuickPickSeparator>;
+    protected opened: boolean;
+
+    @inject(QuickInputService) @optional() protected readonly quickInputService: QuickInputService;
+    @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
+    @inject(FileService) protected readonly fileService: FileService;
+    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
+    @inject(WorkspacePreferences) protected preferences: WorkspacePreferences;
+    @inject(EnvVariablesServer) protected readonly envServer: EnvVariablesServer;
+    @inject(CommonWorkspaceUtils) protected workspaceUtils: CommonWorkspaceUtils;
+
+    protected readonly removeRecentWorkspaceButton: QuickInputButton = {
+        iconClass: 'codicon-remove-close',
+        tooltip: nls.localizeByDefault('Remove from Recently Opened')
+    };
+
+    async open(workspaces: string[]): Promise<void> {
+        this.items = [];
+        const [homeDirUri] = await Promise.all([
+            this.envServer.getHomeDirUri(),
+            this.workspaceService.getUntitledWorkspace()
+        ]);
+        const home = new URI(homeDirUri).path.toString();
+        await this.preferences.ready;
+        this.items.push({
+            type: 'separator',
+            label: nls.localizeByDefault('folders & workspaces')
+        });
+        for (const workspace of workspaces) {
+            const uri = new URI(workspace);
+            let stat: FileStat | undefined;
+            try {
+                stat = await this.fileService.resolve(uri);
+            } catch { }
+            if (this.workspaceUtils.isUntitledWorkspace(uri) || !stat) {
+                continue; // skip the temporary workspace files or an undefined stat.
+            }
+            const icon = this.labelProvider.getIcon(stat);
+            const iconClasses = icon === '' ? undefined : [icon + ' file-icon'];
+
+            this.items.push({
+                label: uri.path.base,
+                description: Path.tildify(uri.path.toString(), home),
+                iconClasses,
+                buttons: [this.removeRecentWorkspaceButton],
+                resource: uri,
+                execute: () => {
+                    const current = this.workspaceService.workspace;
+                    const uriToOpen = new URI(workspace);
+                    if ((current && current.resource.toString() !== workspace) || !current) {
+                        this.workspaceService.open(uriToOpen);
+                    }
+                },
+            });
+        }
+        this.quickInputService?.showQuickPick(this.items, {
+            placeholder: nls.localize(
+                'theia/workspace/openRecentPlaceholder',
+                'Type the name of the workspace you want to open'),
+            onDidTriggerItemButton: async context => {
+                const resource = (context.item as RecentlyOpenedPick).resource;
+                if (resource) {
+                    await this.workspaceService.removeRecentWorkspace(resource.toString());
+                    context.removeItem();
+                }
+            }
+        });
+    }
+
+    select(): void {
+        this.items = [];
+        this.opened = this.workspaceService.opened;
+        this.workspaceService.recentWorkspaces().then(workspaceRoots => {
+            if (workspaceRoots) {
+                this.open(workspaceRoots);
+            }
+        });
+    }
+}

package/src/browser/untitled-workspace-exit-dialog.ts

@@ -1,70 +1,70 @@
-// *****************************************************************************
-// Copyright (C) 2021 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { nls } from '@theia/core';
-import { inject } from '@theia/core/shared/inversify';
-import { AbstractDialog, Dialog, DialogProps, Message } from '@theia/core/lib/browser';
-
-export class UntitledWorkspaceExitDialog extends AbstractDialog<UntitledWorkspaceExitDialog.Options> {
-    protected readonly dontSaveButton: HTMLButtonElement;
-    protected _value: UntitledWorkspaceExitDialog.Options = 'Cancel';
-
-    get value(): UntitledWorkspaceExitDialog.Options {
-        return this._value;
-    }
-
-    constructor(
-        @inject(DialogProps) props: DialogProps
-    ) {
-        super(props);
-        const messageNode = document.createElement('div');
-        messageNode.textContent = nls.localizeByDefault('Save your workspace if you plan to open it again.');
-        this.contentNode.appendChild(messageNode);
-        this.dontSaveButton = this.createButton(nls.localizeByDefault(UntitledWorkspaceExitDialog.Values["Don't Save"]));
-        this.dontSaveButton.classList.add('secondary');
-        this.controlPanel.appendChild(this.dontSaveButton);
-        this.appendCloseButton(Dialog.CANCEL);
-        this.appendAcceptButton(nls.localizeByDefault(UntitledWorkspaceExitDialog.Values.Save));
-    }
-
-    protected override onAfterAttach(msg: Message): void {
-        super.onAfterAttach(msg);
-        this.addAction(this.dontSaveButton, () => this.dontSave(), 'click');
-    }
-
-    protected override addAcceptAction<K extends keyof HTMLElementEventMap>(element: HTMLElement, ...additionalEventTypes: K[]): void {
-        this.addAction(element, () => this.doSave(), 'click');
-    }
-
-    protected dontSave(): void {
-        this._value = UntitledWorkspaceExitDialog.Values["Don't Save"];
-        this.accept();
-    }
-
-    protected doSave(): void {
-        this._value = UntitledWorkspaceExitDialog.Values.Save;
-        this.accept();
-    }
-}
-
-export namespace UntitledWorkspaceExitDialog {
-    export const enum Values {
-        "Don't Save" = "Don't Save",
-        Cancel = 'Cancel',
-        Save = 'Save',
-    };
-    export type Options = keyof typeof Values;
-}
+// *****************************************************************************
+// Copyright (C) 2021 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { nls } from '@theia/core';
+import { inject } from '@theia/core/shared/inversify';
+import { AbstractDialog, Dialog, DialogProps, Message } from '@theia/core/lib/browser';
+
+export class UntitledWorkspaceExitDialog extends AbstractDialog<UntitledWorkspaceExitDialog.Options> {
+    protected readonly dontSaveButton: HTMLButtonElement;
+    protected _value: UntitledWorkspaceExitDialog.Options = 'Cancel';
+
+    get value(): UntitledWorkspaceExitDialog.Options {
+        return this._value;
+    }
+
+    constructor(
+        @inject(DialogProps) props: DialogProps
+    ) {
+        super(props);
+        const messageNode = document.createElement('div');
+        messageNode.textContent = nls.localizeByDefault('Save your workspace if you plan to open it again.');
+        this.contentNode.appendChild(messageNode);
+        this.dontSaveButton = this.createButton(nls.localizeByDefault(UntitledWorkspaceExitDialog.Values["Don't Save"]));
+        this.dontSaveButton.classList.add('secondary');
+        this.controlPanel.appendChild(this.dontSaveButton);
+        this.appendCloseButton(Dialog.CANCEL);
+        this.appendAcceptButton(nls.localizeByDefault(UntitledWorkspaceExitDialog.Values.Save));
+    }
+
+    protected override onAfterAttach(msg: Message): void {
+        super.onAfterAttach(msg);
+        this.addAction(this.dontSaveButton, () => this.dontSave(), 'click');
+    }
+
+    protected override addAcceptAction<K extends keyof HTMLElementEventMap>(element: HTMLElement, ...additionalEventTypes: K[]): void {
+        this.addAction(element, () => this.doSave(), 'click');
+    }
+
+    protected dontSave(): void {
+        this._value = UntitledWorkspaceExitDialog.Values["Don't Save"];
+        this.accept();
+    }
+
+    protected doSave(): void {
+        this._value = UntitledWorkspaceExitDialog.Values.Save;
+        this.accept();
+    }
+}
+
+export namespace UntitledWorkspaceExitDialog {
+    export const enum Values {
+        "Don't Save" = "Don't Save",
+        Cancel = 'Cancel',
+        Save = 'Save',
+    };
+    export type Options = keyof typeof Values;
+}

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

@@ -1,56 +1,56 @@
-// *****************************************************************************
-// 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { FilepathBreadcrumb } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumb';
-import { FilepathBreadcrumbClassNameFactory, FilepathBreadcrumbsContribution } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumbs-contribution';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { WorkspaceService } from './workspace-service';
-import URI from '@theia/core/lib/common/uri';
-
-@injectable()
-export class WorkspaceBreadcrumbsContribution extends FilepathBreadcrumbsContribution {
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    override getContainerClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
-        const workspaceRoot = this.workspaceService.getWorkspaceRootUri(fileURI);
-        return (location, index) => {
-            if (location.isEqual(fileURI)) {
-                return 'file';
-            } else if (workspaceRoot?.isEqual(location)) {
-                return 'root_folder';
-            }
-            return 'folder';
-        };
-    }
-
-    override getIconClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
-        const workspaceRoot = this.workspaceService.getWorkspaceRootUri(fileURI);
-        return (location, index) => {
-            if (location.isEqual(fileURI) || workspaceRoot?.isEqual(location)) {
-                return this.labelProvider.getIcon(location) + ' file-icon';
-            }
-            return '';
-        };
-    }
-
-    protected override filterBreadcrumbs(uri: URI, breadcrumb: FilepathBreadcrumb): boolean {
-        const workspaceRootUri = this.workspaceService.getWorkspaceRootUri(uri);
-        const firstCrumbToHide = this.workspaceService.isMultiRootWorkspaceOpened ? workspaceRootUri?.parent : workspaceRootUri;
-        return super.filterBreadcrumbs(uri, breadcrumb) && (!firstCrumbToHide || !breadcrumb.uri.isEqualOrParent(firstCrumbToHide));
-    }
-}
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { FilepathBreadcrumb } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumb';
+import { FilepathBreadcrumbClassNameFactory, FilepathBreadcrumbsContribution } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumbs-contribution';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { WorkspaceService } from './workspace-service';
+import URI from '@theia/core/lib/common/uri';
+
+@injectable()
+export class WorkspaceBreadcrumbsContribution extends FilepathBreadcrumbsContribution {
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    override getContainerClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
+        const workspaceRoot = this.workspaceService.getWorkspaceRootUri(fileURI);
+        return (location, index) => {
+            if (location.isEqual(fileURI)) {
+                return 'file';
+            } else if (workspaceRoot?.isEqual(location)) {
+                return 'root_folder';
+            }
+            return 'folder';
+        };
+    }
+
+    override getIconClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
+        const workspaceRoot = this.workspaceService.getWorkspaceRootUri(fileURI);
+        return (location, index) => {
+            if (location.isEqual(fileURI) || workspaceRoot?.isEqual(location)) {
+                return this.labelProvider.getIcon(location) + ' file-icon';
+            }
+            return '';
+        };
+    }
+
+    protected override filterBreadcrumbs(uri: URI, breadcrumb: FilepathBreadcrumb): boolean {
+        const workspaceRootUri = this.workspaceService.getWorkspaceRootUri(uri);
+        const firstCrumbToHide = this.workspaceService.isMultiRootWorkspaceOpened ? workspaceRootUri?.parent : workspaceRootUri;
+        return super.filterBreadcrumbs(uri, breadcrumb) && (!firstCrumbToHide || !breadcrumb.uri.isEqualOrParent(firstCrumbToHide));
+    }
+}