@theia/plugin-ext 1.71.0-next.8 → 1.72.0-next.0

package/src/plugin/terminal-ext.ts

@@ -38,6 +38,13 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
 
     private readonly _terminals = new Map<string, TerminalExtImpl>();
 
+    /**
+     * Stores the API objects (Proxies) returned to plugins for each terminal.
+     * This ensures that events fire with the same object instance that plugins received,
+     * allowing strict equality checks (===) to work correctly.
+     */
+    private readonly _terminalApiObjects = new Map<string, theia.Terminal>();
+
     private readonly _pseudoTerminals = new Map<string, PseudoTerminal>();
 
     private static nextProviderId = 0;
@@ -66,8 +73,8 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.TERMINAL_MAIN);
     }
 
-    get terminals(): TerminalExtImpl[] {
-        return [...this._terminals.values()];
+    get terminals(): theia.Terminal[] {
+        return [...this._terminals.keys()].map(id => this.getApiObject(id)).filter((t): t is theia.Terminal => t !== undefined);
     }
 
     get defaultShell(): string {
@@ -84,7 +91,9 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
     createTerminal(
         plugin: Plugin,
         nameOrOptions: theia.TerminalOptions | theia.PseudoTerminalOptions | theia.ExtensionTerminalOptions | string | undefined,
-        shellPath?: string, shellArgs?: string[] | string
+        shellPath?: string,
+        shellArgs?: string[] | string,
+        apiObjectWrapper?: (terminal: TerminalExtImpl) => theia.Terminal
     ): theia.Terminal {
         const id = `plugin-terminal-${UUID.uuid4()}`;
         let options: TerminalOptions;
@@ -110,7 +119,15 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         let parentId;
         if (options.location && typeof options.location === 'object' && 'parentTerminal' in options.location) {
             const parentTerminal = options.location.parentTerminal;
-            if (parentTerminal instanceof TerminalExtImpl) {
+            // Check both the API proxy objects and the raw terminals, since
+            // plugins receive the proxy but _terminals stores the raw object.
+            for (const [k, v] of this._terminalApiObjects) {
+                if (v === parentTerminal) {
+                    parentId = k;
+                    break;
+                }
+            }
+            if (!parentId) {
                 for (const [k, v] of this._terminals) {
                     if (v === parentTerminal) {
                         parentId = k;
@@ -136,7 +153,16 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         if (typeof nameOrOptions === 'object' && 'pty' in nameOrOptions) {
             creationOptions = nameOrOptions;
         }
-        return this.obtainTerminal(id, options.name || 'Terminal', creationOptions);
+        const terminal = this.obtainTerminal(id, options.name || 'Terminal', creationOptions);
+
+        // If a wrapper function is provided, wrap the terminal and register the API object
+        // This ensures events fire with the same object instance that plugins received
+        if (apiObjectWrapper) {
+            const apiObject = apiObjectWrapper(terminal);
+            this._terminalApiObjects.set(id, apiObject);
+            return apiObject;
+        }
+        return terminal;
     }
 
     attachPtyToTerminal(terminalId: number, pty: theia.Pseudoterminal): void {
@@ -153,6 +179,13 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         return terminal;
     }
 
+    /**
+     * Gets the API object for a terminal by ID, falling back to the raw terminal if not set.
+     */
+    protected getApiObject(id: string): theia.Terminal | undefined {
+        return this._terminalApiObjects.get(id) ?? this._terminals.get(id);
+    }
+
     $terminalOnInput(id: string, data: string): void {
         const terminal = this._pseudoTerminals.get(id);
         if (!terminal) {
@@ -168,7 +201,10 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         }
         if (!terminal.state.isInteractedWith) {
             terminal.state = { ...terminal.state, isInteractedWith: true };
-            this.onDidChangeTerminalStateEmitter.fire(terminal);
+            const apiObject = this.getApiObject(id);
+            if (apiObject) {
+                this.onDidChangeTerminalStateEmitter.fire(apiObject);
+            }
         }
     }
 
@@ -179,7 +215,10 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         }
         if (terminal.state.shell !== shellType) {
             terminal.state = { ...terminal.state, shell: shellType };
-            this.onDidChangeTerminalStateEmitter.fire(terminal);
+            const apiObject = this.getApiObject(id);
+            if (apiObject) {
+                this.onDidChangeTerminalStateEmitter.fire(apiObject);
+            }
         }
     }
 
@@ -194,7 +233,10 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
     $terminalCreated(id: string, name: string): void {
         const terminal = this.obtainTerminal(id, name);
         terminal.id.resolve(id);
-        this.onDidOpenTerminalEmitter.fire(terminal);
+        const apiObject = this.getApiObject(id);
+        if (apiObject) {
+            this.onDidOpenTerminalEmitter.fire(apiObject);
+        }
     }
 
     $terminalNameChanged(id: string, name: string): void {
@@ -234,8 +276,12 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         const terminal = this._terminals.get(id);
         if (terminal) {
             terminal.exitStatus = exitStatus ?? { code: undefined, reason: TerminalExitReason.Unknown };
-            this.onDidCloseTerminalEmitter.fire(terminal);
+            const apiObject = this.getApiObject(id);
+            if (apiObject) {
+                this.onDidCloseTerminalEmitter.fire(apiObject);
+            }
             this._terminals.delete(id);
+            this._terminalApiObjects.delete(id);
         }
         const pseudoTerminal = this._pseudoTerminals.get(id);
         if (pseudoTerminal) {
@@ -245,8 +291,8 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
     }
 
     private activeTerminalId: string | undefined;
-    get activeTerminal(): TerminalExtImpl | undefined {
-        return this.activeTerminalId && this._terminals.get(this.activeTerminalId) || undefined;
+    get activeTerminal(): theia.Terminal | undefined {
+        return this.activeTerminalId && this.getApiObject(this.activeTerminalId) || undefined;
     }
     $currentTerminalChanged(id: string | undefined): void {
         this.activeTerminalId = id;
@@ -319,7 +365,7 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
 
     async $provideTerminalLinks(line: string, terminalId: string, token: theia.CancellationToken): Promise<ProvidedTerminalLink[]> {
         const links: ProvidedTerminalLink[] = [];
-        const terminal = this._terminals.get(terminalId);
+        const terminal = this.getApiObject(terminalId);
         if (terminal) {
             for (const [providerId, provider] of this.terminalLinkProviders) {
                 const providedLinks = await provider.provideTerminalLinks({ line, terminal }, token);

package/src/plugin/test-item.ts

@@ -132,9 +132,14 @@ export class TestItemCollection implements theia.TestItemCollection {
         return this.values.size;
     }
     replace(items: readonly theia.TestItem[]): void {
-        const toRemove = this.values.values.map(item => item.id);
-        items.forEach(item => this.add(item));
-        toRemove.forEach(key => this.delete(key));
+        const toDelete = new Set(this.values.values.map(item => item.id));
+        for (const item of items) {
+            toDelete.delete(item.id);
+            this.add(item);
+        }
+        for (const id of toDelete) {
+            this.delete(id);
+        }
     }
 
     forEach(callback: (item: theia.TestItem, collection: theia.TestItemCollection) => unknown, thisArg?: unknown): void {

package/src/plugin/tests.ts

@@ -299,6 +299,10 @@ export class TestRun implements theia.TestRun {
     }
 
     end(): void {
+        if (this.ended) {
+            return;
+        }
+        this.changeBatcher.flush();
         this.ended = true;
         this.proxy.$notifyTestRunEnded(this.controller.id, this.id);
     }
@@ -428,9 +432,16 @@ export class TestingExtImpl implements TestingExt {
     $onResolveChildren(controllerId: string, path: string[]): void {
         const controller = this.withController(controllerId);
         if (controller.resolveHandler) {
-            const item = controller.items.find(path);
-            if (item?.canResolveChildren) { // the item and resolve handler might have been been changed, but not sent to the front end
-                controller.resolveHandler?.(item);
+            if (path.length === 0) {
+                // Root-level resolve: discover top-level test items
+                controller.resolveHandler(undefined);
+            } else {
+                const item = controller.items.find(path);
+                // The `main` side should only request resolution for items with `canResolveChildren`, but with event batching,
+                // the flag can be out of sync with the state on the `plugin` side. The state on the `plugin` side is authoritative.
+                if (item?.canResolveChildren) {
+                    controller.resolveHandler(item);
+                }
             }
         }
     }

package/src/plugin/type-converters.ts

@@ -22,7 +22,7 @@ import {
     DecorationOptions, EditorPosition, Plugin, Position, WorkspaceTextEditDto, WorkspaceFileEditDto, Selection, TaskDto, WorkspaceEditDto
 } from '../common/plugin-api-rpc';
 import * as model from '../common/plugin-api-rpc-model';
-import { LanguageFilter, LanguageSelector, RelativePattern } from '@theia/editor/lib/common/language-selector';
+import { LanguageFilter, LanguageSelector } from '@theia/editor/lib/common/language-selector';
 import { MarkdownString as PluginMarkdownStringImpl } from './markdown-string';
 import * as types from './types-impl';
 import { UriComponents } from '../common/uri-components';
@@ -246,27 +246,21 @@ export function fromDocumentSelector(selector: theia.DocumentSelector | undefine
         return {
             language: selector.language,
             scheme: selector.scheme,
-            pattern: fromGlobPattern(selector.pattern!)
+            pattern: selector.pattern && fromGlobPattern(selector.pattern)
         } as LanguageFilter;
     }
 
 }
 
-export function fromGlobPattern(pattern: theia.GlobPattern): string | RelativePattern {
+export function fromGlobPattern(pattern: theia.GlobPattern): string | types.RelativePattern {
     if (typeof pattern === 'string') {
         return pattern;
     }
 
-    if (isRelativePattern(pattern)) {
-        return new types.RelativePattern(pattern.baseUri, pattern.pattern);
-    }
-
-    return pattern;
-}
-
-function isRelativePattern(obj: {}): obj is theia.RelativePattern {
-    const rp = obj as theia.RelativePattern;
-    return rp && typeof rp.baseUri === 'string' && typeof rp.pattern === 'string';
+    return new types.RelativePattern(
+        pattern.baseUri ?? pattern.base, // preserve backwards compatibility with older extensions: legacy relative pattern shape did not have the `baseUri` property
+        pattern.pattern
+    );
 }
 
 export function fromCompletionItemKind(kind?: types.CompletionItemKind): model.CompletionItemKind {

package/src/plugin/types-impl.ts

@@ -737,7 +737,7 @@ export class ThemeIcon {
 
     static readonly Folder: ThemeIcon = new ThemeIcon('folder');
 
-    private constructor(public id: string, public color?: ThemeColor) {
+    constructor(public id: string, public color?: ThemeColor) {
     }
 
 }
@@ -816,7 +816,7 @@ export class RelativePattern {
     }
     set baseUri(baseUri: URI) {
         this._baseUri = baseUri;
-        this.base = baseUri.fsPath;
+        this._base = baseUri.fsPath;
     }
 
     constructor(base: theia.WorkspaceFolder | URI | string, public pattern: string) {

package/src/plugin/workspace.ts

@@ -39,7 +39,6 @@ import { Disposable, URI } from './types-impl';
 import { normalize } from '@theia/core/lib/common/paths';
 import { relative } from '../common/paths-util';
 import { Schemes, UriComponents } from '../common/uri-components';
-import { toWorkspaceFolder } from './type-converters';
 import { MessageRegistryExt } from './message-registry';
 import * as Converter from './type-converters';
 import { FileStat } from '@theia/filesystem/lib/common/files';
@@ -120,7 +119,22 @@ export class WorkspaceExtImpl implements WorkspaceExt {
 
     $onWorkspaceFoldersChanged(event: WorkspaceRootsChangeEvent): void {
         const newRoots = event.roots || [];
-        const newFolders = newRoots.map((root, index) => this.toWorkspaceFolder(root, index));
+        const oldFoldersByUri = new Map<string, theia.WorkspaceFolder>();
+        if (this.folders) {
+            for (const folder of this.folders) {
+                oldFoldersByUri.set(folder.uri.toString(), folder);
+            }
+        }
+        const newFolders = newRoots.map((root, index) => {
+            const existing = oldFoldersByUri.get(root);
+            if (existing) {
+                // Preserve object identity even if the index changed,
+                // since extensions may use folder objects as Map keys.
+                Object.assign(existing, { index });
+                return existing;
+            }
+            return this.toWorkspaceFolder(root, index);
+        });
         const delta = this.deltaFolders(this.folders, newFolders);
 
         this.folders = newFolders;
@@ -347,7 +361,7 @@ export class WorkspaceExtImpl implements WorkspaceExt {
             const folderPath = folder.uri.toString();
 
             if (resourcePath === folderPath) {
-                return toWorkspaceFolder(folder);
+                return folder;
             }
 
             if (resourcePath.startsWith(folderPath)