@theia/plugin-ext 1.77.0-next.49 → 1.77.0-next.56

package/src/main/node/handlers/plugin-theia-directory-handler.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import * as path from 'path';
-import * as filenamify from 'filenamify';
+import filenamify from 'filenamify';
 import * as fs from '@theia/core/shared/fs-extra';
 import { URI, ILogger } from '@theia/core';
 import { inject, injectable, named } from '@theia/core/shared/inversify';

package/src/main/node/handlers/plugin-theia-file-handler.ts

@@ -20,7 +20,7 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { getTempDirPathAsync } from '../temp-dir-util';
 import * as fs from '@theia/core/shared/fs-extra';
-import * as filenamify from 'filenamify';
+import filenamify from 'filenamify';
 import { FileUri } from '@theia/core/lib/common/file-uri';
 import { PluginTheiaEnvironment } from '../../common/plugin-theia-environment';
 

package/src/main/node/plugin-deployer-file-handler-context-impl.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { PluginDeployerEntry, PluginDeployerFileHandlerContext } from '../../common/plugin-protocol';
-import * as decompress from 'decompress';
+import decompress from 'decompress';
 
 export class PluginDeployerFileHandlerContextImpl implements PluginDeployerFileHandlerContext {
 

package/src/main/node/plugin-service.ts

@@ -17,7 +17,7 @@
 import * as http from 'http';
 import * as path from 'path';
 const vhost = require('vhost');
-import * as express from '@theia/core/shared/express';
+import express from '@theia/core/shared/express';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
 import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
 import { WebviewExternalEndpoint } from '../common/webview-protocol';

package/src/plugin/document-data.ts

@@ -59,7 +59,6 @@ export class DocumentDataExt {
 
         // Update my lines
         const changes = e.changes;
-        // tslint:disable-next-line:one-variable-per-declaration
         for (let i = 0, len = changes.length; i < len; i++) {
             const change = changes[i];
             this.acceptDeleteRange(change.range);

package/src/plugin/file-system-event-service-ext-impl.ts

@@ -26,7 +26,7 @@
 /* eslint-disable max-len */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/tslint/config */
+/* eslint-disable @theia/explicit-return-type */
 
 import { Emitter, Event as EventNamespace, WaitUntilEvent, AsyncEmitter, WaitUntilData } from '@theia/core/lib/common/event';
 import { GLOB_SPLIT, GLOBSTAR, parse } from '@theia/core/lib/common/glob';

package/src/plugin/file-system-ext-impl.ts

@@ -24,9 +24,9 @@
  */
 
 /* eslint-disable arrow-body-style */
-/* eslint-disable @typescript-eslint/quotes */
-/* eslint-disable @typescript-eslint/tslint/config */
+/* eslint-disable @stylistic/quotes */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @theia/explicit-return-type */
 
 import { Schemes as Schemas, UriComponents } from '../common/uri-components';
 import { FileChangeType, FileSystemError, URI } from './types-impl';

package/src/plugin/known-commands.ts

@@ -366,9 +366,9 @@ export namespace KnownCommands {
         return L.create(l.uri.toString(), fromRangeToR(l.range));
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/tslint/config
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @theia/explicit-return-type
     function vscodeToMonacoArgsConverter(args: any[]) {
-        // tslint:disable-next-line:typedef
+        // eslint-disable-next-line @theia/explicit-return-type
         return cloneAndChange(args, function (value) {
             if (CallHierarchyItem.isCallHierarchyItem(value)) {
                 return fromCallHierarchyItem(value);
@@ -394,9 +394,9 @@ export namespace KnownCommands {
         });
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/tslint/config
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @theia/explicit-return-type
     function monacoToVscodeArgsConverter(args: any[]) {
-        // tslint:disable-next-line:typedef
+        // eslint-disable-next-line @theia/explicit-return-type
         return cloneAndChange(args, function (value) {
             if (isModelCallHierarchyItem(value)) {
                 return toCallHierarchyItem(value);
@@ -422,7 +422,7 @@ export namespace KnownCommands {
 }
 
 function toArrayConversion<T, U>(f: (a: T) => U): (a: T[]) => U[] {
-    // tslint:disable-next-line:typedef
+    // eslint-disable-next-line @theia/explicit-return-type
     return function (a: T[]) {
         return a.map(f);
     };

package/src/plugin/plugin-context.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* tslint:disable:typedef */
+/* eslint-disable @theia/explicit-return-type */
 
 import type * as theia from '@theia/plugin';
 import { CommandRegistryImpl } from './command-registry';
@@ -1698,7 +1698,7 @@ export class Plugin<T> implements theia.Plugin<T> {
     }
 
     get exports(): T {
-        return <T>this.#pluginManager.getPluginExport(this.id);
+        return this.#pluginManager.getPluginExport(this.id) as T;
     }
 
     activate(): PromiseLike<T> {
@@ -1729,7 +1729,7 @@ export class PluginExt<T> extends Plugin<T> implements ExtensionPlugin<T> {
     }
 
     override get exports(): T {
-        return <T>this.#pluginManager.getPluginExport(this.id);
+        return this.#pluginManager.getPluginExport(this.id) as T;
     }
 
     override activate(): PromiseLike<T> {

package/src/plugin/scm.spec.ts

@@ -24,7 +24,13 @@
 import * as assert from 'assert';
 import { Emitter } from '@theia/core/lib/common/event';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ScmCommandArg, ScmHistoryItemCommandArg } from '../common/plugin-api-rpc';
+import { ScmCommandArg, ScmHistoryItemCommandArg, ScmMain, ScmRawResourceSplices } from '../common/plugin-api-rpc';
+import { ScmExtImpl } from './scm';
+import { RPCProtocol } from '../common/rpc-protocol';
+import { CommandRegistryImpl } from './command-registry';
+import { Plugin } from '../common';
+import { URI } from './types-impl';
+import { SourceControlResourceGroup, SourceControlResourceState } from '@theia/plugin';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -152,6 +158,66 @@ class HistoryProviderBridge {
     }
 }
 
+describe('SCM multi-diff resource snapshots (plugin side)', () => {
+    let group: SourceControlResourceGroup;
+    let updates: ScmRawResourceSplices[][];
+
+    beforeEach(() => {
+        updates = [];
+        const proxy = new Proxy({}, {
+            get: (_target, name) => name === '$spliceResourceStates'
+                ? (_handle: number, splices: ScmRawResourceSplices[]): void => { updates.push(splices); }
+                : (): void => { }
+        }) as ScmMain;
+        const scm = new ScmExtImpl(
+            { getProxy: () => proxy } as unknown as RPCProtocol,
+            { registerArgumentProcessor: () => { } } as unknown as CommandRegistryImpl
+        );
+        const sourceControl = scm.createSourceControl({ model: { id: 'test' } } as Plugin, 'git', 'Git', undefined);
+        group = sourceControl.createResourceGroup('changes', 'Changes');
+    });
+
+    it('serializes added and deleted sides using the proposed modified field name', () => {
+        const added = URI.parse('file:///repo/added.txt');
+        const deleted = URI.parse('git:/repo/deleted.txt?ref=HEAD#original');
+        group.resourceStates = [
+            { resourceUri: added, multiFileDiffEditorModifiedUri: added },
+            { resourceUri: URI.file('/repo/deleted.txt'), multiDiffEditorOriginalUri: deleted }
+        ];
+        const resources = updates[0][0].splices[0].rawResources;
+        assert.strictEqual(resources[0].multiDiffEditorOriginalUri, undefined);
+        assert.strictEqual(resources[0].multiDiffEditorModifiedUri?.toString(), added.toString());
+        assert.strictEqual(resources[1].multiDiffEditorOriginalUri?.toString(), deleted.toString());
+        assert.strictEqual(resources[1].multiDiffEditorModifiedUri, undefined);
+    });
+
+    for (const field of ['multiDiffEditorOriginalUri', 'multiFileDiffEditorModifiedUri'] as const) {
+        it(`detects ${field}-only additions, changes and removals, but ignores equal URIs`, () => {
+            const resourceUri = URI.file('/repo/file.txt');
+            const state: SourceControlResourceState = { resourceUri };
+            group.resourceStates = [state];
+            updates.length = 0;
+            group.resourceStates = [{ ...state }];
+            assert.strictEqual(updates.length, 0);
+
+            for (const uri of [URI.parse('git:/repo/file.txt?ref=HEAD'), URI.parse('git:/repo/file.txt?ref=HEAD~1#changed'), undefined]) {
+                const nextState = { ...state, [field]: uri };
+                group.resourceStates = [nextState];
+                assert.strictEqual(updates.length, 1);
+                const splices = updates[0][0].splices;
+                assert.strictEqual(splices.reduce((count, splice) => count + splice.deleteCount, 0), 1);
+                const resources = splices.flatMap(splice => splice.rawResources);
+                assert.strictEqual(resources.length, 1);
+                const rawField = field === 'multiFileDiffEditorModifiedUri' ? 'multiDiffEditorModifiedUri' : field;
+                assert.strictEqual(resources[0][rawField]?.toString(), uri?.toString());
+                updates.length = 0;
+                group.resourceStates = [{ ...nextState, [field]: uri ? URI.parse(uri.toString()) : undefined }];
+                assert.strictEqual(updates.length, 0);
+            }
+        });
+    }
+});
+
 describe('SCM history provider bridge (plugin side)', () => {
     let bridge: HistoryProviderBridge;
     let bridgeDisposables: DisposableCollection;

package/src/plugin/scm.ts

@@ -68,6 +68,10 @@ function getIconResource(decorations?: theia.SourceControlResourceThemableDecora
 }
 
 function comparePaths(one: string, other: string, caseSensitive = false): number {
+    if (one === other) {
+        return 0;
+    }
+
     const oneParts = one.split(sep);
     const otherParts = other.split(sep);
 
@@ -225,6 +229,17 @@ function compareResourceStates(a: theia.SourceControlResourceState, b: theia.Sou
         return result;
     }
 
+    result = (a.multiDiffEditorOriginalUri?.toString() ?? '').localeCompare(b.multiDiffEditorOriginalUri?.toString() ?? '');
+    if (result !== 0) {
+        return result;
+    }
+
+    result = (a.multiFileDiffEditorModifiedUri?.toString() ?? '').localeCompare(b.multiFileDiffEditorModifiedUri?.toString() ?? '');
+
+    if (result !== 0) {
+        return result;
+    }
+
     if (a.command && b.command) {
         result = compareCommands(a.command, b.command);
     } else if (a.command) {
@@ -494,7 +509,9 @@ class ScmResourceGroupImpl implements theia.SourceControlResourceGroup {
                 const rawResource = {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     handle, sourceUri, letter: (r as any).letter, colorId: (r as any).color?.id, icons,
-                    tooltip, strikeThrough, faded, contextValue, command
+                    tooltip, strikeThrough, faded, contextValue, command,
+                    multiDiffEditorOriginalUri: r.multiDiffEditorOriginalUri,
+                    multiDiffEditorModifiedUri: r.multiFileDiffEditorModifiedUri
                 } as ScmRawResource;
 
                 return { rawResource, handle };

package/src/plugin/tests.ts

@@ -23,7 +23,7 @@
 
 // /* eslint-disable */
 
-/* tslint:disable:typedef */
+/* eslint-disable @theia/explicit-return-type */
 
 import * as theia from '@theia/plugin';
 import { CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
@@ -318,7 +318,7 @@ export class TestRun implements theia.TestRun {
         return true;
     }
 
-    private updateTestState<T extends TestStateChangeDTO>(item: theia.TestItem, state: T) {
+    private updateTestState<T extends TestStateChangeDTO>(item: theia.TestItem, state: T): void {
         if (this.checkNotEnded(item)) {
             this.testStateDeltas.set(item, state);
             this.changeBatcher.changeOccurred();

package/src/plugin/tree/tree-views.ts

@@ -93,7 +93,7 @@ export class TreeViewsExtImpl implements TreeViewsExt {
         this.treeViews.set(treeViewId, treeView);
 
         return {
-            // tslint:disable:typedef
+            /* eslint-disable @theia/explicit-return-type */
             get onDidExpandElement() {
                 return treeView.onDidExpandElement;
             },
@@ -115,6 +115,7 @@ export class TreeViewsExtImpl implements TreeViewsExt {
             get onDidChangeCheckboxState() {
                 return treeView.onDidChangeCheckboxState;
             },
+            /* eslint-enable @theia/explicit-return-type */
             get message(): string {
                 return treeView.message;
             },

package/src/plugin/type-converters.spec.ts

@@ -150,7 +150,7 @@ describe('Type converters:', () => {
 
             it('should convert array of markups to model markdown', () => {
                 // given
-                // eslint-disable-next-line deprecation/deprecation
+                // eslint-disable-next-line @typescript-eslint/no-deprecated
                 const markups: (theia.MarkdownString | theia.MarkedString)[] = [
                     pluginMarkdown,
                     aStringWithMarkdown,