@theia/workspace 1.45.1 → 1.46.0-next.72

package/src/browser/workspace-frontend-module.ts

@@ -1,118 +1,118 @@
-// *****************************************************************************
-// 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 { ContainerModule, interfaces } from '@theia/core/shared/inversify';
-import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
-import { WebSocketConnectionProvider, FrontendApplicationContribution, KeybindingContribution } from '@theia/core/lib/browser';
-import {
-    OpenFileDialogFactory,
-    SaveFileDialogFactory,
-    OpenFileDialogProps,
-    SaveFileDialogProps,
-    createOpenFileDialogContainer,
-    createSaveFileDialogContainer,
-    OpenFileDialog,
-    SaveFileDialog,
-} from '@theia/filesystem/lib/browser';
-import { StorageService } from '@theia/core/lib/browser/storage-service';
-import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
-import { VariableContribution } from '@theia/variable-resolver/lib/browser';
-import { WorkspaceServer, workspacePath, UntitledWorkspaceService, WorkspaceFileService } from '../common';
-import { WorkspaceFrontendContribution } from './workspace-frontend-contribution';
-import { WorkspaceService } from './workspace-service';
-import { WorkspaceCommandContribution, FileMenuContribution, EditMenuContribution } from './workspace-commands';
-import { WorkspaceVariableContribution } from './workspace-variable-contribution';
-import { WorkspaceStorageService } from './workspace-storage-service';
-import { WorkspaceUriLabelProviderContribution } from './workspace-uri-contribution';
-import { bindWorkspacePreferences } from './workspace-preferences';
-import { QuickOpenWorkspace } from './quick-open-workspace';
-import { WorkspaceDeleteHandler } from './workspace-delete-handler';
-import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler';
-import { WorkspaceUtils } from './workspace-utils';
-import { WorkspaceCompareHandler } from './workspace-compare-handler';
-import { DiffService } from './diff-service';
-import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
-import { WorkspaceSchemaUpdater } from './workspace-schema-updater';
-import { WorkspaceBreadcrumbsContribution } from './workspace-breadcrumbs-contribution';
-import { FilepathBreadcrumbsContribution } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumbs-contribution';
-import { WorkspaceTrustService } from './workspace-trust-service';
-import { bindWorkspaceTrustPreferences } from './workspace-trust-preferences';
-import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
-import { WorkspaceUserWorkingDirectoryProvider } from './workspace-user-working-directory-provider';
-import { WindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater';
-import { WorkspaceWindowTitleUpdater } from './workspace-window-title-updater';
-import { CanonicalUriService } from './canonical-uri-service';
-
-export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => {
-    bindWorkspacePreferences(bind);
-    bindWorkspaceTrustPreferences(bind);
-
-    bind(WorkspaceService).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(WorkspaceService);
-    bind(CanonicalUriService).toSelf().inSingletonScope();
-    bind(WorkspaceServer).toDynamicValue(ctx => {
-        const provider = ctx.container.get(WebSocketConnectionProvider);
-        return provider.createProxy<WorkspaceServer>(workspacePath);
-    }).inSingletonScope();
-
-    bind(WorkspaceFrontendContribution).toSelf().inSingletonScope();
-    for (const identifier of [FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution]) {
-        bind(identifier).toService(WorkspaceFrontendContribution);
-    }
-
-    bind(OpenFileDialogFactory).toFactory(ctx =>
-        (props: OpenFileDialogProps) =>
-            createOpenFileDialogContainer(ctx.container, props).get(OpenFileDialog)
-    );
-
-    bind(SaveFileDialogFactory).toFactory(ctx =>
-        (props: SaveFileDialogProps) =>
-            createSaveFileDialogContainer(ctx.container, props).get(SaveFileDialog)
-    );
-
-    bind(WorkspaceCommandContribution).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(WorkspaceCommandContribution);
-    bind(FileMenuContribution).toSelf().inSingletonScope();
-    bind(MenuContribution).toService(FileMenuContribution);
-    bind(EditMenuContribution).toSelf().inSingletonScope();
-    bind(MenuContribution).toService(EditMenuContribution);
-    bind(WorkspaceDeleteHandler).toSelf().inSingletonScope();
-    bind(WorkspaceDuplicateHandler).toSelf().inSingletonScope();
-    bind(WorkspaceCompareHandler).toSelf().inSingletonScope();
-    bind(DiffService).toSelf().inSingletonScope();
-
-    bind(WorkspaceStorageService).toSelf().inSingletonScope();
-    rebind(StorageService).toService(WorkspaceStorageService);
-
-    bind(LabelProviderContribution).to(WorkspaceUriLabelProviderContribution).inSingletonScope();
-    bind(WorkspaceVariableContribution).toSelf().inSingletonScope();
-    bind(VariableContribution).toService(WorkspaceVariableContribution);
-
-    bind(QuickOpenWorkspace).toSelf().inSingletonScope();
-
-    bind(WorkspaceUtils).toSelf().inSingletonScope();
-    bind(WorkspaceFileService).toSelf().inSingletonScope();
-    bind(UntitledWorkspaceService).toSelf().inSingletonScope();
-
-    bind(WorkspaceSchemaUpdater).toSelf().inSingletonScope();
-    bind(JsonSchemaContribution).toService(WorkspaceSchemaUpdater);
-    rebind(FilepathBreadcrumbsContribution).to(WorkspaceBreadcrumbsContribution).inSingletonScope();
-
-    bind(WorkspaceTrustService).toSelf().inSingletonScope();
-    rebind(UserWorkingDirectoryProvider).to(WorkspaceUserWorkingDirectoryProvider).inSingletonScope();
-
-    rebind(WindowTitleUpdater).to(WorkspaceWindowTitleUpdater).inSingletonScope();
-});
+// *****************************************************************************
+// 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 { ContainerModule, interfaces } from '@theia/core/shared/inversify';
+import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
+import { WebSocketConnectionProvider, FrontendApplicationContribution, KeybindingContribution } from '@theia/core/lib/browser';
+import {
+    OpenFileDialogFactory,
+    SaveFileDialogFactory,
+    OpenFileDialogProps,
+    SaveFileDialogProps,
+    createOpenFileDialogContainer,
+    createSaveFileDialogContainer,
+    OpenFileDialog,
+    SaveFileDialog,
+} from '@theia/filesystem/lib/browser';
+import { StorageService } from '@theia/core/lib/browser/storage-service';
+import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
+import { VariableContribution } from '@theia/variable-resolver/lib/browser';
+import { WorkspaceServer, workspacePath, UntitledWorkspaceService, WorkspaceFileService } from '../common';
+import { WorkspaceFrontendContribution } from './workspace-frontend-contribution';
+import { WorkspaceService } from './workspace-service';
+import { WorkspaceCommandContribution, FileMenuContribution, EditMenuContribution } from './workspace-commands';
+import { WorkspaceVariableContribution } from './workspace-variable-contribution';
+import { WorkspaceStorageService } from './workspace-storage-service';
+import { WorkspaceUriLabelProviderContribution } from './workspace-uri-contribution';
+import { bindWorkspacePreferences } from './workspace-preferences';
+import { QuickOpenWorkspace } from './quick-open-workspace';
+import { WorkspaceDeleteHandler } from './workspace-delete-handler';
+import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler';
+import { WorkspaceUtils } from './workspace-utils';
+import { WorkspaceCompareHandler } from './workspace-compare-handler';
+import { DiffService } from './diff-service';
+import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
+import { WorkspaceSchemaUpdater } from './workspace-schema-updater';
+import { WorkspaceBreadcrumbsContribution } from './workspace-breadcrumbs-contribution';
+import { FilepathBreadcrumbsContribution } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumbs-contribution';
+import { WorkspaceTrustService } from './workspace-trust-service';
+import { bindWorkspaceTrustPreferences } from './workspace-trust-preferences';
+import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
+import { WorkspaceUserWorkingDirectoryProvider } from './workspace-user-working-directory-provider';
+import { WindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater';
+import { WorkspaceWindowTitleUpdater } from './workspace-window-title-updater';
+import { CanonicalUriService } from './canonical-uri-service';
+
+export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => {
+    bindWorkspacePreferences(bind);
+    bindWorkspaceTrustPreferences(bind);
+
+    bind(WorkspaceService).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(WorkspaceService);
+    bind(CanonicalUriService).toSelf().inSingletonScope();
+    bind(WorkspaceServer).toDynamicValue(ctx => {
+        const provider = ctx.container.get(WebSocketConnectionProvider);
+        return provider.createProxy<WorkspaceServer>(workspacePath);
+    }).inSingletonScope();
+
+    bind(WorkspaceFrontendContribution).toSelf().inSingletonScope();
+    for (const identifier of [FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution]) {
+        bind(identifier).toService(WorkspaceFrontendContribution);
+    }
+
+    bind(OpenFileDialogFactory).toFactory(ctx =>
+        (props: OpenFileDialogProps) =>
+            createOpenFileDialogContainer(ctx.container, props).get(OpenFileDialog)
+    );
+
+    bind(SaveFileDialogFactory).toFactory(ctx =>
+        (props: SaveFileDialogProps) =>
+            createSaveFileDialogContainer(ctx.container, props).get(SaveFileDialog)
+    );
+
+    bind(WorkspaceCommandContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(WorkspaceCommandContribution);
+    bind(FileMenuContribution).toSelf().inSingletonScope();
+    bind(MenuContribution).toService(FileMenuContribution);
+    bind(EditMenuContribution).toSelf().inSingletonScope();
+    bind(MenuContribution).toService(EditMenuContribution);
+    bind(WorkspaceDeleteHandler).toSelf().inSingletonScope();
+    bind(WorkspaceDuplicateHandler).toSelf().inSingletonScope();
+    bind(WorkspaceCompareHandler).toSelf().inSingletonScope();
+    bind(DiffService).toSelf().inSingletonScope();
+
+    bind(WorkspaceStorageService).toSelf().inSingletonScope();
+    rebind(StorageService).toService(WorkspaceStorageService);
+
+    bind(LabelProviderContribution).to(WorkspaceUriLabelProviderContribution).inSingletonScope();
+    bind(WorkspaceVariableContribution).toSelf().inSingletonScope();
+    bind(VariableContribution).toService(WorkspaceVariableContribution);
+
+    bind(QuickOpenWorkspace).toSelf().inSingletonScope();
+
+    bind(WorkspaceUtils).toSelf().inSingletonScope();
+    bind(WorkspaceFileService).toSelf().inSingletonScope();
+    bind(UntitledWorkspaceService).toSelf().inSingletonScope();
+
+    bind(WorkspaceSchemaUpdater).toSelf().inSingletonScope();
+    bind(JsonSchemaContribution).toService(WorkspaceSchemaUpdater);
+    rebind(FilepathBreadcrumbsContribution).to(WorkspaceBreadcrumbsContribution).inSingletonScope();
+
+    bind(WorkspaceTrustService).toSelf().inSingletonScope();
+    rebind(UserWorkingDirectoryProvider).to(WorkspaceUserWorkingDirectoryProvider).inSingletonScope();
+
+    rebind(WindowTitleUpdater).to(WorkspaceWindowTitleUpdater).inSingletonScope();
+});

package/src/browser/workspace-input-dialog.ts

@@ -1,61 +1,61 @@
-// *****************************************************************************
-// Copyright (C) 2019 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 { inject, injectable } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { SingleTextInputDialog, SingleTextInputDialogProps, LabelProvider, codiconArray } from '@theia/core/lib/browser';
-
-@injectable()
-export class WorkspaceInputDialogProps extends SingleTextInputDialogProps {
-    /**
-     * The parent `URI` for the selection present in the explorer.
-     * Used to display the path in which the file/folder is created at.
-     */
-    parentUri: URI;
-}
-
-export class WorkspaceInputDialog extends SingleTextInputDialog {
-
-    constructor(
-        @inject(WorkspaceInputDialogProps) protected override readonly props: WorkspaceInputDialogProps,
-        @inject(LabelProvider) protected readonly labelProvider: LabelProvider,
-    ) {
-        super(props);
-        this.appendParentPath();
-    }
-
-    /**
-     * Append the human-readable parent `path` to the dialog.
-     * When possible, display the relative path, else display the full path (ex: workspace root).
-     */
-    protected appendParentPath(): void {
-        // Compute the label for the parent URI.
-        const label = this.labelProvider.getLongName(this.props.parentUri);
-        const element = document.createElement('div');
-        // Create the `folder` icon.
-        const icon = document.createElement('i');
-        icon.classList.add(...codiconArray('folder'));
-        icon.style.marginRight = '0.5em';
-        icon.style.verticalAlign = 'middle';
-        element.style.verticalAlign = 'middle';
-        element.style.paddingBottom = '1em';
-        element.title = this.props.parentUri.path.fsPath();
-        element.appendChild(icon);
-        element.appendChild(document.createTextNode(label));
-        // Add the path and icon div before the `inputField`.
-        this.contentNode.insertBefore(element, this.inputField);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 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 { inject, injectable } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { SingleTextInputDialog, SingleTextInputDialogProps, LabelProvider, codiconArray } from '@theia/core/lib/browser';
+
+@injectable()
+export class WorkspaceInputDialogProps extends SingleTextInputDialogProps {
+    /**
+     * The parent `URI` for the selection present in the explorer.
+     * Used to display the path in which the file/folder is created at.
+     */
+    parentUri: URI;
+}
+
+export class WorkspaceInputDialog extends SingleTextInputDialog {
+
+    constructor(
+        @inject(WorkspaceInputDialogProps) protected override readonly props: WorkspaceInputDialogProps,
+        @inject(LabelProvider) protected readonly labelProvider: LabelProvider,
+    ) {
+        super(props);
+        this.appendParentPath();
+    }
+
+    /**
+     * Append the human-readable parent `path` to the dialog.
+     * When possible, display the relative path, else display the full path (ex: workspace root).
+     */
+    protected appendParentPath(): void {
+        // Compute the label for the parent URI.
+        const label = this.labelProvider.getLongName(this.props.parentUri);
+        const element = document.createElement('div');
+        // Create the `folder` icon.
+        const icon = document.createElement('i');
+        icon.classList.add(...codiconArray('folder'));
+        icon.style.marginRight = '0.5em';
+        icon.style.verticalAlign = 'middle';
+        element.style.verticalAlign = 'middle';
+        element.style.paddingBottom = '1em';
+        element.title = this.props.parentUri.path.fsPath();
+        element.appendChild(icon);
+        element.appendChild(document.createTextNode(label));
+        // Add the path and icon div before the `inputField`.
+        this.contentNode.insertBefore(element, this.inputField);
+    }
+}

package/src/browser/workspace-preferences.ts

@@ -1,58 +1,58 @@
-// *****************************************************************************
-// 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 { interfaces } from '@theia/core/shared/inversify';
-import {
-    createPreferenceProxy,
-    PreferenceProxy,
-    PreferenceService,
-    PreferenceSchema,
-    PreferenceContribution
-} from '@theia/core/lib/browser/preferences';
-import { nls } from '@theia/core/lib/common/nls';
-
-export const workspacePreferenceSchema: PreferenceSchema = {
-    type: 'object',
-    properties: {
-        'workspace.preserveWindow': {
-            description: nls.localize('theia/workspace/preserveWindow', 'Enable opening workspaces in current window.'),
-            type: 'boolean',
-            default: false
-        },
-    }
-};
-
-export interface WorkspaceConfiguration {
-    'workspace.preserveWindow': boolean,
-}
-
-export const WorkspacePreferenceContribution = Symbol('WorkspacePreferenceContribution');
-export const WorkspacePreferences = Symbol('WorkspacePreferences');
-export type WorkspacePreferences = PreferenceProxy<WorkspaceConfiguration>;
-
-export function createWorkspacePreferences(preferences: PreferenceService, schema: PreferenceSchema = workspacePreferenceSchema): WorkspacePreferences {
-    return createPreferenceProxy(preferences, schema);
-}
-
-export function bindWorkspacePreferences(bind: interfaces.Bind): void {
-    bind(WorkspacePreferences).toDynamicValue(ctx => {
-        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
-        const contribution = ctx.container.get<PreferenceContribution>(WorkspacePreferenceContribution);
-        return createWorkspacePreferences(preferences, contribution.schema);
-    }).inSingletonScope();
-    bind(WorkspacePreferenceContribution).toConstantValue({ schema: workspacePreferenceSchema });
-    bind(PreferenceContribution).toService(WorkspacePreferenceContribution);
-}
+// *****************************************************************************
+// 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 { interfaces } from '@theia/core/shared/inversify';
+import {
+    createPreferenceProxy,
+    PreferenceProxy,
+    PreferenceService,
+    PreferenceSchema,
+    PreferenceContribution
+} from '@theia/core/lib/browser/preferences';
+import { nls } from '@theia/core/lib/common/nls';
+
+export const workspacePreferenceSchema: PreferenceSchema = {
+    type: 'object',
+    properties: {
+        'workspace.preserveWindow': {
+            description: nls.localize('theia/workspace/preserveWindow', 'Enable opening workspaces in current window.'),
+            type: 'boolean',
+            default: false
+        },
+    }
+};
+
+export interface WorkspaceConfiguration {
+    'workspace.preserveWindow': boolean,
+}
+
+export const WorkspacePreferenceContribution = Symbol('WorkspacePreferenceContribution');
+export const WorkspacePreferences = Symbol('WorkspacePreferences');
+export type WorkspacePreferences = PreferenceProxy<WorkspaceConfiguration>;
+
+export function createWorkspacePreferences(preferences: PreferenceService, schema: PreferenceSchema = workspacePreferenceSchema): WorkspacePreferences {
+    return createPreferenceProxy(preferences, schema);
+}
+
+export function bindWorkspacePreferences(bind: interfaces.Bind): void {
+    bind(WorkspacePreferences).toDynamicValue(ctx => {
+        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+        const contribution = ctx.container.get<PreferenceContribution>(WorkspacePreferenceContribution);
+        return createWorkspacePreferences(preferences, contribution.schema);
+    }).inSingletonScope();
+    bind(WorkspacePreferenceContribution).toConstantValue({ schema: workspacePreferenceSchema });
+    bind(PreferenceContribution).toService(WorkspacePreferenceContribution);
+}