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

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

@@ -9,9 +9,10 @@ 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 LazyCreateExtensionHostManager extends Disposable implements IExtensionHostManager {
+    private readonly _initialActivationEvents;
     private readonly _internalExtensionService;
     private readonly _instantiationService;
     private readonly _logService;
@@ -24,12 +25,11 @@ export declare class LazyCreateExtensionHostManager extends Disposable implement
     private readonly _extensionHost;
     private _startCalled;
     private _actual;
-    private _lazyStartExtensions;
     get pid(): number | null;
     get kind(): ExtensionHostKind;
     get startup(): ExtensionHostStartup;
     get friendyName(): string;
-    constructor(extensionHost: IExtensionHost, _internalExtensionService: IInternalExtensionService, _instantiationService: IInstantiationService, _logService: ILogService);
+    constructor(extensionHost: IExtensionHost, _initialActivationEvents: string[], _internalExtensionService: IInternalExtensionService, _instantiationService: IInstantiationService, _logService: ILogService);
     private _createActual;
     private _getOrCreateActualAndStart;
     ready(): Promise<void>;
@@ -40,10 +40,7 @@ export declare class LazyCreateExtensionHostManager extends Disposable implement
     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: IExtensionDescription[], myExtensions: ExtensionIdentifier[]): Promise<void>;

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

@@ -7,7 +7,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { RemoteAuthorityResolverErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { friendlyExtHostName, ExtensionHostManager } from './extensionHostManager.js';
-import { ActivationKind, ExtensionHostExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
+import { ActivationKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 
 let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extends Disposable {
     get pid() {
@@ -25,8 +25,9 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
     get friendyName() {
         return friendlyExtHostName(this.kind, this.pid);
     }
-    constructor(extensionHost, _internalExtensionService, _instantiationService, _logService) {
+    constructor(extensionHost, _initialActivationEvents, _internalExtensionService, _instantiationService, _logService) {
         super();
+        this._initialActivationEvents = _initialActivationEvents;
         this._internalExtensionService = _internalExtensionService;
         this._instantiationService = _instantiationService;
         this._logService = _logService;
@@ -36,11 +37,10 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
         this.onDidExit = extensionHost.onExit;
         this._startCalled = ( new Barrier());
         this._actual = null;
-        this._lazyStartExtensions = null;
     }
     _createActual(reason) {
         this._logService.info(`Creating lazy extension host (${this.friendyName}). Reason: ${reason}`);
-        this._actual = this._register(this._instantiationService.createInstance(ExtensionHostManager, this._extensionHost, [], this._internalExtensionService));
+        this._actual = this._register(this._instantiationService.createInstance(ExtensionHostManager, this._extensionHost, this._initialActivationEvents, this._internalExtensionService));
         this._register(this._actual.onDidChangeResponsiveState((e) => this._onDidChangeResponsiveState.fire(e)));
         return this._actual;
     }
@@ -49,7 +49,7 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
             return this._actual;
         }
         const actual = this._createActual(reason);
-        await actual.start(this._lazyStartExtensions.versionId, this._lazyStartExtensions.allExtensions, this._lazyStartExtensions.myExtensions);
+        await actual.ready();
         return actual;
     }
     async ready() {
@@ -69,10 +69,9 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
         if (this._actual) {
             return this._actual.deltaExtensions(extensionsDelta);
         }
-        this._lazyStartExtensions.delta(extensionsDelta);
         if (extensionsDelta.myToAdd.length > 0) {
             const actual = this._createActual(`contains ${extensionsDelta.myToAdd.length} new extension(s) (installed or enabled): ${( extensionsDelta.myToAdd.map(extId => extId.value))}`);
-            await actual.start(this._lazyStartExtensions.versionId, this._lazyStartExtensions.allExtensions, this._lazyStartExtensions.myExtensions);
+            await actual.ready();
             return;
         }
     }
@@ -135,11 +134,10 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
     async start(extensionRegistryVersionId, allExtensions, myExtensions) {
         if (myExtensions.length > 0) {
             const actual = this._createActual(`contains ${myExtensions.length} extension(s): ${( myExtensions.map(extId => extId.value))}.`);
-            const result = actual.start(extensionRegistryVersionId, allExtensions, myExtensions);
+            const result = actual.ready();
             this._startCalled.open();
             return result;
         }
-        this._lazyStartExtensions = ( new ExtensionHostExtensions(extensionRegistryVersionId, allExtensions, myExtensions));
         this._startCalled.open();
     }
     async extensionTestsExecute() {
@@ -155,8 +153,8 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
     }
 };
 LazyCreateExtensionHostManager = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, ILogService))
+    ( __param(3, IInstantiationService)),
+    ( __param(4, ILogService))
 ], LazyCreateExtensionHostManager));
 
 export { LazyCreateExtensionHostManager };