@theia/bulk-edit 1.53.0-next.5 → 1.53.0-next.55

package/src/browser/bulk-edit-tree/bulk-edit-tree.spec.ts

@@ -1,73 +1,73 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
-import * as chai from 'chai';
-import { ResourceTextEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
-import { URI as Uri } from '@theia/core/shared/vscode-uri';
-
-let disableJSDOM = enableJSDOM();
-
-import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
-FrontendApplicationConfigProvider.set({});
-
-import { Container } from '@theia/core/shared/inversify';
-import { BulkEditInfoNode, BulkEditTree } from './bulk-edit-tree';
-
-const expect = chai.expect;
-let bulkEditTree: BulkEditTree;
-let testContainer: Container;
-const fileContextsMap = new Map<string, string>();
-let resourceTextEdits: ResourceTextEdit[];
-
-disableJSDOM();
-
-before(() => {
-    disableJSDOM = enableJSDOM();
-
-    testContainer = new Container();
-    testContainer.bind(BulkEditTree).toSelf();
-    bulkEditTree = testContainer.get(BulkEditTree);
-
-    fileContextsMap.set('/c:/test1.ts', 'aaaaaaaaaaaaaaaaaaa');
-    fileContextsMap.set('/c:/test2.ts', 'bbbbbbbbbbbbbbbbbbb');
-
-    resourceTextEdits = <ResourceTextEdit[]><unknown>[
-        {
-            'resource': Uri.file('c:/test1.ts'),
-            'textEdit': {
-                'text': 'AAAAA', 'range': { 'startLineNumber': 1, 'startColumn': 5, 'endLineNumber': 1, 'endColumn': 10 }
-            }
-        },
-        {
-            'resource': Uri.file('c:/test2.ts'),
-            'textEdit': {
-                'text': 'BBBBBB', 'range': { 'startLineNumber': 1, 'startColumn': 3, 'endLineNumber': 1, 'endColumn': 8 }
-            }
-        }
-    ];
-});
-
-after(() => {
-    disableJSDOM();
-});
-
-describe('bulk-edit-tree', () => {
-    it('initialize tree', () => {
-        bulkEditTree.initTree(resourceTextEdits, fileContextsMap);
-        expect((bulkEditTree.root as BulkEditInfoNode).children.length).is.equal(2);
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+import * as chai from 'chai';
+import { ResourceTextEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
+import { URI as Uri } from '@theia/core/shared/vscode-uri';
+
+let disableJSDOM = enableJSDOM();
+
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { Container } from '@theia/core/shared/inversify';
+import { BulkEditInfoNode, BulkEditTree } from './bulk-edit-tree';
+
+const expect = chai.expect;
+let bulkEditTree: BulkEditTree;
+let testContainer: Container;
+const fileContextsMap = new Map<string, string>();
+let resourceTextEdits: ResourceTextEdit[];
+
+disableJSDOM();
+
+before(() => {
+    disableJSDOM = enableJSDOM();
+
+    testContainer = new Container();
+    testContainer.bind(BulkEditTree).toSelf();
+    bulkEditTree = testContainer.get(BulkEditTree);
+
+    fileContextsMap.set('/c:/test1.ts', 'aaaaaaaaaaaaaaaaaaa');
+    fileContextsMap.set('/c:/test2.ts', 'bbbbbbbbbbbbbbbbbbb');
+
+    resourceTextEdits = <ResourceTextEdit[]><unknown>[
+        {
+            'resource': Uri.file('c:/test1.ts'),
+            'textEdit': {
+                'text': 'AAAAA', 'range': { 'startLineNumber': 1, 'startColumn': 5, 'endLineNumber': 1, 'endColumn': 10 }
+            }
+        },
+        {
+            'resource': Uri.file('c:/test2.ts'),
+            'textEdit': {
+                'text': 'BBBBBB', 'range': { 'startLineNumber': 1, 'startColumn': 3, 'endLineNumber': 1, 'endColumn': 8 }
+            }
+        }
+    ];
+});
+
+after(() => {
+    disableJSDOM();
+});
+
+describe('bulk-edit-tree', () => {
+    it('initialize tree', () => {
+        bulkEditTree.initTree(resourceTextEdits, fileContextsMap);
+        expect((bulkEditTree.root as BulkEditInfoNode).children.length).is.equal(2);
+    });
+});

package/src/browser/bulk-edit-tree/bulk-edit-tree.ts

@@ -1,114 +1,114 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { TreeNode, CompositeTreeNode, SelectableTreeNode, ExpandableTreeNode, TreeImpl } from '@theia/core/lib/browser';
-import { UriSelection } from '@theia/core/lib/common/selection';
-import { BulkEditNodeSelection } from './bulk-edit-node-selection';
-import URI from '@theia/core/lib/common/uri';
-import { ResourceFileEdit, ResourceTextEdit } from '@theia/monaco/lib/browser/monaco-workspace';
-import {
-    ResourceEdit, ResourceFileEdit as MonacoResourceFileEdit, ResourceTextEdit as MonacoResourceTextEdit
-} from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
-
-@injectable()
-export class BulkEditTree extends TreeImpl {
-    public async initTree(edits: ResourceEdit[], fileContents: Map<string, string>): Promise<void> {
-        this.root = <CompositeTreeNode>{
-            visible: false,
-            id: 'theia-bulk-edit-tree-widget',
-            name: 'BulkEditTree',
-            children: this.getChildren(edits, fileContents),
-            parent: undefined
-        };
-    }
-
-    private getChildren(edits: ResourceEdit[], fileContentsMap: Map<string, string>): BulkEditInfoNode[] {
-        let bulkEditInfos: BulkEditInfoNode[] = [];
-        if (edits) {
-            bulkEditInfos = edits
-                .map(edit => this.getResourcePath(edit))
-                .filter((path, index, arr) => path && arr.indexOf(path) === index)
-                .map((path: string) => this.createBulkEditInfo(path, new URI(path), fileContentsMap.get(path)))
-                .filter(Boolean);
-
-            if (bulkEditInfos.length > 0) {
-                bulkEditInfos.forEach(editInfo => {
-                    editInfo.children = edits.filter(edit =>
-                        ((('resource' in edit) && (edit as MonacoResourceTextEdit)?.resource?.path === editInfo.id)) ||
-                        (('newResource' in edit) && (edit as MonacoResourceFileEdit)?.newResource?.path === editInfo.id))
-                        .map((edit, index) => this.createBulkEditNode(('resource' in edit ? edit as MonacoResourceTextEdit :
-                            edit as MonacoResourceFileEdit), index, editInfo));
-                });
-            }
-        }
-        return bulkEditInfos;
-    }
-
-    private createBulkEditNode(bulkEdit: MonacoResourceFileEdit | MonacoResourceTextEdit, index: number, parent: BulkEditInfoNode): BulkEditNode {
-        const id = parent.id + '_' + index;
-        const existing = this.getNode(id);
-        if (BulkEditNode.is(existing)) {
-            existing.bulkEdit = bulkEdit;
-            return existing;
-        }
-        return {
-            id,
-            name: 'bulkEdit',
-            parent,
-            selected: false,
-            uri: parent.uri,
-            bulkEdit
-        };
-    }
-
-    private createBulkEditInfo(id: string, uri: URI, fileContents: string | undefined): BulkEditInfoNode {
-        return {
-            id,
-            uri,
-            expanded: true,
-            selected: false,
-            parent: this.root as BulkEditInfoNode,
-            fileContents,
-            children: []
-        };
-    }
-
-    private getResourcePath(edit: ResourceEdit): string | undefined {
-        return ResourceTextEdit.is(edit) ? edit.resource.path :
-            ResourceFileEdit.is(edit) && edit.newResource ? edit.newResource.path : undefined;
-    }
-}
-
-export interface BulkEditNode extends UriSelection, SelectableTreeNode {
-    parent: CompositeTreeNode;
-    bulkEdit: MonacoResourceFileEdit | MonacoResourceTextEdit;
-}
-export namespace BulkEditNode {
-    export function is(node: TreeNode | undefined): node is BulkEditNode {
-        return UriSelection.is(node) && SelectableTreeNode.is(node) && BulkEditNodeSelection.is(node);
-    }
-}
-
-export interface BulkEditInfoNode extends UriSelection, SelectableTreeNode, ExpandableTreeNode {
-    parent: CompositeTreeNode;
-    fileContents?: string;
-}
-export namespace BulkEditInfoNode {
-    export function is(node: unknown): node is BulkEditInfoNode {
-        return ExpandableTreeNode.is(node) && UriSelection.is(node) && 'fileContents' in node;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { TreeNode, CompositeTreeNode, SelectableTreeNode, ExpandableTreeNode, TreeImpl } from '@theia/core/lib/browser';
+import { UriSelection } from '@theia/core/lib/common/selection';
+import { BulkEditNodeSelection } from './bulk-edit-node-selection';
+import URI from '@theia/core/lib/common/uri';
+import { ResourceFileEdit, ResourceTextEdit } from '@theia/monaco/lib/browser/monaco-workspace';
+import {
+    ResourceEdit, ResourceFileEdit as MonacoResourceFileEdit, ResourceTextEdit as MonacoResourceTextEdit
+} from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
+
+@injectable()
+export class BulkEditTree extends TreeImpl {
+    public async initTree(edits: ResourceEdit[], fileContents: Map<string, string>): Promise<void> {
+        this.root = <CompositeTreeNode>{
+            visible: false,
+            id: 'theia-bulk-edit-tree-widget',
+            name: 'BulkEditTree',
+            children: this.getChildren(edits, fileContents),
+            parent: undefined
+        };
+    }
+
+    private getChildren(edits: ResourceEdit[], fileContentsMap: Map<string, string>): BulkEditInfoNode[] {
+        let bulkEditInfos: BulkEditInfoNode[] = [];
+        if (edits) {
+            bulkEditInfos = edits
+                .map(edit => this.getResourcePath(edit))
+                .filter((path, index, arr) => path && arr.indexOf(path) === index)
+                .map((path: string) => this.createBulkEditInfo(path, new URI(path), fileContentsMap.get(path)))
+                .filter(Boolean);
+
+            if (bulkEditInfos.length > 0) {
+                bulkEditInfos.forEach(editInfo => {
+                    editInfo.children = edits.filter(edit =>
+                        ((('resource' in edit) && (edit as MonacoResourceTextEdit)?.resource?.path === editInfo.id)) ||
+                        (('newResource' in edit) && (edit as MonacoResourceFileEdit)?.newResource?.path === editInfo.id))
+                        .map((edit, index) => this.createBulkEditNode(('resource' in edit ? edit as MonacoResourceTextEdit :
+                            edit as MonacoResourceFileEdit), index, editInfo));
+                });
+            }
+        }
+        return bulkEditInfos;
+    }
+
+    private createBulkEditNode(bulkEdit: MonacoResourceFileEdit | MonacoResourceTextEdit, index: number, parent: BulkEditInfoNode): BulkEditNode {
+        const id = parent.id + '_' + index;
+        const existing = this.getNode(id);
+        if (BulkEditNode.is(existing)) {
+            existing.bulkEdit = bulkEdit;
+            return existing;
+        }
+        return {
+            id,
+            name: 'bulkEdit',
+            parent,
+            selected: false,
+            uri: parent.uri,
+            bulkEdit
+        };
+    }
+
+    private createBulkEditInfo(id: string, uri: URI, fileContents: string | undefined): BulkEditInfoNode {
+        return {
+            id,
+            uri,
+            expanded: true,
+            selected: false,
+            parent: this.root as BulkEditInfoNode,
+            fileContents,
+            children: []
+        };
+    }
+
+    private getResourcePath(edit: ResourceEdit): string | undefined {
+        return ResourceTextEdit.is(edit) ? edit.resource.path :
+            ResourceFileEdit.is(edit) && edit.newResource ? edit.newResource.path : undefined;
+    }
+}
+
+export interface BulkEditNode extends UriSelection, SelectableTreeNode {
+    parent: CompositeTreeNode;
+    bulkEdit: MonacoResourceFileEdit | MonacoResourceTextEdit;
+}
+export namespace BulkEditNode {
+    export function is(node: TreeNode | undefined): node is BulkEditNode {
+        return UriSelection.is(node) && SelectableTreeNode.is(node) && BulkEditNodeSelection.is(node);
+    }
+}
+
+export interface BulkEditInfoNode extends UriSelection, SelectableTreeNode, ExpandableTreeNode {
+    parent: CompositeTreeNode;
+    fileContents?: string;
+}
+export namespace BulkEditInfoNode {
+    export function is(node: unknown): node is BulkEditInfoNode {
+        return ExpandableTreeNode.is(node) && UriSelection.is(node) && 'fileContents' in node;
+    }
+}

package/src/browser/bulk-edit-tree/index.ts

@@ -1,21 +1,21 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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
-// *****************************************************************************
-
-export * from './bulk-edit-tree';
-export * from './bulk-edit-tree-model';
-export * from './bulk-edit-node-selection';
-export * from './bulk-edit-tree-widget';
-export * from './bulk-edit-tree-container';
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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
+// *****************************************************************************
+
+export * from './bulk-edit-tree';
+export * from './bulk-edit-tree-model';
+export * from './bulk-edit-node-selection';
+export * from './bulk-edit-tree-widget';
+export * from './bulk-edit-tree-container';

package/src/browser/bulk-edit-tree-label-provider.ts

@@ -1,71 +1,71 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 { LabelProvider, LabelProviderContribution, DidChangeLabelEvent } from '@theia/core/lib/browser/label-provider';
-import { BulkEditInfoNode } from './bulk-edit-tree';
-import { TreeLabelProvider } from '@theia/core/lib/browser/tree/tree-label-provider';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
-
-@injectable()
-export class BulkEditTreeLabelProvider implements LabelProviderContribution {
-
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
-
-    @inject(TreeLabelProvider)
-    protected readonly treeLabelProvider: TreeLabelProvider;
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    canHandle(element: object): number {
-        return BulkEditInfoNode.is(element) ?
-            this.treeLabelProvider.canHandle(element) + 1 :
-            0;
-    }
-
-    getIcon(node: BulkEditInfoNode): string {
-        return this.labelProvider.getIcon(node.uri);
-    }
-
-    getName(node: BulkEditInfoNode): string {
-        return this.labelProvider.getName(node.uri);
-    }
-
-    getLongName(node: BulkEditInfoNode): string {
-        const description: string[] = [];
-        const rootUri = this.workspaceService.getWorkspaceRootUri(node.uri);
-        // In a multiple-root workspace include the root name to the label before the parent directory.
-        if (this.workspaceService.isMultiRootWorkspaceOpened && rootUri) {
-            description.push(this.labelProvider.getName(rootUri));
-        }
-        // If the given resource is not at the workspace root, include the parent directory to the label.
-        if (rootUri?.toString() !== node.uri.parent.toString()) {
-            description.push(this.labelProvider.getLongName(node.uri.parent));
-        }
-        return description.join(' ● ');
-    }
-
-    getDescription(node: BulkEditInfoNode): string {
-        return this.labelProvider.getLongName(node.uri.parent);
-    }
-
-    affects(node: BulkEditInfoNode, event: DidChangeLabelEvent): boolean {
-        return event.affects(node.uri) || event.affects(node.uri.parent);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 { LabelProvider, LabelProviderContribution, DidChangeLabelEvent } from '@theia/core/lib/browser/label-provider';
+import { BulkEditInfoNode } from './bulk-edit-tree';
+import { TreeLabelProvider } from '@theia/core/lib/browser/tree/tree-label-provider';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+
+@injectable()
+export class BulkEditTreeLabelProvider implements LabelProviderContribution {
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    @inject(TreeLabelProvider)
+    protected readonly treeLabelProvider: TreeLabelProvider;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    canHandle(element: object): number {
+        return BulkEditInfoNode.is(element) ?
+            this.treeLabelProvider.canHandle(element) + 1 :
+            0;
+    }
+
+    getIcon(node: BulkEditInfoNode): string {
+        return this.labelProvider.getIcon(node.uri);
+    }
+
+    getName(node: BulkEditInfoNode): string {
+        return this.labelProvider.getName(node.uri);
+    }
+
+    getLongName(node: BulkEditInfoNode): string {
+        const description: string[] = [];
+        const rootUri = this.workspaceService.getWorkspaceRootUri(node.uri);
+        // In a multiple-root workspace include the root name to the label before the parent directory.
+        if (this.workspaceService.isMultiRootWorkspaceOpened && rootUri) {
+            description.push(this.labelProvider.getName(rootUri));
+        }
+        // If the given resource is not at the workspace root, include the parent directory to the label.
+        if (rootUri?.toString() !== node.uri.parent.toString()) {
+            description.push(this.labelProvider.getLongName(node.uri.parent));
+        }
+        return description.join(' ● ');
+    }
+
+    getDescription(node: BulkEditInfoNode): string {
+        return this.labelProvider.getLongName(node.uri.parent);
+    }
+
+    affects(node: BulkEditInfoNode, event: DidChangeLabelEvent): boolean {
+        return event.affects(node.uri) || event.affects(node.uri.parent);
+    }
+
+}