@codingame/monaco-vscode-extensions-service-override 19.1.4 → 20.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -8,9 +8,9 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { deserializeWebviewMessage, serializeWebviewMessage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostWebviewMessaging';
-import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
 
 var MainThreadWebviews_1;
 let MainThreadWebviews = class MainThreadWebviews extends Disposable {
@@ -104,7 +104,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 				<meta http-equiv="Content-Security-Policy" content="default-src 'none';">
 			</head>
-			<body>${( localize(2476, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+			<body>${( localize(2503, "An error occurred while loading view: {0}", escape(viewType)))}</body>
 		</html>`;
     }
 };

package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js

@@ -79,11 +79,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2477, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2504, "Extension '{0}' added 1 folder to the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2478,
+                    2505,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -92,11 +92,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2479, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2506, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2480,
+                    2507,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -104,7 +104,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(2481, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2508, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -49,7 +49,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                5686,
+                5803,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.d.ts

@@ -0,0 +1,30 @@
+import { ClassifiedEvent, OmitMetadata, IGDPRProperty, StrictPropertyCheck } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/gdprTypings";
+import { ITelemetryData, TelemetryLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IDataChannelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/dataChannel/common/dataChannel.service";
+export declare class InterceptingTelemetryService implements ITelemetryService {
+    private readonly _baseService;
+    private readonly _intercept;
+    _serviceBrand: undefined;
+    constructor(_baseService: ITelemetryService, _intercept: (eventName: string, data?: ITelemetryData) => void);
+    get telemetryLevel(): TelemetryLevel;
+    get sessionId(): string;
+    get machineId(): string;
+    get sqmId(): string;
+    get devDeviceId(): string;
+    get firstSessionDate(): string;
+    get msftInternal(): boolean | undefined;
+    get sendErrorTelemetry(): boolean;
+    publicLog(eventName: string, data?: ITelemetryData): void;
+    publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
+    publicLogError(errorEventName: string, data?: ITelemetryData): void;
+    publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
+    setExperimentProperty(name: string, value: string): void;
+}
+export interface IEditTelemetryData {
+    eventName: string;
+    data: Record<string, unknown>;
+}
+export declare class DataChannelForwardingTelemetryService extends InterceptingTelemetryService {
+    constructor(telemetryService: ITelemetryService, dataChannelService: IDataChannelService);
+}

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.js

@@ -0,0 +1,67 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IDataChannelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/dataChannel/common/dataChannel.service';
+
+class InterceptingTelemetryService {
+    constructor(_baseService, _intercept) {
+        this._baseService = _baseService;
+        this._intercept = _intercept;
+    }
+    get telemetryLevel() {
+        return this._baseService.telemetryLevel;
+    }
+    get sessionId() {
+        return this._baseService.sessionId;
+    }
+    get machineId() {
+        return this._baseService.machineId;
+    }
+    get sqmId() {
+        return this._baseService.sqmId;
+    }
+    get devDeviceId() {
+        return this._baseService.devDeviceId;
+    }
+    get firstSessionDate() {
+        return this._baseService.firstSessionDate;
+    }
+    get msftInternal() {
+        return this._baseService.msftInternal;
+    }
+    get sendErrorTelemetry() {
+        return this._baseService.sendErrorTelemetry;
+    }
+    publicLog(eventName, data) {
+        this._intercept(eventName, data);
+        this._baseService.publicLog(eventName, data);
+    }
+    publicLog2(eventName, data) {
+        this._intercept(eventName, data);
+        this._baseService.publicLog2(eventName, data);
+    }
+    publicLogError(errorEventName, data) {
+        this._intercept(errorEventName, data);
+        this._baseService.publicLogError(errorEventName, data);
+    }
+    publicLogError2(eventName, data) {
+        this._intercept(eventName, data);
+        this._baseService.publicLogError2(eventName, data);
+    }
+    setExperimentProperty(name, value) {
+        this._baseService.setExperimentProperty(name, value);
+    }
+}
+let DataChannelForwardingTelemetryService = class DataChannelForwardingTelemetryService extends InterceptingTelemetryService {
+    constructor(telemetryService, dataChannelService) {
+        super(telemetryService, (eventName, data) => {
+            dataChannelService.getDataChannel('editTelemetry').sendData({ eventName, data: data });
+        });
+    }
+};
+DataChannelForwardingTelemetryService = ( __decorate([
+    ( __param(0, ITelemetryService)),
+    ( __param(1, IDataChannelService))
+], DataChannelForwardingTelemetryService));
+
+export { DataChannelForwardingTelemetryService, InterceptingTelemetryService };

package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js

@@ -140,11 +140,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
     }
     _showBisectPrompt() {
         const goodPrompt = {
-            label: ( localize(12762, "I can't reproduce")),
+            label: ( localize(13012, "I can't reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', false)
         };
         const badPrompt = {
-            label: ( localize(12763, "I can reproduce")),
+            label: ( localize(13013, "I can reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', true)
         };
         const stop = {
@@ -153,11 +153,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
         };
         const message = this._extensionBisectService.disabledCount === 1
             ? ( localize(
-            12764,
+            13014,
             "Extension Bisect is active and has disabled 1 extension. Check if you can still reproduce the problem and proceed by selecting from these options."
         ))
             : ( localize(
-            12765,
+            13015,
             "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
             this._extensionBisectService.disabledCount
         ));
@@ -175,7 +175,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.start',
-            title: ( localize2(12766, 'Start Extension Bisect')),
+            title: ( localize2(13016, 'Start Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ( ExtensionBisectUi.ctxIsBisectActive.negate()),
@@ -195,13 +195,13 @@ registerAction2(class extends Action2 {
         const extensionsBisect = accessor.get(IExtensionBisectService);
         const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => extensionEnablementService.isEnabled(ext));
         const res = await dialogService.confirm({
-            message: ( localize(12767, "Extension Bisect")),
+            message: ( localize(13017, "Extension Bisect")),
             detail: ( localize(
-                12768,
+                13018,
                 "Extension Bisect will use binary search to find an extension that causes a problem. During the process the window reloads repeatedly (~{0} times). Each time you must confirm if you are still seeing problems.",
                 2 + Math.log2(extensions.length) | 0
             )),
-            primaryButton: ( localize(12769, "&&Start Extension Bisect"))
+            primaryButton: ( localize(13019, "&&Start Extension Bisect"))
         });
         if (res.confirmed) {
             await extensionsBisect.start(extensions);
@@ -213,7 +213,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.next',
-            title: ( localize2(12770, 'Continue Extension Bisect')),
+            title: ( localize2(13020, 'Continue Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive
@@ -247,8 +247,8 @@ registerAction2(class extends Action2 {
             return;
         }
         if (done.bad) {
-            await dialogService.info(( localize(12771, "Extension Bisect")), ( localize(
-                12772,
+            await dialogService.info(( localize(13021, "Extension Bisect")), ( localize(
+                13022,
                 "Extension Bisect is done but no extension has been identified. This might be a problem with {0}.",
                 productService.nameShort
             )));
@@ -256,15 +256,15 @@ registerAction2(class extends Action2 {
         else {
             const res = await dialogService.confirm({
                 type: Severity.Info,
-                message: ( localize(12771, "Extension Bisect")),
-                primaryButton: ( localize(12773, "&&Report Issue & Continue")),
-                cancelButton: ( localize(12774, "Continue")),
+                message: ( localize(13021, "Extension Bisect")),
+                primaryButton: ( localize(13023, "&&Report Issue & Continue")),
+                cancelButton: ( localize(13024, "Continue")),
                 detail: ( localize(
-                    12775,
+                    13025,
                     "Extension Bisect is done and has identified {0} as the extension causing the problem.",
                     done.id
                 )),
-                checkbox: { label: ( localize(12776, "Keep this extension disabled")), checked: true }
+                checkbox: { label: ( localize(13026, "Keep this extension disabled")), checked: true }
             });
             if (res.checkboxChecked) {
                 await extensionEnablementService.disableExtension({ id: done.id }, undefined);
@@ -279,28 +279,28 @@ registerAction2(class extends Action2 {
     async _checkForBad(dialogService, bisectService) {
         const { result } = await dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(12777, "Extension Bisect")),
+            message: ( localize(13027, "Extension Bisect")),
             detail: ( localize(
-                12778,
+                13028,
                 "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
                 bisectService.disabledCount
             )),
             buttons: [
                 {
-                    label: ( localize(12779, "I ca&&n't reproduce")),
+                    label: ( localize(13029, "I ca&&n't reproduce")),
                     run: () => false
                 },
                 {
-                    label: ( localize(12780, "I can &&reproduce")),
+                    label: ( localize(13030, "I can &&reproduce")),
                     run: () => true
                 },
                 {
-                    label: ( localize(12781, "&&Stop Bisect")),
+                    label: ( localize(13031, "&&Stop Bisect")),
                     run: () => undefined
                 }
             ],
             cancelButton: {
-                label: ( localize(12782, "&&Cancel Bisect")),
+                label: ( localize(13032, "&&Cancel Bisect")),
                 run: () => null
             }
         });
@@ -311,7 +311,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.stop',
-            title: ( localize2(12783, 'Stop Extension Bisect')),
+            title: ( localize2(13033, 'Stop Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js

@@ -274,7 +274,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
             logLevel: this._logService.getLevel(),
             loggers: [...this._loggerService.getRegisteredLoggers()],
             logsLocation: this._extensionHostLogsLocation,
-            autoStart: (this.startup === ExtensionHostStartup.EagerAutoStart),
+            autoStart: (this.startup === ExtensionHostStartup.EagerAutoStart || this.startup === ExtensionHostStartup.LazyAutoStart),
             remote: {
                 authority: this._environmentService.remoteAuthority,
                 connectionData: null,

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts

@@ -21,7 +21,7 @@ import { IExtensionHostManager } from "./extensionHostManagers.js";
 import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
 import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
 import { ExtensionRunningLocationTracker } from "./extensionRunningLocationTracker.js";
-import { ActivationKind, ActivationTimes, ExtensionActivationReason, ExtensionPointContribution, IExtensionHost, IExtensionsStatus, IMessage, IResponsiveStateChangeEvent, IWillActivateEvent, WillStopExtensionHostsEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
+import { ActivationKind, ActivationTimes, ExtensionActivationReason, ExtensionPointContribution, IExtensionHost, IExtensionInspectInfo, IExtensionsStatus, IMessage, IResponsiveStateChangeEvent, IWillActivateEvent, WillStopExtensionHostsEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ExtensionsProposedApi } from "./extensionsProposedApi.js";
 import { IExtensionPoint } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry";
@@ -114,6 +114,7 @@ export declare abstract class AbstractExtensionService extends Disposable implem
         toAdd: IExtension[];
         toRemove: string[];
     }): Promise<void>;
+    private _startOnDemandExtensionHosts;
     activateByEvent(activationEvent: string, activationKind?: ActivationKind): Promise<void>;
     private _activateByEvent;
     activateById(extensionId: ExtensionIdentifier, reason: ExtensionActivationReason): Promise<void>;
@@ -126,10 +127,7 @@ export declare abstract class AbstractExtensionService extends Disposable implem
     getExtensionsStatus(): {
         [id: string]: IExtensionsStatus;
     };
-    getInspectPorts(extensionHostKind: ExtensionHostKind, tryEnableInspector: boolean): Promise<{
-        port: number;
-        host: string;
-    }[]>;
+    getInspectPorts(extensionHostKind: ExtensionHostKind, tryEnableInspector: boolean): Promise<IExtensionInspectInfo[]>;
     setRemoteEnvironment(env: {
         [key: string]: string | null;
     }): Promise<void>;

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -181,14 +181,14 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                     }
                 }, {
                     id: 'join.disconnectRemote',
-                    label: ( localize(12865, "Disconnect Remote Agent")),
+                    label: ( localize(13115, "Disconnect Remote Agent")),
                     order: WillShutdownJoinerOrder.Last
                 });
             }
             else {
                 event.join(this._doStopExtensionHosts(), {
                     id: 'join.stopExtensionHosts',
-                    label: ( localize(12866, "Stopping Extension Hosts")),
+                    label: ( localize(13116, "Stopping Extension Hosts")),
                 });
             }
         }));
@@ -259,7 +259,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    12867,
+                    13117,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( result.removedDueToLooping.map(e => `'${e.identifier.value}'`)).join(', ')
                 ))
@@ -376,13 +376,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const lock = await this._registry.acquireLock('_initialize');
         try {
             await this._resolveAndProcessExtensions(lock);
-            const snapshot = this._registry.getSnapshot();
-            for (const extHostManager of this._extensionHostManagers) {
-                if (extHostManager.startup !== ExtensionHostStartup.EagerAutoStart) {
-                    const extensions = this._runningLocations.filterByExtensionHostManager(snapshot.extensions, extHostManager);
-                    extHostManager.start(snapshot.versionId, snapshot.extensions, ( extensions.map(extension => extension.identifier)));
-                }
-            }
+            this._startOnDemandExtensionHosts();
         }
         finally {
             lock.dispose();
@@ -440,7 +434,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    12867,
+                    13117,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( result.removedDueToLooping.map(e => `'${e.identifier.value}'`)).join(', ')
                 ))
@@ -455,7 +449,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const extensionHostManager = this.findTestExtensionHost(this._environmentService.extensionTestsLocationURI);
         if (!extensionHostManager) {
             const msg = ( localize(
-                12868,
+                13118,
                 "No extension host found that can launch the test runner at {0}.",
                 (this._environmentService.extensionTestsLocationURI.toString())
             ));
@@ -625,7 +619,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                             vetoReasons.add(reason);
                         }
                     }).catch(error => {
-                        vetoReasons.add(( localize(12869, "{0} (Error: {1})", reason, toErrorMessage(error))));
+                        vetoReasons.add(( localize(13119, "{0} (Error: {1})", reason, toErrorMessage(error))));
                     });
                 }
             }
@@ -640,11 +634,11 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                 this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
                 const { confirmed } = await this._dialogService.confirm({
                     type: Severity.Warning,
-                    message: ( localize(12870, "Please confirm restart of extensions.")),
+                    message: ( localize(13120, "Please confirm restart of extensions.")),
                     detail: vetoReasonsArray.length === 1 ?
                         vetoReasonsArray[0] :
                         vetoReasonsArray.join('\n -'),
-                    primaryButton: ( localize(12871, "Restart Anyway"))
+                    primaryButton: ( localize(13121, "Restart Anyway"))
                 });
                 if (confirmed) {
                     return true;
@@ -695,8 +689,8 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
     }
     _doCreateExtensionHostManager(extensionHost, initialActivationEvents) {
         const internalExtensionService = this._acquireInternalAPI(extensionHost);
-        if (extensionHost.startup === ExtensionHostStartup.Lazy && initialActivationEvents.length === 0) {
-            return this._instantiationService.createInstance(LazyCreateExtensionHostManager, extensionHost, internalExtensionService);
+        if (extensionHost.startup === ExtensionHostStartup.LazyAutoStart) {
+            return this._instantiationService.createInstance(LazyCreateExtensionHostManager, extensionHost, initialActivationEvents, internalExtensionService);
         }
         return this._instantiationService.createInstance(ExtensionHostManager, extensionHost, initialActivationEvents, internalExtensionService);
     }
@@ -741,15 +735,15 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._remoteCrashTracker.registerCrash();
             if (this._remoteCrashTracker.shouldAutomaticallyRestart()) {
                 this._logService.info(`Automatically restarting the remote extension host.`);
-                this._notificationService.status(( localize(12872, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
+                this._notificationService.status(( localize(13122, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
                 this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
             }
             else {
                 this._notificationService.prompt(Severity.Error, ( localize(
-                    12873,
+                    13123,
                     "Remote Extension host terminated unexpectedly 3 times within the last 5 minutes."
                 )), [{
-                        label: ( localize(12874, "Restart Remote Extension Host")),
+                        label: ( localize(13124, "Restart Remote Extension Host")),
                         run: () => {
                             this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
                         }
@@ -781,6 +775,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const lock = await this._registry.acquireLock('startExtensionHosts');
         try {
             this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
+            this._startOnDemandExtensionHosts();
             const localProcessExtensionHosts = this._getExtensionHostManagers(ExtensionHostKind.LocalProcess);
             await Promise.all(( localProcessExtensionHosts.map(extHost => extHost.ready())));
         }
@@ -788,6 +783,15 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             lock.dispose();
         }
     }
+    _startOnDemandExtensionHosts() {
+        const snapshot = this._registry.getSnapshot();
+        for (const extHostManager of this._extensionHostManagers) {
+            if (extHostManager.startup !== ExtensionHostStartup.EagerAutoStart) {
+                const extensions = this._runningLocations.filterByExtensionHostManager(snapshot.extensions, extHostManager);
+                extHostManager.start(snapshot.versionId, snapshot.extensions, ( extensions.map(extension => extension.identifier)));
+            }
+        }
+    }
     activateByEvent(activationEvent, activationKind = ActivationKind.Normal) {
         if (this._installedExtensionsReady.isOpen()) {
             this._allRequestedActivateEvents.add(activationEvent);
@@ -871,7 +875,13 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         return result;
     }
     async getInspectPorts(extensionHostKind, tryEnableInspector) {
-        const result = await Promise.all(( this._getExtensionHostManagers(extensionHostKind).map(extHost => extHost.getInspectPort(tryEnableInspector))));
+        const result = await Promise.all(( this._getExtensionHostManagers(extensionHostKind).map(async (extHost) => {
+            let portInfo = await extHost.getInspectPort(tryEnableInspector);
+            if (portInfo !== undefined) {
+                portInfo = { ...portInfo, devtoolsLabel: extHost.friendyName };
+            }
+            return portInfo;
+        })));
         return result.filter(isDefined);
     }
     async setRemoteEnvironment(env) {
@@ -1240,7 +1250,7 @@ class ActivationFeatureMarkdowneRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'activationEvents',
-    label: ( localize(12875, "Activation Events")),
+    label: ( localize(13125, "Activation Events")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.d.ts

@@ -11,7 +11,7 @@ import { IExtensionHostManager } from "./extensionHostManagers.js";
 import { IExtensionDescriptionDelta } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol";
 import { IResolveAuthorityResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProxy";
 import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
-import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IInternalExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
+import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IExtensionInspectInfo, IInternalExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { ResponsiveState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/rpcProtocol";
 export declare class ExtensionHostManager extends Disposable implements IExtensionHostManager {
     private readonly _internalExtensionService;
@@ -50,10 +50,7 @@ export declare class ExtensionHostManager extends Disposable implements IExtensi
     activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void>;
     activationEventIsDone(activationEvent: string): boolean;
     private _activateByEvent;
-    getInspectPort(tryEnableInspector: boolean): Promise<{
-        port: number;
-        host: string;
-    } | undefined>;
+    getInspectPort(tryEnableInspector: boolean): Promise<IExtensionInspectInfo | undefined>;
     resolveAuthority(remoteAuthority: string, resolveAttempt: number): Promise<IResolveAuthorityResult>;
     getCanonicalURI(remoteAuthority: string, uri: URI): Promise<URI | null>;
     start(extensionRegistryVersionId: number, allExtensions: IExtensionDescription[], myExtensions: ExtensionIdentifier[]): Promise<void>;

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -479,7 +479,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
     constructor() {
         super({
             id: 'editor.action.measureExtHostLatency',
-            title: ( localize2(12876, "Measure Extension Host Latency")),
+            title: ( localize2(13126, "Measure Extension Host Latency")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts

@@ -5,7 +5,7 @@ import { ExtensionHostKind } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IExtensionDescriptionDelta } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProtocol";
 import { IResolveAuthorityResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostProxy";
 import { ExtensionRunningLocation } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
-import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
+import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionInspectInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { ResponsiveState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/rpcProtocol";
 export interface IExtensionHostManager {
     readonly pid: number | null;
@@ -26,10 +26,7 @@ export interface IExtensionHostManager {
     activate(extension: ExtensionIdentifier, reason: ExtensionActivationReason): Promise<boolean>;
     activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void>;
     activationEventIsDone(activationEvent: string): boolean;
-    getInspectPort(tryEnableInspector: boolean): Promise<{
-        port: number;
-        host: string;
-    } | undefined>;
+    getInspectPort(tryEnableInspector: boolean): Promise<IExtensionInspectInfo | undefined>;
     resolveAuthority(remoteAuthority: string, resolveAttempt: number): Promise<IResolveAuthorityResult>;
     getCanonicalURI(remoteAuthority: string, uri: URI): Promise<URI | null>;
     start(extensionRegistryVersionId: number, allExtensions: readonly IExtensionDescription[], myExtensions: ExtensionIdentifier[]): Promise<void>;

package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js

@@ -106,7 +106,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'enabledApiProposals',
-    label: ( localize(12877, "API Proposals")),
+    label: ( localize(13127, "API Proposals")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js

@@ -9,7 +9,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(systemExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                12962,
+                13214,
                 "Overwriting extension {0} with {1}.",
                 extension.extensionLocation.fsPath,
                 systemExtension.extensionLocation.fsPath
@@ -29,7 +29,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
             }
             else {
                 logService.warn(( localize(
-                    12962,
+                    13214,
                     "Overwriting extension {0} with {1}.",
                     extension.extensionLocation.fsPath,
                     userExtension.extensionLocation.fsPath
@@ -46,7 +46,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(workspaceExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                12963,
+                13215,
                 "Overwriting {0} with Workspace Extension {1}.",
                 extension.extensionLocation.fsPath,
                 workspaceExtension.extensionLocation.fsPath
@@ -56,7 +56,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
     });
     development.forEach(developedExtension => {
         logService.info(( localize(
-            12964,
+            13216,
             "Loading development extension at {0}",
             developedExtension.extensionLocation.fsPath
         )));