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

package/lib/plugin-ext-frontend-electron-module.js

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-const plugin_ext_frontend_electron_module_1 = require("./main/electron-browser/plugin-ext-frontend-electron-module");
+const tslib_1 = require("tslib");
+const plugin_ext_frontend_electron_module_1 = tslib_1.__importDefault(require("./main/electron-browser/plugin-ext-frontend-electron-module"));
 exports.default = plugin_ext_frontend_electron_module_1.default;
 //# sourceMappingURL=plugin-ext-frontend-electron-module.js.map

package/lib/plugin-ext-frontend-electron-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-ext-frontend-electron-module.js","sourceRoot":"","sources":["../src/plugin-ext-frontend-electron-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,qHAAqF;AAErF,kBAAe,6CAAU,CAAC"}
+{"version":3,"file":"plugin-ext-frontend-electron-module.js","sourceRoot":"","sources":["../src/plugin-ext-frontend-electron-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,8IAAqF;AAErF,kBAAe,6CAAU,CAAC"}

package/lib/plugin-ext-frontend-module.js

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-const plugin_ext_frontend_module_1 = require("./main/browser/plugin-ext-frontend-module");
+const tslib_1 = require("tslib");
+const plugin_ext_frontend_module_1 = tslib_1.__importDefault(require("./main/browser/plugin-ext-frontend-module"));
 exports.default = plugin_ext_frontend_module_1.default;
 //# sourceMappingURL=plugin-ext-frontend-module.js.map

package/lib/plugin-ext-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-ext-frontend-module.js","sourceRoot":"","sources":["../src/plugin-ext-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,0FAAmE;AAEnE,kBAAe,oCAAU,CAAC"}
+{"version":3,"file":"plugin-ext-frontend-module.js","sourceRoot":"","sources":["../src/plugin-ext-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,mHAAmE;AAEnE,kBAAe,oCAAU,CAAC"}

package/package.json

@@ -1,41 +1,41 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.77.0-next.49+19f3aa746",
+  "version": "1.77.0-next.57+81ea5f939",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/ai-core": "1.77.0-next.49+19f3aa746",
-    "@theia/ai-mcp": "1.77.0-next.49+19f3aa746",
-    "@theia/bulk-edit": "1.77.0-next.49+19f3aa746",
-    "@theia/callhierarchy": "1.77.0-next.49+19f3aa746",
-    "@theia/console": "1.77.0-next.49+19f3aa746",
-    "@theia/core": "1.77.0-next.49+19f3aa746",
-    "@theia/debug": "1.77.0-next.49+19f3aa746",
-    "@theia/editor": "1.77.0-next.49+19f3aa746",
-    "@theia/editor-preview": "1.77.0-next.49+19f3aa746",
-    "@theia/file-search": "1.77.0-next.49+19f3aa746",
-    "@theia/filesystem": "1.77.0-next.49+19f3aa746",
-    "@theia/markers": "1.77.0-next.49+19f3aa746",
-    "@theia/messages": "1.77.0-next.49+19f3aa746",
-    "@theia/monaco": "1.77.0-next.49+19f3aa746",
+    "@theia/ai-core": "1.77.0-next.57+81ea5f939",
+    "@theia/ai-mcp": "1.77.0-next.57+81ea5f939",
+    "@theia/bulk-edit": "1.77.0-next.57+81ea5f939",
+    "@theia/callhierarchy": "1.77.0-next.57+81ea5f939",
+    "@theia/console": "1.77.0-next.57+81ea5f939",
+    "@theia/core": "1.77.0-next.57+81ea5f939",
+    "@theia/debug": "1.77.0-next.57+81ea5f939",
+    "@theia/editor": "1.77.0-next.57+81ea5f939",
+    "@theia/editor-preview": "1.77.0-next.57+81ea5f939",
+    "@theia/file-search": "1.77.0-next.57+81ea5f939",
+    "@theia/filesystem": "1.77.0-next.57+81ea5f939",
+    "@theia/markers": "1.77.0-next.57+81ea5f939",
+    "@theia/messages": "1.77.0-next.57+81ea5f939",
+    "@theia/monaco": "1.77.0-next.57+81ea5f939",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/navigator": "1.77.0-next.49+19f3aa746",
-    "@theia/notebook": "1.77.0-next.49+19f3aa746",
-    "@theia/output": "1.77.0-next.49+19f3aa746",
-    "@theia/plugin": "1.77.0-next.49+19f3aa746",
-    "@theia/plugin-utils": "1.77.0-next.49+19f3aa746",
-    "@theia/preferences": "1.77.0-next.49+19f3aa746",
-    "@theia/scm": "1.77.0-next.49+19f3aa746",
-    "@theia/search-in-workspace": "1.77.0-next.49+19f3aa746",
-    "@theia/task": "1.77.0-next.49+19f3aa746",
-    "@theia/telemetry": "1.77.0-next.49+19f3aa746",
-    "@theia/terminal": "1.77.0-next.49+19f3aa746",
-    "@theia/test": "1.77.0-next.49+19f3aa746",
-    "@theia/timeline": "1.77.0-next.49+19f3aa746",
-    "@theia/typehierarchy": "1.77.0-next.49+19f3aa746",
-    "@theia/variable-resolver": "1.77.0-next.49+19f3aa746",
-    "@theia/workspace": "1.77.0-next.49+19f3aa746",
+    "@theia/navigator": "1.77.0-next.57+81ea5f939",
+    "@theia/notebook": "1.77.0-next.57+81ea5f939",
+    "@theia/output": "1.77.0-next.57+81ea5f939",
+    "@theia/plugin": "1.77.0-next.57+81ea5f939",
+    "@theia/plugin-utils": "1.77.0-next.57+81ea5f939",
+    "@theia/preferences": "1.77.0-next.57+81ea5f939",
+    "@theia/scm": "1.77.0-next.57+81ea5f939",
+    "@theia/search-in-workspace": "1.77.0-next.57+81ea5f939",
+    "@theia/task": "1.77.0-next.57+81ea5f939",
+    "@theia/telemetry": "1.77.0-next.57+81ea5f939",
+    "@theia/terminal": "1.77.0-next.57+81ea5f939",
+    "@theia/test": "1.77.0-next.57+81ea5f939",
+    "@theia/timeline": "1.77.0-next.57+81ea5f939",
+    "@theia/typehierarchy": "1.77.0-next.57+81ea5f939",
+    "@theia/variable-resolver": "1.77.0-next.57+81ea5f939",
+    "@theia/workspace": "1.77.0-next.57+81ea5f939",
     "@types/mime": "^2.0.3",
     "@vscode/debugprotocol": "^1.68.0",
     "@vscode/proxy-agent": "^0.13.2",
@@ -103,5 +103,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "19f3aa746ad23091ba655bc1509d18e4f961fb39"
+  "gitHead": "81ea5f939c40c905de91083d07e284bfd7437fac"
 }

package/src/common/character-classifier.ts

@@ -65,7 +65,7 @@ export class CharacterClassifier<T extends number> {
 
     public get(charCode: number): T {
         if (charCode >= 0 && charCode < 256) {
-            return <T>this._asciiMap[charCode];
+            return this._asciiMap[charCode] as T;
         } else {
             return <T>(this._map.get(charCode) || this._defaultValue);
         }

package/src/common/plugin-api-rpc.ts

@@ -1104,6 +1104,8 @@ export interface SourceControlGroupFeatures {
 export interface ScmRawResource {
     handle: number,
     sourceUri: UriComponents,
+    multiDiffEditorOriginalUri?: UriComponents,
+    multiDiffEditorModifiedUri?: UriComponents,
     icons: (IconUrl | ThemeIcon | undefined)[], /* icons: light, dark */
     tooltip: string,
     strikeThrough: boolean,

package/src/hosted/browser/hosted-plugin.spec.ts

@@ -0,0 +1,66 @@
+// *****************************************************************************
+// Copyright (C) 2026 JuliaHub, Inc. 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';
+// HostedPluginSupport transitively imports browser widgets (Lumino) that touch `document` at load time.
+const disableJSDOM = enableJSDOM();
+
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+// Some transitively imported modules read the frontend config at load time.
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { FrontendApplicationState } from '@theia/core/lib/common/frontend-application-state';
+import { HostedPluginSupport } from './hosted-plugin';
+
+disableJSDOM();
+
+describe('HostedPluginSupport - plugin view initialization', () => {
+
+    it('initializes plugin views once the application is ready, after the onDidInitializeLayout hooks', async () => {
+        const states = new Map<FrontendApplicationState, Deferred<void>>();
+        const reach = (state: FrontendApplicationState): Deferred<void> => {
+            if (!states.has(state)) {
+                states.set(state, new Deferred<void>());
+            }
+            return states.get(state)!;
+        };
+        const calls: string[] = [];
+        const support = new HostedPluginSupport();
+        Object.assign(support, {
+            appState: { reachedState: (state: FrontendApplicationState) => reach(state).promise },
+            viewRegistry: {
+                initWidgets: async () => { calls.push('initWidgets'); },
+                removeStaleWidgets: () => { calls.push('removeStaleWidgets'); }
+            },
+            workspaceTrustService: { refreshRestrictedModeIndicator: () => { } }
+        });
+        const flush = () => new Promise(resolve => setTimeout(resolve));
+
+        await (support as unknown as { afterLoadContributions(toDisconnect: DisposableCollection): Promise<void> })
+            .afterLoadContributions(new DisposableCollection(Disposable.NULL));
+        reach('initialized_layout').resolve();
+        await flush();
+        expect(calls).to.deep.equal([]);
+
+        reach('ready').resolve();
+        await flush();
+        expect(calls).to.deep.equal(['initWidgets', 'removeStaleWidgets']);
+    });
+
+});

package/src/hosted/browser/hosted-plugin.ts

@@ -288,9 +288,11 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
         // must not run while the ShellLayoutRestorer still holds restored plugin view widgets, otherwise
         // removeStaleWidgets can dispose a restored view container mid-restore and abort the whole
         // layout restoration (see https://github.com/eclipse-theia/theia/issues/17770).
+        // Wait for `ready` rather than `initialized_layout`: only `ready` follows the onDidInitializeLayout
+        // hooks, and PluginViewRegistry's hook disposes the data widgets that initWidgets would prepare.
         // Deliberately not awaited: startPlugins runs after this hook and may register file system
         // providers the layout restoration depends on (see beforeLoadContributions).
-        this.appState.reachedState('initialized_layout').then(async () => {
+        this.appState.reachedState('ready').then(async () => {
             if (toDisconnect.disposed) {
                 return;
             }

package/src/hosted/node/plugin-host-proxy.ts

@@ -14,9 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as http from 'http';
-import * as https from 'https';
-import * as tls from 'tls';
+// Default imports resolve to the real Node module objects. With `esModuleInterop`, a namespace
+// import (`import * as http`) is a read-only copy with getter-only properties, and the
+// `Object.assign(http, …)` patches below would throw "Cannot set property … which has only a getter".
+import http from 'http';
+import https from 'https';
+import tls from 'tls';
 
 import { createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting } from '@vscode/proxy-agent';
 import { PreferenceRegistryExtImpl } from '../../plugin/preference-registry';

package/src/hosted/node/plugin-reader.ts

@@ -16,7 +16,7 @@
 
 import * as path from 'path';
 import * as express from '@theia/core/shared/express';
-import * as escape_html from 'escape-html';
+import escape_html from 'escape-html';
 import { realpath, stat } from 'fs/promises';
 import { ILogger } from '@theia/core';
 import { inject, injectable, optional, multiInject, named } from '@theia/core/shared/inversify';

package/src/hosted/node/plugin-require-override.spec.ts

@@ -0,0 +1,44 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 { expect } from 'chai';
+import { overridePluginDependencies } from './plugin-require-override';
+
+describe('overridePluginDependencies', () => {
+
+    const nodeModule = require('module');
+    let originalLoad: unknown;
+
+    beforeEach(() => {
+        originalLoad = nodeModule._load;
+    });
+
+    afterEach(() => {
+        nodeModule._load = originalLoad;
+    });
+
+    it('should provide the real node-pty module for an unresolvable node-pty request', () => {
+        overridePluginDependencies();
+        const nodePty = require('/nonexistent/vscode/node_modules/node-pty');
+        expect(nodePty).to.equal(require('node-pty'));
+        expect(nodePty.spawn).to.be.a('function');
+    });
+
+    it('should rethrow for unresolvable requests without an override', () => {
+        overridePluginDependencies();
+        expect(() => require('/nonexistent/vscode/node_modules/unknown-package')).to.throw();
+    });
+});

package/src/hosted/node/plugin-require-override.ts

@@ -14,6 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  ********************************************************************************/
 
+// node-pty sets __esModule, so a namespace import already yields the real module object (a default import would be undefined).
 import * as nodePty from 'node-pty';
 
 const overrides = [

package/src/main/browser/file-system-main-impl.ts

@@ -20,8 +20,8 @@
 // based on https://github.com/microsoft/vscode/blob/04c36be045a94fee58e5f8992d3e3fd980294a84/src/vs/workbench/api/browser/mainThreadFileSystem.ts
 
 /* eslint-disable max-len */
-/* eslint-disable @typescript-eslint/tslint/config */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @theia/explicit-return-type */
 
 import { URI } from '@theia/core/shared/vscode-uri';
 import { interfaces } from '@theia/core/shared/inversify';

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

@@ -17,7 +17,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { inject, injectable, optional, named } from '@theia/core/shared/inversify';
-import { MenuPath, CommandRegistry, Disposable, DisposableCollection, nls, CommandMenu, AcceleratorSource, ContextExpressionMatcher, environment, ILogger } from '@theia/core';
+import {
+    MenuPath, CommandRegistry, Disposable, DisposableCollection, nls, CommandMenu, AcceleratorSource, AcceleratorForm,
+    ContextExpressionMatcher, ILogger
+} from '@theia/core';
 import { MenuModelRegistry } from '@theia/core/lib/common';
 import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { DeployedPlugin, IconUrl, Menu } from '../../../common';
@@ -137,18 +140,8 @@ export class MenusContributionPointHandler {
                                     run: (effeciveMenuPath: MenuPath, ...args: any[]): Promise<void> =>
                                         this.commandRegistry.executeCommand(command, ...this.pluginMenuCommandAdapter.getArgumentAdapter(effeciveMenuPath)(...args)),
                                     isToggled: (effectiveMenuPath: MenuPath) => false,
-                                    getAccelerator: (context: HTMLElement | undefined): string[] => {
-                                        const bindings = this.keybindingRegistry.getKeybindingsForCommand(command);
-                                        // Only consider the first active keybinding.
-                                        if (bindings.length) {
-                                            const binding = bindings.find(b => this.keybindingRegistry.isEnabledInScope(b, context));
-                                            if (binding) {
-                                                const asciiOnly = environment.electron.is();
-                                                return this.keybindingRegistry.acceleratorFor(binding, '+', asciiOnly);
-                                            }
-                                        }
-                                        return [];
-                                    }
+                                    getAccelerator: (context: HTMLElement | undefined, form: AcceleratorForm): string[] =>
+                                        this.keybindingRegistry.acceleratorForCommand(command, context, form)
                                 };
                                 toDispose.push(this.menuRegistry.registerCommandMenu(menuPath, action));
                             });

package/src/main/browser/notebooks/renderers/output-webview-internal.ts

@@ -73,10 +73,13 @@ interface KernelPreloadModule {
 export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
     // workaround to allow rendering of links in outputs for non chromium browsers
     // see https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API#cross-browser_support_for_trusted_types
-    if (!window.trustedTypes) {
-        window.trustedTypes = {
+    const windowWithTrustedTypes = window as unknown as {
+        trustedTypes?: { createPolicy(name: string, rules: unknown): unknown };
+    };
+    if (!windowWithTrustedTypes.trustedTypes) {
+        windowWithTrustedTypes.trustedTypes = {
             createPolicy: (name: string, rules: unknown) => rules
-        } as unknown as typeof window.trustedTypes;
+        };
     }
 
     const theia = acquireVsCodeApi();

package/src/main/browser/plugin-shared-style.ts

@@ -87,12 +87,12 @@ export class PluginSharedStyle {
         selector: string;
         body: (theme: Theme) => string
     }): void {
-        const sheet = (<CSSStyleSheet>this.style.sheet);
+        const sheet = this.style.sheet as CSSStyleSheet;
         const cssBody = body(this.themeService.getCurrentTheme());
         sheet.insertRule(selector + ' {\n' + cssBody + '\n}', 0);
     }
     deleteRule(selector: string): void {
-        const sheet = (<CSSStyleSheet>this.style.sheet);
+        const sheet = this.style.sheet as CSSStyleSheet;
         const rules = sheet.rules || sheet.cssRules || [];
         for (let i = rules.length - 1; i >= 0; i--) {
             const rule = rules[i];

package/src/main/browser/scm-main.spec.ts

@@ -17,6 +17,9 @@
 import { expect } from 'chai';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';
 import { ScmMainImpl } from './scm-main';
+import { ScmRawResource } from '../../common/plugin-api-rpc';
+import URI from '@theia/core/lib/common/uri';
+import { URI as vscodeURI } from '@theia/core/shared/vscode-uri';
 
 interface ScmMainInternals {
     repositories: Map<number, unknown>;
@@ -53,6 +56,35 @@ describe('ScmMainImpl - cascade dispose of children on $unregisterSourceControl'
         impl = createScmMainImpl(scmService);
     });
 
+    it('revives multi-diff URI components and preserves absent added/deleted sides', async () => {
+        await impl.$registerSourceControl(1, 'git', 'Main', undefined);
+        impl.$registerGroups(1, [{ handle: 2, id: 'changes', label: 'Changes', features: { hideWhenEmpty: undefined, contextValue: undefined } }], []);
+        const sourceUri = vscodeURI.file('/repo/file.txt').toJSON();
+        const originalUri = vscodeURI.parse('git:/repo/file.txt?ref=HEAD#original').toJSON();
+        const modifiedUri = vscodeURI.parse('file:///repo/file.txt?working=true#modified').toJSON();
+        const raw: ScmRawResource = {
+            handle: 3, sourceUri, icons: [], tooltip: '', strikeThrough: false, faded: false, contextValue: '', command: undefined
+        };
+        impl.$spliceResourceStates(1, [{
+            handle: 2, splices: [{
+                start: 0, deleteCount: 0, rawResources: [
+                    { ...raw, multiDiffEditorOriginalUri: originalUri },
+                    { ...raw, handle: 4, multiDiffEditorModifiedUri: modifiedUri },
+                    { ...raw, handle: 5 }
+                ]
+            }]
+        }]);
+        const resources = scmService.repositories[0].provider.groups[0].resources;
+        expect(resources[0].multiDiffEditorOriginalUri).to.be.instanceOf(URI);
+        expect(resources[0].multiDiffEditorOriginalUri?.toString()).to.equal(vscodeURI.revive(originalUri).toString());
+        expect(resources[0].multiDiffEditorModifiedUri).to.equal(undefined);
+        expect(resources[1].multiDiffEditorOriginalUri).to.equal(undefined);
+        expect(resources[1].multiDiffEditorModifiedUri).to.be.instanceOf(URI);
+        expect(resources[1].multiDiffEditorModifiedUri?.toString()).to.equal(vscodeURI.revive(modifiedUri).toString());
+        expect(resources[2].multiDiffEditorOriginalUri).to.equal(undefined);
+        expect(resources[2].multiDiffEditorModifiedUri).to.equal(undefined);
+    });
+
     it('should unregister worktree children when their parent is unregistered', async () => {
         // Parent
         await impl.$registerSourceControl(1, 'git', 'Main', { scheme: 'file', path: '/repo', authority: '', query: '', fragment: '' });

package/src/main/browser/scm-main.ts

@@ -106,7 +106,9 @@ export class PluginScmResource implements ScmResource {
         readonly group: PluginScmResourceGroup,
         readonly decorations: ScmResourceDecorations,
         readonly contextValue: string | undefined,
-        readonly command: ScmCommand | undefined
+        readonly command: ScmCommand | undefined,
+        readonly multiDiffEditorOriginalUri?: URI,
+        readonly multiDiffEditorModifiedUri?: URI
     ) { }
 
     open(): Promise<void> {
@@ -487,7 +489,9 @@ export class PluginScmProvider implements ScmProvider {
                         group,
                         decorations,
                         contextValue || undefined,
-                        command
+                        command,
+                        rawResource.multiDiffEditorOriginalUri ? new URI(vscodeURI.revive(rawResource.multiDiffEditorOriginalUri)) : undefined,
+                        rawResource.multiDiffEditorModifiedUri ? new URI(vscodeURI.revive(rawResource.multiDiffEditorModifiedUri)) : undefined
                     );
                 });
 

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

@@ -25,7 +25,7 @@ FrontendApplicationConfigProvider.set({});
 import { expect } from 'chai';
 import { Command, Disposable } from '@theia/core/lib/common';
 import { PluginViewRegistry, ViewContainerInfo, PLUGIN_VIEW_DATA_FACTORY_ID } from './plugin-view-registry';
-import type { ViewWelcome } from '../../../common';
+import { PluginViewType, ViewWelcome } from '../../../common';
 
 disableJSDOM();
 
@@ -104,6 +104,8 @@ describe('PluginViewRegistry - view menu labels', () => {
 
 });
 
+const welcome = (view: string): ViewWelcome => ({ view, content: `[Hi](command:${view}.hi)`, order: 0 });
+
 describe('PluginViewRegistry - welcome-only views', () => {
 
     interface FakeTreeViewWidget {
@@ -116,8 +118,6 @@ describe('PluginViewRegistry - welcome-only views', () => {
     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>;
@@ -171,6 +171,137 @@ describe('PluginViewRegistry - welcome-only views', () => {
 
 });
 
+describe('PluginViewRegistry - welcome-only views on expand', () => {
+
+    const noop = () => Disposable.NULL;
+
+    let registry: PluginViewRegistry;
+    let view: { widgets: unknown[] };
+    let prepared: unknown[];
+
+    const internals = (): {
+        views: Map<string, [string, { type?: unknown }]>;
+        viewDataProviders: Map<string, unknown>;
+        viewsWelcome: Map<string, ViewWelcome[]>;
+        onDidExpandViewEmitter: { fire(viewId: string): void };
+        init(): void;
+    } => registry as unknown as {
+        views: Map<string, [string, { type?: unknown }]>;
+        viewDataProviders: Map<string, unknown>;
+        viewsWelcome: Map<string, ViewWelcome[]>;
+        onDidExpandViewEmitter: { fire(viewId: string): void };
+        init(): void;
+    };
+
+    async function expand(viewId: string): Promise<void> {
+        internals().onDidExpandViewEmitter.fire(viewId);
+        await new Promise(resolve => setTimeout(resolve));
+    }
+
+    beforeEach(() => {
+        registry = new PluginViewRegistry();
+        view = { widgets: [] };
+        prepared = [];
+        Object.assign(registry, {
+            shell: { activeWidget: undefined, onDidChangeActiveWidget: noop, initialized: new Promise(() => { }) },
+            viewContextKeys: { focusedView: { reset: () => { } } },
+            contextKeyService: { onDidChange: noop },
+            widgetManager: { onWillCreateWidget: noop, onDidCreateWidget: noop, getWidget: async () => view },
+            prepareView: async (widget: unknown) => { prepared.push(widget); }
+        });
+        internals().init();
+        internals().views.set('actions', ['container', {}]);
+        internals().viewsWelcome.set('actions', [welcome('actions')]);
+    });
+
+    it('prepares an empty welcome-only view when it is expanded, as after restoring a saved layout', async () => {
+        await expand('actions');
+
+        expect(prepared).to.deep.equal([view]);
+    });
+
+    it('leaves a view with a data provider to the provider', async () => {
+        internals().viewDataProviders.set('actions', () => undefined);
+
+        await expand('actions');
+
+        expect(prepared).to.have.lengthOf(0);
+    });
+
+    it('leaves a view that already has content alone', async () => {
+        view.widgets.push({});
+
+        await expand('actions');
+
+        expect(prepared).to.have.lengthOf(0);
+    });
+
+    it('leaves a view without welcomes alone', async () => {
+        internals().viewsWelcome.delete('actions');
+
+        await expand('actions');
+
+        expect(prepared).to.have.lengthOf(0);
+    });
+
+    it('leaves a webview view alone', async () => {
+        internals().views.set('actions', ['container', { type: PluginViewType.Webview }]);
+
+        await expand('actions');
+
+        expect(prepared).to.have.lengthOf(0);
+    });
+
+});
+
+describe('PluginViewRegistry - prepareView', () => {
+
+    interface FakeViewWidget {
+        options: { viewId: string };
+        title: { label: string };
+        widgets: unknown[];
+        isDisposed: boolean;
+        addWidget(widget: unknown): void;
+    }
+
+    let registry: PluginViewRegistry;
+    let view: FakeViewWidget;
+    let dataWidget: { isDisposed: boolean; dispose(): void };
+
+    beforeEach(() => {
+        registry = new PluginViewRegistry();
+        view = {
+            options: { viewId: 'actions' },
+            title: { label: '' },
+            widgets: [],
+            isDisposed: false,
+            addWidget(widget: unknown): void {
+                this.widgets.push(widget);
+            }
+        };
+        dataWidget = { isDisposed: false, dispose: () => { } };
+        (registry as unknown as { views: Map<string, unknown> }).views.set('actions', ['container', { id: 'actions', name: 'Actions' }]);
+        (registry as unknown as { createViewDataWidget: unknown }).createViewDataWidget = async () => dataWidget;
+    });
+
+    const prepareView = (): Promise<void> => (registry as unknown as { prepareView(widget: FakeViewWidget): Promise<void> }).prepareView(view);
+
+    it('adds the created data widget to the view', async () => {
+        await prepareView();
+
+        expect(view.widgets).to.deep.equal([dataWidget]);
+    });
+
+    it('leaves the view empty when its data widget was disposed before it could be added', async () => {
+        dataWidget.isDisposed = true;
+
+        await prepareView();
+
+        expect(view.widgets).to.have.lengthOf(0);
+    });
+
+});
+
 describe('PluginViewRegistry - VS Code view commands', () => {
 
     let registry: PluginViewRegistry;