@theia/plugin-ext 1.73.0-next.7 → 1.73.0

package/src/main/browser/main-file-system-event-service.ts

@@ -27,18 +27,20 @@ import { URI } from '@theia/core';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileChangeType, WatchOptions } from '@theia/filesystem/lib/common/files';
-import { FileSystemPreferences } from '@theia/filesystem/lib/common/filesystem-preferences';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
 
 export class MainFileSystemEventService implements MainFileSystemEventServiceShape {
 
     private readonly toDispose = new DisposableCollection();
     private readonly watches = new Map<number, Disposable>();
+    /** Ancestor-of-workspace roots already skipped, to avoid logging on every re-registration. */
+    private readonly skippedWatchRoots = new Set<string>();
 
     constructor(
         rpc: RPCProtocol,
         container: interfaces.Container,
         private readonly fileService = container.get(FileService),
-        private readonly preferences = container.get<FileSystemPreferences>(FileSystemPreferences)
+        private readonly workspaceService = container.get(WorkspaceService)
     ) {
         const proxy = rpc.getProxy(MAIN_RPC_CONTEXT.ExtHostFileSystemEventService);
 
@@ -84,26 +86,54 @@ export class MainFileSystemEventService implements MainFileSystemEventServiceSha
             throw new Error(`There is already a watch request for the key ${session}`);
         }
         const uri = URI.fromComponents(resource);
-        // Plugin-created watchers (`vscode.workspace.createFileSystemWatcher`) arrive here with an
-        // empty `excludes` list. Language servers frequently request recursive watches rooted at
-        // absolute paths outside the workspace (e.g. JDT-LS's per-project globs), so apply the
-        // user's `files.watcherExclude` here to keep the number of OS file watches bounded.
-        const watch = this.fileService.watch(uri, { ...options, excludes: this.getExcludes(uri, options.excludes) });
+        if (this.shouldSkipWatch(uri, options)) {
+            // Register a no-op disposable so the session is tracked and `$unwatch` still works.
+            this.watches.set(session, Disposable.NULL);
+            return;
+        }
+        // Plugin/language-server watchers (`vscode.workspace.createFileSystemWatcher`) arrive here
+        // with an empty `excludes` list; `FileService.watch` applies `files.watcherExclude` centrally
+        // for all watchers, so they stay bounded without merging the excludes here.
+        const watch = this.fileService.watch(uri, options);
         this.toDispose.push(watch);
         this.watches.set(session, watch);
     }
 
-    protected getExcludes(uri: URI, requested: string[] = []): string[] {
-        const configured = this.preferences.get('files.watcherExclude', undefined, uri.toString());
-        const excludes = new Set(requested);
-        if (configured) {
-            for (const pattern of Object.keys(configured)) {
-                if (configured[pattern]) {
-                    excludes.add(pattern);
-                }
+    /**
+     * Whether a plugin-requested watch should not be registered at all.
+     *
+     * Theia's backend ignores the `recursive` flag and always watches recursively. A NON-recursive
+     * watch rooted at a strict ancestor of a workspace root - e.g. a language server (such as
+     * `redhat.java` / JDT-LS) watching the PARENT of the workspace folder via
+     * `RelativePattern(parentDir, folderName)` purely to detect deletion of the folder itself -
+     * would therefore be turned into a recursive crawl of every sibling subtree under that parent,
+     * i.e. thousands of inodes the workspace does not own, which can exhaust the OS file-watch
+     * budget. `files.watcherExclude` cannot bound it because the root is outside the workspace, so
+     * the only effective mitigation is to not register the watch.
+     *
+     * Explicit recursive requests are honored as-is, and watches on or inside a workspace root are
+     * left untouched.
+     */
+    protected shouldSkipWatch(uri: URI, options: WatchOptions): boolean {
+        if (options.recursive) {
+            return false;
+        }
+        const roots = this.workspaceService.tryGetRoots();
+        // A folder that is itself a workspace root must always be watched, even if it also happens to
+        // be a (strict) ancestor of another root in a multi-root workspace where one root is nested
+        // inside another. Only watches rooted strictly above every root are dropped.
+        const isWorkspaceRoot = roots.some(root => uri.isEqual(root.resource));
+        const isAncestorOfWorkspace = !isWorkspaceRoot && roots.some(root => uri.isEqualOrParent(root.resource));
+        if (isAncestorOfWorkspace) {
+            const key = uri.toString();
+            if (!this.skippedWatchRoots.has(key)) {
+                this.skippedWatchRoots.add(key);
+                console.warn('[MainFileSystemEventService] skipping non-recursive watch rooted at an ancestor of the '
+                    + `workspace (the backend would recursively crawl sibling trees): ${key}`);
             }
+            return true;
         }
-        return Array.from(excludes);
+        return false;
     }
 
     $unwatch(session: number): void {

package/src/main/browser/notebooks/renderers/cell-output-webview.tsx

@@ -19,7 +19,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as React from '@theia/core/shared/react';
-import { inject, injectable, interfaces } from '@theia/core/shared/inversify';
+import { inject, injectable, interfaces, named } from '@theia/core/shared/inversify';
 import { generateUuid } from '@theia/core/lib/common/uuid';
 import {
     NotebookRendererMessagingService, CellOutputWebview, NotebookRendererRegistry,
@@ -36,7 +36,7 @@ import {
     CellOutputChange, CellsChangedMessage, CellsMoved, CellsSpliced,
     ChangePreferredMimetypeMessage, FromWebviewMessage, Output, OutputChangedMessage
 } from './webview-communication';
-import { Disposable, DisposableCollection, Emitter, QuickPickService, nls } from '@theia/core';
+import { Disposable, DisposableCollection, Emitter, ILogger, QuickPickService, nls } from '@theia/core';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
 import { NotebookOptionsService, NotebookOutputOptions } from '@theia/notebook/lib/browser/service/notebook-options';
 import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-model';
@@ -224,6 +224,9 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     @inject(QuickPickService)
     protected readonly quickPickService: QuickPickService;
 
+    @inject(ILogger) @named('plugin-ext:CellOutputWebviewImpl')
+    protected readonly logger: ILogger;
+
     @inject(AdditionalNotebookCellOutputCss)
     protected readonly additionalOutputCss: string;
 
@@ -341,17 +344,18 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     }
 
     render(): React.JSX.Element {
-        return <div className='theia-notebook-cell-output-webview' ref={async element => {
+        return <div className='theia-notebook-cell-output-webview' ref={element => {
+            this.element = element ?? undefined;
             if (element) {
-                this.element = element;
-                await this.webviewWidgetInitialized.promise;
-                this.attachWebview();
+                this.webviewWidgetInitialized.promise
+                    .then(() => this.attachWebview())
+                    .catch(error => this.logger.error('Failed to attach notebook output webview.', error));
             }
         }}></div>;
     }
 
     protected attachWebview(): void {
-        if (this.element) {
+        if (this.element && !this.isAttached()) {
             this.webviewWidget.processMessage(new Message('before-attach'));
             this.element.appendChild(this.webviewWidget.node);
             this.webviewWidget.processMessage(new Message('after-attach'));

package/src/main/browser/plugin-contribution-handler.ts

@@ -52,6 +52,7 @@ import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { LanguageService } from '@theia/core/lib/browser/language-service';
 import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 import { JSONObject, JSONValue } from '@theia/core/shared/@lumino/coreutils';
+import { ILogger } from '@theia/core';
 
 // The enum export is missing from `vscode-textmate@9.2.0`
 const enum StandardTokenType {
@@ -147,6 +148,9 @@ export class PluginContributionHandler {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
+    @inject(ILogger) @named('plugin-ext:PluginContributionHandler')
+    protected readonly logger: ILogger;
+
     protected readonly commandHandlers = new Map<string, CommandHandler['execute'] | undefined>();
 
     protected readonly onDidRegisterCommandHandlerEmitter = new Emitter<string>();
@@ -164,8 +168,8 @@ export class PluginContributionHandler {
         }
         const toDispose = new DisposableCollection(Disposable.create(() => { /* mark as not disposed */ }));
         /* eslint-disable @typescript-eslint/no-explicit-any */
-        const logError = (message: string, ...args: any[]) => console.error(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
-        const logWarning = (message: string, ...args: any[]) => console.warn(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
+        const logError = (message: string, ...args: any[]) => this.logger.error(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
+        const logWarning = (message: string, ...args: any[]) => this.logger.warn(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
         const pushContribution = (id: string, contribute: () => Disposable) => {
             if (toDispose.disposed) {
                 return;
@@ -517,7 +521,7 @@ export class PluginContributionHandler {
 
     registerCommand(command: Command, enablement?: string): Disposable {
         if (this.hasCommand(command.id)) {
-            console.warn(`command '${command.id}' already registered`);
+            this.logger.warn(`command '${command.id}' already registered`);
             return Disposable.NULL;
         }
 
@@ -565,7 +569,7 @@ export class PluginContributionHandler {
 
     registerCommandHandler(id: string, execute: CommandHandler['execute']): Disposable {
         if (this.hasCommandHandler(id)) {
-            console.warn(`command handler '${id}' already registered`);
+            this.logger.warn(`command handler '${id}' already registered`);
             return Disposable.NULL;
         }
 

package/src/main/browser/plugin-ext-widget.tsx

@@ -86,7 +86,7 @@ export class PluginWidget extends ReactWidget {
         </div>;
     }
 
-    private renderPlugin(plugin: PluginMetadata): JSX.Element {
+    private renderPlugin(plugin: PluginMetadata): React.JSX.Element {
         const unversionedId = PluginIdentifiers.componentsToUnversionedId(plugin.model);
         const isRestrictedByTrust = this.pluginService.disabledByTrust.has(unversionedId);
         return <div key={plugin.model.name} className={this.createPluginClassName(plugin, isRestrictedByTrust)}>

package/src/main/browser/view/plugin-view-registry.spec.ts

@@ -24,7 +24,8 @@ FrontendApplicationConfigProvider.set({});
 
 import { expect } from 'chai';
 import { Disposable } from '@theia/core/lib/common';
-import { PluginViewRegistry, ViewContainerInfo } from './plugin-view-registry';
+import { PluginViewRegistry, ViewContainerInfo, PLUGIN_VIEW_DATA_FACTORY_ID } from './plugin-view-registry';
+import type { ViewWelcome } from '../../../common';
 
 disableJSDOM();
 
@@ -103,3 +104,70 @@ describe('PluginViewRegistry - view menu labels', () => {
     });
 
 });
+
+describe('PluginViewRegistry - welcome-only views', () => {
+
+    interface FakeTreeViewWidget {
+        model: { root?: unknown };
+        welcomeArg?: ViewWelcome[];
+        handleViewWelcomeContentChange(welcomes: ViewWelcome[]): void;
+    }
+
+    let registry: PluginViewRegistry;
+    let createdWidget: FakeTreeViewWidget;
+    let getOrCreateCalls: Array<{ factoryId: string; options: unknown }>;
+
+    const welcome = (view: string): ViewWelcome => ({ view, content: `[Hi](command:${view}.hi)`, order: 0 });
+
+    const internals = (): {
+        views: Map<string, [string, { type?: unknown }]>;
+        viewDataProviders: Map<string, unknown>;
+        viewsWelcome: Map<string, ViewWelcome[]>;
+        createViewDataWidget(viewId: string): Promise<unknown>;
+    } => registry as unknown as {
+        views: Map<string, [string, { type?: unknown }]>;
+        viewDataProviders: Map<string, unknown>;
+        viewsWelcome: Map<string, ViewWelcome[]>;
+        createViewDataWidget(viewId: string): Promise<unknown>;
+    };
+
+    beforeEach(() => {
+        registry = new PluginViewRegistry();
+        getOrCreateCalls = [];
+        createdWidget = {
+            model: {},
+            handleViewWelcomeContentChange(welcomes: ViewWelcome[]): void {
+                this.welcomeArg = welcomes;
+            }
+        };
+        (registry as unknown as { widgetManager: unknown }).widgetManager = {
+            getOrCreateWidget: async (factoryId: string, options: unknown) => {
+                getOrCreateCalls.push({ factoryId, options });
+                return createdWidget;
+            }
+        };
+        internals().views.set('actions', ['container', {}]);
+    });
+
+    it('creates a welcome widget for a view with welcomes but no data provider', async () => {
+        const welcomes = [welcome('actions')];
+        internals().viewsWelcome.set('actions', welcomes);
+
+        const widget = await internals().createViewDataWidget('actions');
+
+        expect(widget).to.equal(createdWidget);
+        expect(getOrCreateCalls).to.have.lengthOf(1);
+        expect(getOrCreateCalls[0].factoryId).to.equal(PLUGIN_VIEW_DATA_FACTORY_ID);
+        expect(getOrCreateCalls[0].options).to.deep.equal({ id: 'actions' });
+        expect(createdWidget.welcomeArg).to.equal(welcomes);
+        expect(createdWidget.model.root).to.not.equal(undefined);
+    });
+
+    it('returns undefined for a view with neither a provider nor welcomes', async () => {
+        const widget = await internals().createViewDataWidget('actions');
+
+        expect(widget).to.equal(undefined);
+        expect(getOrCreateCalls).to.have.lengthOf(0);
+    });
+
+});

package/src/main/browser/view/plugin-view-registry.ts

@@ -19,6 +19,7 @@ import {
     ApplicationShell, ViewContainer as ViewContainerWidget, WidgetManager, QuickViewService,
     ViewContainerIdentifier, ViewContainerTitleOptions, Widget, FrontendApplicationContribution,
     StatefulWidget, CommonMenus, TreeViewWelcomeWidget, ViewContainerPart, BaseWidget,
+    CompositeTreeNode, ExpandableTreeNode,
 } from '@theia/core/lib/browser';
 import { ViewContainer, View, ViewWelcome, PluginViewType } from '../../../common';
 import { PluginSharedStyle } from '../plugin-shared-style';
@@ -643,7 +644,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                 });
                 return _pendingResolution;
             },
-            show: webview.show
+            show: (preserveFocus: boolean) => {
+                this.openView(viewId, preserveFocus ? { reveal: true } : { activate: true });
+            }
         };
 
         const toDispose = this.onNewResolverRegistered(resolver => {
@@ -1053,10 +1056,15 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         if (view?.[1]?.type === PluginViewType.Webview) {
             return this.createWebviewWidget(viewId, webviewId);
         }
-        const provider = this.viewDataProviders.get(viewId);
-        if (!view || !provider) {
+        if (!view) {
             return undefined;
         }
+        const provider = this.viewDataProviders.get(viewId);
+        if (!provider) {
+            return this.getViewWelcomes(viewId).length > 0
+                ? this.createViewWelcomeWidget(viewId)
+                : undefined;
+        }
         const [, viewInfo] = view;
         const state = this.viewDataState.get(viewId);
         const widget = await provider({ state, viewInfo });
@@ -1069,6 +1077,25 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         return widget;
     }
 
+    protected async createViewWelcomeWidget(viewId: string): Promise<TreeViewWidget> {
+        const widget = await this.widgetManager.getOrCreateWidget<TreeViewWidget>(PLUGIN_VIEW_DATA_FACTORY_ID, { id: viewId });
+        if (!widget.model.root) {
+            const root: CompositeTreeNode & ExpandableTreeNode = {
+                id: '',
+                parent: undefined,
+                name: '',
+                visible: false,
+                expanded: true,
+                children: []
+            };
+            widget.model.root = root;
+        }
+        // An undefined `model.proxy` keeps `shouldShowWelcomeView()` true, so the welcome content
+        // renders instead of an empty node list.
+        widget.handleViewWelcomeContentChange(this.getViewWelcomes(viewId));
+        return widget;
+    }
+
     protected async createWebviewWidget(viewId: string, webviewId?: string): Promise<Widget | undefined> {
         if (!webviewId) {
             const webviewView = await this.createNewWebviewView(viewId);

package/src/main/browser/webview/webview-resource-cache.ts

@@ -14,9 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { MaybePromise } from '@theia/core/lib/common/types';
+import { ILogger } from '@theia/core';
 
 export interface WebviewResourceResponse {
     eTag: string | undefined,
@@ -29,6 +30,9 @@ export interface WebviewResourceResponse {
 @injectable()
 export class WebviewResourceCache {
 
+    @inject(ILogger) @named('plugin-ext:WebviewResourceCache')
+    protected readonly logger: ILogger;
+
     protected readonly cache = new Deferred<Cache | undefined>();
 
     constructor() {
@@ -39,7 +43,7 @@ export class WebviewResourceCache {
         try {
             this.cache.resolve(await caches.open('webview:v1'));
         } catch (e) {
-            console.error('Failed to enable webview caching: ', e);
+            this.logger.error('Failed to enable webview caching: ', e);
             this.cache.resolve(undefined);
         }
     }

package/src/main/browser/webview/webview.ts

@@ -22,7 +22,7 @@
 
 import * as mime from 'mime';
 import { JSONExt } from '@theia/core/shared/@lumino/coreutils';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
 import { WebviewPanelOptions, WebviewPortMapping } from '@theia/plugin';
 import { BaseWidget, Message, codicon } from '@theia/core/lib/browser/widgets/widget';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
@@ -49,7 +49,7 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileOperationError, FileOperationResult } from '@theia/filesystem/lib/common/files';
 import { BinaryBufferReadableStream } from '@theia/core/lib/common/buffer';
 import { ExtractableWidget } from '@theia/core/lib/browser/widgets/extractable-widget';
-import { MenuPath } from '@theia/core';
+import { MenuPath, ILogger } from '@theia/core';
 import { ContextMenuRenderer } from '@theia/core/lib/browser';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { PluginViewWidget } from '../view/plugin-view-widget';
@@ -166,6 +166,9 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
+    @inject(ILogger) @named('plugin-ext:WebviewWidget')
+    protected readonly logger: ILogger;
+
     viewState: WebviewPanelViewState = {
         visible: false,
         active: false,
@@ -626,7 +629,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
             await this.ready.promise;
             this.postMessage(channel, data);
         } catch (e) {
-            console.error(e);
+            this.logger.error(e);
         }
     }
 

package/src/main/node/plugin-deployer-impl.ts

@@ -42,7 +42,7 @@ export class PluginDeployerImpl implements PluginDeployer {
     protected readonly onDidDeployEmitter = new Emitter<void>();
     readonly onDidDeploy = this.onDidDeployEmitter.event;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:PluginDeployerImpl')
     protected readonly logger: ILogger;
 
     @inject(PluginDeployerHandler)
@@ -215,7 +215,7 @@ export class PluginDeployerImpl implements PluginDeployer {
                         }
                     }
                 } catch (e) {
-                    console.error(`Failed to resolve plugins from '${entry.id}'`, e);
+                    this.logger.error(`Failed to resolve plugins from '${entry.id}'`, e);
                     errors.push(e instanceof Error ? e : new Error(String(e)));
                 }
             }));

package/src/plugin/languages/diagnostics.ts

@@ -30,6 +30,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
     ];
 
     private collectionName: string;
+    private ownerId: string;
     private diagnosticsLimitPerResource: number;
     private proxy: LanguagesMain;
     private onDidChangeDiagnosticsEmitter: Emitter<theia.DiagnosticChangeEvent>;
@@ -38,8 +39,9 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
     private isDisposed: boolean;
     private onDisposeCallback: (() => void) | undefined;
 
-    constructor(name: string, maxCountPerFile: number, proxy: LanguagesMain, onDidChangeDiagnosticsEmitter: Emitter<theia.DiagnosticChangeEvent>) {
+    constructor(name: string, owner: string, maxCountPerFile: number, proxy: LanguagesMain, onDidChangeDiagnosticsEmitter: Emitter<theia.DiagnosticChangeEvent>) {
         this.collectionName = name;
+        this.ownerId = owner;
         this.diagnosticsLimitPerResource = maxCountPerFile;
         this.proxy = proxy;
         this.onDidChangeDiagnosticsEmitter = onDidChangeDiagnosticsEmitter;
@@ -53,6 +55,10 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
         return this.collectionName;
     }
 
+    get owner(): string {
+        return this.ownerId;
+    }
+
     set(uri: theia.Uri, diagnostics: theia.Diagnostic[] | undefined): void;
     set(entries: [theia.Uri, theia.Diagnostic[] | undefined][]): void;
     set(arg: theia.Uri | [theia.Uri, theia.Diagnostic[] | undefined][], diagnostics?: theia.Diagnostic[] | undefined): void {
@@ -115,7 +121,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
         if (this.has(uri)) {
             this.fireDiagnosticChangeEvent(uri);
             this.diagnostics.delete(uri.toString());
-            this.proxy.$changeDiagnostics(this.name, [[uri.toString(), []]]);
+            this.proxy.$changeDiagnostics(this.ownerId, [[uri.toString(), []]]);
         }
     }
 
@@ -123,7 +129,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
         this.ensureNotDisposed();
         this.fireDiagnosticChangeEvent(this.getAllResourcesUris());
         this.diagnostics.clear();
-        this.proxy.$clearDiagnostics(this.name);
+        this.proxy.$clearDiagnostics(this.ownerId);
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -247,7 +253,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
             }
         }
 
-        this.proxy.$changeDiagnostics(this.name, markers);
+        this.proxy.$changeDiagnostics(this.ownerId, markers);
     }
 }
 
@@ -256,7 +262,12 @@ export class Diagnostics {
     private static GENERATED_DIAGNOSTIC_COLLECTION_NAME_PREFIX = '_generated_diagnostic_collection_name_#';
 
     private proxy: LanguagesMain;
-    private diagnosticCollections: Map<string, DiagnosticCollection>; // id -> diagnostic collection
+    // Collections are keyed by their unique `owner` id (which is the same as `name` for the first
+    // collection with that name, but is suffixed when a duplicate name is requested). This matches
+    // VS Code's behavior and prevents collisions on the main side's marker owner namespace as well
+    // as a latent bug where disposing the first collection would evict the second from the map.
+    private diagnosticCollections: Map<string, DiagnosticCollection>;
+    private nextOwnerSuffix = 1;
 
     private diagnosticsChangedEmitter = new Emitter<theia.DiagnosticChangeEvent>();
     public readonly onDidChangeDiagnostics: Event<theia.DiagnosticChangeEvent> = this.diagnosticsChangedEmitter.event;
@@ -278,19 +289,26 @@ export class Diagnostics {
     }
 
     createDiagnosticCollection(name?: string): theia.DiagnosticCollection {
+        let owner: string;
         if (!name) {
             do {
                 name = Diagnostics.GENERATED_DIAGNOSTIC_COLLECTION_NAME_PREFIX + this.getNextId();
             } while (this.diagnosticCollections.has(name));
-        } else if (this.diagnosticCollections.has(name)) {
-            console.warn(`Diagnostic collection with name '${name}' already exist.`);
+            owner = name;
+        } else if (!this.diagnosticCollections.has(name)) {
+            owner = name;
+        } else {
+            console.warn(`Diagnostic collection with name '${name}' already exists.`);
+            do {
+                owner = name + this.nextOwnerSuffix++;
+            } while (this.diagnosticCollections.has(owner));
         }
 
-        const diagnosticCollection = new DiagnosticCollection(name, Diagnostics.MAX_DIAGNOSTICS_PER_FILE, this.proxy, this.diagnosticsChangedEmitter);
+        const diagnosticCollection = new DiagnosticCollection(name, owner, Diagnostics.MAX_DIAGNOSTICS_PER_FILE, this.proxy, this.diagnosticsChangedEmitter);
         diagnosticCollection.setOnDisposeCallback(() => {
-            this.diagnosticCollections.delete(name!);
+            this.diagnosticCollections.delete(owner);
         });
-        this.diagnosticCollections.set(name, diagnosticCollection);
+        this.diagnosticCollections.set(owner, diagnosticCollection);
         return diagnosticCollection;
     }
 

package/src/plugin/languages/multi-document-highlight.ts

@@ -0,0 +1,75 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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 { URI } from '@theia/core/shared/vscode-uri';
+import * as theia from '@theia/plugin';
+import { DocumentsExtImpl } from '../documents';
+import * as types from '../types-impl';
+import * as Converter from '../type-converters';
+import { Position } from '../../common/plugin-api-rpc';
+import { MultiDocumentHighlightDto } from '../../common/plugin-api-rpc-model';
+import { UriComponents } from '../../common/uri-components';
+
+export class MultiDocumentHighlightAdapter {
+
+    constructor(
+        private readonly provider: theia.MultiDocumentHighlightProvider,
+        private readonly documents: DocumentsExtImpl) {
+    }
+
+    provideMultiDocumentHighlights(
+        resource: URI,
+        position: Position,
+        otherResources: UriComponents[],
+        token: theia.CancellationToken
+    ): Promise<MultiDocumentHighlightDto[] | undefined> {
+        const documentData = this.documents.getDocumentData(resource);
+        if (!documentData) {
+            return Promise.reject(new Error(`There is no document for ${resource}`));
+        }
+
+        const document = documentData.document;
+        const zeroBasedPosition = Converter.toPosition(position);
+
+        const otherDocuments: theia.TextDocument[] = [];
+        for (const otherResource of otherResources) {
+            const otherUri = URI.revive(otherResource);
+            const otherDocData = this.documents.getDocumentData(otherUri);
+            if (otherDocData) {
+                otherDocuments.push(otherDocData.document);
+            }
+        }
+
+        return Promise.resolve(this.provider.provideMultiDocumentHighlights(document, zeroBasedPosition, otherDocuments, token)).then(result => {
+            if (!result) {
+                return undefined;
+            }
+
+            if (!this.isMultiDocumentHighlightArray(result)) {
+                return undefined;
+            }
+
+            return result.map(multiHighlight => ({
+                uri: multiHighlight.uri,
+                highlights: multiHighlight.highlights.map(h => Converter.fromDocumentHighlight(h))
+            }));
+        });
+    }
+
+    private isMultiDocumentHighlightArray(array: unknown): array is types.MultiDocumentHighlight[] {
+        return Array.isArray(array) && array.length > 0 && array[0] instanceof types.MultiDocumentHighlight;
+    }
+}

package/src/plugin/languages.ts

@@ -44,6 +44,7 @@ import {
     SerializedDocumentFilter,
     SignatureHelp,
     DocumentHighlight,
+    MultiDocumentHighlightDto,
     Range,
     TextEdit,
     FormattingOptions,
@@ -81,6 +82,7 @@ import { HoverAdapter } from './languages/hover';
 import { EvaluatableExpressionAdapter } from './languages/evaluatable-expression';
 import { InlineValuesAdapter } from './languages/inline-values';
 import { DocumentHighlightAdapter } from './languages/document-highlight';
+import { MultiDocumentHighlightAdapter } from './languages/multi-document-highlight';
 import { DocumentFormattingAdapter } from './languages/document-formatting';
 import { RangeFormattingAdapter } from './languages/range-formatting';
 import { OnTypeFormattingAdapter } from './languages/on-type-formatting';
@@ -122,6 +124,7 @@ type Adapter = CompletionAdapter |
     EvaluatableExpressionAdapter |
     InlineValuesAdapter |
     DocumentHighlightAdapter |
+    MultiDocumentHighlightAdapter |
     DocumentFormattingAdapter |
     RangeFormattingAdapter |
     OnTypeFormattingAdapter |
@@ -466,6 +469,23 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
     // ### Document Highlight Provider end
 
+    // ### Multi Document Highlight Provider begin
+    registerMultiDocumentHighlightProvider(
+        selector: theia.DocumentSelector, provider: theia.MultiDocumentHighlightProvider, pluginInfo: PluginInfo
+    ): theia.Disposable {
+        const callId = this.addNewAdapter(new MultiDocumentHighlightAdapter(provider, this.documents));
+        this.proxy.$registerMultiDocumentHighlightProvider(callId, pluginInfo, this.transformDocumentSelector(selector));
+        return this.createDisposable(callId);
+    }
+
+    $provideMultiDocumentHighlights(
+        handle: number, resource: UriComponents, position: Position, otherResources: UriComponents[], token: theia.CancellationToken
+    ): Promise<MultiDocumentHighlightDto[] | undefined> {
+        return this.withAdapter(handle, MultiDocumentHighlightAdapter,
+            adapter => adapter.provideMultiDocumentHighlights(URI.revive(resource), position, otherResources, token), undefined);
+    }
+    // ### Multi Document Highlight Provider end
+
     // ### WorkspaceSymbol Provider begin
     registerWorkspaceSymbolProvider(provider: theia.WorkspaceSymbolProvider, pluginInfo: PluginInfo): theia.Disposable {
         const callId = this.addNewAdapter(new WorkspaceSymbolAdapter(provider));