@theia/plugin-ext-vscode 1.77.0-next.7 → 1.77.0-next.71

package/src/browser/plugin-vscode-commands-contribution.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Command, CommandContribution, CommandRegistry, environment, isOSX, CancellationTokenSource, MessageService, isArray, ILogger } from '@theia/core';
+import { Command, CommandContribution, CommandRegistry, environment, isOSX, CancellationTokenSource, MessageService, isArray, ILogger, MEMORY_TEXT_READONLY } from '@theia/core';
 import {
     ApplicationShell,
     CommonCommands,
@@ -53,7 +53,7 @@ import { DiffService } from '@theia/workspace/lib/browser/diff-service';
 import { inject, injectable, optional, named } from '@theia/core/shared/inversify';
 import { Position } from '@theia/plugin-ext/lib/common/plugin-api-rpc';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { PluginDeployOptions, PluginIdentifiers, PluginServer } from '@theia/plugin-ext/lib/common/plugin-protocol';
+import { DuplicateExtensionError, PluginDeployOptions, PluginIdentifiers, PluginServer } from '@theia/plugin-ext/lib/common/plugin-protocol';
 import { TerminalFrontendContribution } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
 import { QuickOpenWorkspace } from '@theia/workspace/lib/browser/quick-open-workspace';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
@@ -84,7 +84,25 @@ import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline
 import { CompletionList, Range, Position as PluginPosition } from '@theia/plugin';
 import { MonacoLanguages } from '@theia/monaco/lib/browser/monaco-languages';
 import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
+import { ScmService } from '@theia/scm/lib/browser/scm-service';
 import { MergeEditorOpenerOptions, MergeEditorUri } from '@theia/scm/lib/browser/merge-editor/merge-editor';
+import { MultiDiffEditorOpenerOptions, MultiDiffEditorUri } from '@theia/scm/lib/browser/multi-diff-editor/multi-diff-editor';
+
+/**
+ * Convert a VS Code {@link UriComponents} or a string URI into a Theia {@link TheiaURI}.
+ * Returns `undefined` when given `undefined`.
+ */
+function toTheiaUri(value: UriComponents | string): TheiaURI;
+function toTheiaUri(value: UriComponents | string | undefined): TheiaURI | undefined;
+function toTheiaUri(value: UriComponents | string | undefined): TheiaURI | undefined {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (typeof value === 'string') {
+        return new TheiaURI(value);
+    }
+    return TheiaURI.fromComponents(value);
+}
 
 export namespace VscodeCommands {
 
@@ -287,6 +305,8 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
     protected monacoLanguages: MonacoLanguages;
     @inject(ScmContribution)
     protected scmContribution: ScmContribution;
+    @inject(ScmService)
+    protected readonly scmService: ScmService;
 
     @inject(ILogger) @named('plugin-ext-vscode:PluginVscodeCommandsContribution')
     protected readonly logger: ILogger;
@@ -578,14 +598,7 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
         commands.registerCommand(VscodeCommands.INSTALL_EXTENSION_FROM_ID_OR_URI, {
             execute: async (vsixUriOrExtensionId: TheiaURI | UriComponents | string) => {
                 if (typeof vsixUriOrExtensionId === 'string') {
-                    let extensionId = vsixUriOrExtensionId;
-                    let opts: PluginDeployOptions | undefined;
-                    const versionedId = PluginIdentifiers.idAndVersionFromVersionedId(vsixUriOrExtensionId);
-                    if (versionedId) {
-                        extensionId = versionedId.id;
-                        opts = { version: versionedId.version, ignoreOtherVersions: true };
-                    }
-                    await this.pluginServer.install(VSCodeExtensionUri.fromId(extensionId).toString(), undefined, opts);
+                    await this.installExtensionFromId(vsixUriOrExtensionId);
                 } else {
                     await this.deployPlugin(vsixUriOrExtensionId);
                 }
@@ -1283,13 +1296,6 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
 
         commands.registerCommand({ id: '_open.mergeEditor' }, {
             execute: async (arg: OpenMergeEditorCommandArg): Promise<void> => {
-                const toTheiaUri = (o: UriComponents | string): TheiaURI => {
-                    if (typeof o === 'string') {
-                        return new TheiaURI(o);
-                    }
-                    return TheiaURI.fromComponents(o);
-                };
-
                 const baseUri = toTheiaUri(arg.base);
                 const resultUri = toTheiaUri(arg.output);
                 const side1Uri = typeof arg.input1 === 'string' ? toTheiaUri(arg.input1) : toTheiaUri(arg.input1.uri);
@@ -1312,36 +1318,79 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
             }
         });
 
-        // Temporary workaround: opens a single diff editor for the revealed resource.
-        // TODO: GH-16280 implement a proper MultiDiffEditor widget.
+        commands.registerCommand({ id: '_workbench.openScmMultiDiffEditor' }, {
+            execute: async (options: { title: string; repositoryUri: UriComponents; resourceGroupId: string }): Promise<void> => {
+                const repositoryUri = toTheiaUri(options.repositoryUri);
+                if (!repositoryUri) {
+                    return;
+                }
+                const repository = this.scmService.repositories.find(repo => new TheiaURI(repo.provider.rootUri).isEqual(repositoryUri));
+                const group = repository?.provider.groups.find(candidate => candidate.id === options.resourceGroupId);
+                if (!group) {
+                    return;
+                }
+                await commands.executeCommand('_workbench.openMultiDiffEditor', {
+                    title: options.title,
+                    resources: group.resources.map(resource => ({
+                        originalUri: resource.multiDiffEditorOriginalUri?.toComponents(),
+                        modifiedUri: resource.multiDiffEditorModifiedUri?.toComponents()
+                    }))
+                });
+            }
+        });
+
         commands.registerCommand({ id: '_workbench.openMultiDiffEditor' }, {
             execute: async (options: {
                 title: string;
-                resources?: { originalUri: UriComponents; modifiedUri: UriComponents }[];
+                resources?: { originalUri?: UriComponents; modifiedUri?: UriComponents }[];
                 reveal?: { modifiedUri: UriComponents };
             }): Promise<void> => {
                 if (!options.resources?.length) {
                     return;
                 }
-                const revealModified = options.reveal?.modifiedUri;
-                const revealStr = revealModified ? URI.revive(revealModified)?.toString() : undefined;
-                const target = revealStr
-                    ? options.resources.find(r => URI.revive(r.modifiedUri)?.toString() === revealStr)
-                    : undefined;
-                const resource = target ?? options.resources[0];
-                const left = URI.revive(resource.originalUri);
-                const right = URI.revive(resource.modifiedUri);
-                if (left && right) {
-                    await commands.executeCommand(VscodeCommands.DIFF.id, left, right, options.title);
-                } else if (right) {
-                    await commands.executeCommand(VscodeCommands.OPEN.id, right);
-                } else if (left) {
-                    await commands.executeCommand(VscodeCommands.OPEN.id, left);
+                const resources = options.resources
+                    .map(r => {
+                        const originalUri = toTheiaUri(r.originalUri);
+                        const modifiedUri = toTheiaUri(r.modifiedUri);
+                        const resourceUri = modifiedUri ?? originalUri;
+                        if (!resourceUri) {
+                            return undefined;
+                        }
+                        const emptyUri = new TheiaURI().withScheme(MEMORY_TEXT_READONLY).withPath(resourceUri.path);
+                        return { originalUri: originalUri ?? emptyUri, modifiedUri: modifiedUri ?? emptyUri };
+                    })
+                    .filter((r): r is { originalUri: TheiaURI; modifiedUri: TheiaURI } => r !== undefined);
+                if (!resources.length) {
+                    return;
                 }
+                const uri = MultiDiffEditorUri.encode({ title: options.title, resources });
+                const reveal = toTheiaUri(options.reveal?.modifiedUri);
+                const openerOptions: MultiDiffEditorOpenerOptions = { reveal };
+                await open(this.openerService, uri, openerOptions);
             },
         });
     }
 
+    /**
+     * Installs an extension by its (optionally versioned) ID. Installing an extension that is already installed is a noop.
+     */
+    protected async installExtensionFromId(extensionIdOrVersionedId: string): Promise<void> {
+        let extensionId = extensionIdOrVersionedId;
+        let opts: PluginDeployOptions | undefined;
+        const versionedId = PluginIdentifiers.idAndVersionFromVersionedId(extensionIdOrVersionedId);
+        if (versionedId) {
+            extensionId = versionedId.id;
+            opts = { version: versionedId.version, ignoreOtherVersions: true };
+        }
+        try {
+            await this.pluginServer.install(VSCodeExtensionUri.fromId(extensionId).toString(), undefined, opts);
+        } catch (e) {
+            if (!DuplicateExtensionError.is(e)) {
+                throw e;
+            }
+        }
+    }
+
     private async deployPlugin(uri: TheiaURI | UriComponents): Promise<void> {
         const uriPath = isUriComponents(uri) ? URI.revive(uri).fsPath : await this.fileService.fsPath(uri);
         return this.pluginServer.install(`local-file:${uriPath}`);

package/src/node/local-vsix-file-plugin-deployer-resolver.ts

@@ -16,7 +16,7 @@
 
 import * as path from 'path';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
-import { PluginDeployerResolverContext, PluginIdentifiers } from '@theia/plugin-ext';
+import { DuplicateExtensionError, PluginDeployerResolverContext, PluginIdentifiers } from '@theia/plugin-ext';
 import { LocalPluginDeployerResolver } from '@theia/plugin-ext/lib/main/node/resolvers/local-plugin-deployer-resolver';
 import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';
 import { isVSCodePluginFile } from './plugin-vscode-file-handler';
@@ -68,11 +68,7 @@ export class LocalVSIXFilePluginDeployerResolver extends LocalPluginDeployerReso
         // Check if the deployment directory already exists on disk
         if (await existsInDeploymentDir(this.environment, versionedId)) {
             const unversionedId = PluginIdentifiers.componentsToUnversionedId(components);
-            const error = new Error(
-                `Extension ${unversionedId} is already installed (version: ${components.version}).`
-            );
-            error.name = 'DuplicateExtensionError';
-            throw error;
+            throw DuplicateExtensionError.create(`Extension ${unversionedId} is already installed (version: ${components.version}).`);
         }
 
         const extensionDeploymentDir = await unpackToDeploymentDir(this.environment, localPath, versionedId);

package/src/node/plugin-vscode-file-handler.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { PluginDeployerFileHandler, PluginDeployerEntry, PluginDeployerFileHandlerContext } from '@theia/plugin-ext';
-import * as filenamify from 'filenamify';
+import filenamify from 'filenamify';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import * as fs from '@theia/core/shared/fs-extra';
 import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';

package/src/node/plugin-vscode-utils.ts

@@ -14,9 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import * as decompress from 'decompress';
+import decompress from 'decompress';
 import * as path from 'path';
-import * as filenamify from 'filenamify';
+import filenamify from 'filenamify';
 import { FileUri } from '@theia/core/lib/node';
 import * as fs from '@theia/core/shared/fs-extra';
 import { PluginVSCodeEnvironment } from '../common/plugin-vscode-environment';