@codingame/monaco-vscode-extensions-service-override 11.1.2 → 12.0.1

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -16,14 +17,12 @@ let ExtensionsProposedApi = class ExtensionsProposedApi {
     constructor(_logService, _environmentService, productService) {
         this._logService = _logService;
         this._environmentService = _environmentService;
-        this._envEnabledExtensions = ( (new Set(
-             ((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)))
-        )));
+        this._envEnabledExtensions = ( new Set(( (_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)))));
         this._envEnablesProposedApiForAll =
             !_environmentService.isBuilt ||
                 (_environmentService.isExtensionDevelopment && productService.quality !== 'stable') ||
                 (this._envEnabledExtensions.size === 0 && Array.isArray(_environmentService.extensionEnabledProposedApi));
-        this._productEnabledExtensions = ( (new Map()));
+        this._productEnabledExtensions = ( new Map());
         if (productService.extensionEnabledApiProposals) {
             for (const [k, value] of Object.entries(productService.extensionEnabledApiProposals)) {
                 const key = ExtensionIdentifier.toKey(k);
@@ -54,11 +53,11 @@ let ExtensionsProposedApi = class ExtensionsProposedApi {
                 return result;
             });
         }
-        if (( (this._productEnabledExtensions.has(key)))) {
+        if (( this._productEnabledExtensions.has(key))) {
             const productEnabledProposals = this._productEnabledExtensions.get(key);
-            const productSet = ( (new Set(productEnabledProposals)));
-            const extensionSet = ( (new Set(extension.enabledApiProposals)));
-            const diff = ( (new Set([...extensionSet].filter(a => !( (productSet.has(a)))))));
+            const productSet = ( new Set(productEnabledProposals));
+            const extensionSet = ( new Set(extension.enabledApiProposals));
+            const diff = ( new Set([...extensionSet].filter(a => !( productSet.has(a)))));
             if (diff.size > 0) {
                 this._logService.error(`Extension '${key}' appears in product.json but enables LESS API proposals than the extension wants.\npackage.json (LOSES): ${[...extensionSet].join(', ')}\nproduct.json (WINS): ${[...productSet].join(', ')}`);
                 if (this._environmentService.isExtensionDevelopment) {
@@ -69,7 +68,7 @@ let ExtensionsProposedApi = class ExtensionsProposedApi {
             extension.enabledApiProposals = productEnabledProposals;
             return;
         }
-        if (this._envEnablesProposedApiForAll || ( (this._envEnabledExtensions.has(key)))) {
+        if (this._envEnablesProposedApiForAll || ( this._envEnabledExtensions.has(key))) {
             return;
         }
         if (!extension.isBuiltin && isNonEmptyArray(extension.enabledApiProposals)) {
@@ -78,11 +77,11 @@ let ExtensionsProposedApi = class ExtensionsProposedApi {
         }
     }
 };
-ExtensionsProposedApi = ( (__decorate([
-    ( (__param(0, ILogService))),
-    ( (__param(1, IWorkbenchEnvironmentService))),
-    ( (__param(2, IProductService)))
-], ExtensionsProposedApi)));
+ExtensionsProposedApi = ( __decorate([
+    ( __param(0, ILogService)),
+    ( __param(1, IWorkbenchEnvironmentService)),
+    ( __param(2, IProductService))
+], ExtensionsProposedApi));
 class ApiProposalsMarkdowneRenderer extends Disposable {
     constructor() {
         super(...arguments);
@@ -93,7 +92,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
     }
     render(manifest) {
         const enabledApiProposals = manifest.originalEnabledApiProposals ?? manifest.enabledApiProposals ?? [];
-        const data = ( (new MarkdownString()));
+        const data = ( new MarkdownString());
         if (enabledApiProposals.length) {
             for (const proposal of enabledApiProposals) {
                 data.appendMarkdown(`- \`${proposal}\`\n`);
@@ -105,13 +104,13 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
         };
     }
 }
-( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'enabledApiProposals',
-    label: ( localize(691, "API Proposals")),
+    label: ( localize(11486, "API Proposals")),
     access: {
         canToggle: false
     },
-    renderer: ( (new SyncDescriptor(ApiProposalsMarkdowneRenderer))),
+    renderer: ( new SyncDescriptor(ApiProposalsMarkdowneRenderer)),
 });
 
 export { ExtensionsProposedApi };

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

@@ -0,0 +1,3 @@
+import { IExtensionDescription } from "vscode/vscode/vs/platform/extensions/common/extensions";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare function dedupExtensions(system: IExtensionDescription[], user: IExtensionDescription[], workspace: IExtensionDescription[], development: IExtensionDescription[], logService: ILogService): IExtensionDescription[];

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

@@ -1,14 +1,15 @@
+
 import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { localize } from 'vscode/vscode/vs/nls';
-import { semverExports } from '../../../../../../../_virtual/semver.js';
+import { semverExports } from 'vscode/_virtual/semver';
 
 function dedupExtensions(system, user, workspace, development, logService) {
-    const result = ( (new ExtensionIdentifierMap()));
+    const result = ( new ExtensionIdentifierMap());
     system.forEach((systemExtension) => {
         const extension = result.get(systemExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                4499,
+                11570,
                 "Overwriting extension {0} with {1}.",
                 extension.extensionLocation.fsPath,
                 systemExtension.extensionLocation.fsPath
@@ -28,7 +29,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
             }
             else {
                 logService.warn(( localize(
-                    4499,
+                    11570,
                     "Overwriting extension {0} with {1}.",
                     extension.extensionLocation.fsPath,
                     userExtension.extensionLocation.fsPath
@@ -45,7 +46,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(workspaceExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                4500,
+                11571,
                 "Overwriting {0} with Workspace Extension {1}.",
                 extension.extensionLocation.fsPath,
                 workspaceExtension.extensionLocation.fsPath
@@ -55,7 +56,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
     });
     development.forEach(developedExtension => {
         logService.info(( localize(
-            4501,
+            11572,
             "Loading development extension at {0}",
             developedExtension.extensionLocation.fsPath
         )));
@@ -67,7 +68,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         }
         result.set(developedExtension.identifier, developedExtension);
     });
-    return Array.from(( (result.values())));
+    return Array.from(( result.values()));
 }
 
 export { dedupExtensions };

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

@@ -0,0 +1,54 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ExtensionIdentifier, IExtensionDescription } from "vscode/vscode/vs/platform/extensions/common/extensions";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { ExtensionHostKind } from "vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind";
+import { IExtensionHostManager } from "./extensionHostManagers.js";
+import { IExtensionDescriptionDelta } from "vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol";
+import { IResolveAuthorityResult } from "vscode/vscode/vs/workbench/services/extensions/common/extensionHostProxy";
+import { ExtensionRunningLocation } from "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ActivationKind, ExtensionActivationReason, ExtensionHostStartup, IExtensionHost, IInternalExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions";
+import { ResponsiveState } from "vscode/vscode/vs/workbench/services/extensions/common/rpcProtocol";
+export declare class LazyCreateExtensionHostManager extends Disposable implements IExtensionHostManager {
+    private readonly _internalExtensionService;
+    private readonly _instantiationService;
+    private readonly _logService;
+    readonly onDidExit: Event<[
+        number,
+        string | null
+    ]>;
+    private readonly _onDidChangeResponsiveState;
+    readonly onDidChangeResponsiveState: Event<ResponsiveState>;
+    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);
+    private _createActual;
+    private _getOrCreateActualAndStart;
+    ready(): Promise<void>;
+    disconnect(): Promise<void>;
+    representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean;
+    deltaExtensions(extensionsDelta: IExtensionDescriptionDelta): Promise<void>;
+    containsExtension(extensionId: ExtensionIdentifier): boolean;
+    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>;
+    resolveAuthority(remoteAuthority: string, resolveAttempt: number): Promise<IResolveAuthorityResult>;
+    getCanonicalURI(remoteAuthority: string, uri: URI): Promise<URI | null>;
+    start(extensionRegistryVersionId: number, allExtensions: IExtensionDescription[], myExtensions: ExtensionIdentifier[]): Promise<void>;
+    extensionTestsExecute(): Promise<number>;
+    setRemoteEnvironment(env: {
+        [key: string]: string | null;
+    }): Promise<void>;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Barrier } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -6,7 +7,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { RemoteAuthorityResolverErrorCode } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { friendlyExtHostName, ExtensionHostManager } from './extensionHostManager.js';
-import { ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { ActivationKind, ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 
 let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extends Disposable {
     get pid() {
@@ -86,7 +87,7 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
         return false;
     }
     async activateByEvent(activationEvent, activationKind) {
-        if (activationKind === 1 ) {
+        if (activationKind === ActivationKind.Immediate) {
             if (this._actual) {
                 return this._actual.activateByEvent(activationEvent, activationKind);
             }

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

@@ -0,0 +1,4 @@
+import { IRemoteConsoleLog } from "../../../../base/common/console.js";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+export declare function logRemoteEntry(logService: ILogService, entry: IRemoteConsoleLog, label?: string | null): void;
+export declare function logRemoteEntryIfError(logService: ILogService, entry: IRemoteConsoleLog, label: string): void;

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

@@ -1,3 +1,4 @@
+
 import { parse } from '../../../../base/common/console.js';
 
 function logRemoteEntry(logService, entry, label = null) {

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

@@ -0,0 +1,68 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IMessagePassingProtocol } from "vscode/vscode/vs/base/parts/ipc/common/ipc";
+import { IExtensionHostDebugService } from "vscode/vscode/vs/platform/debug/common/extensionHostDebug.service";
+import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { ILoggerService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IRemoteConnectionData } from "vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver";
+import { IRemoteAuthorityResolverService } from "vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service";
+import { IRemoteSocketFactoryService } from "vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service";
+import { ISignService } from "vscode/vscode/vs/platform/sign/common/sign.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { RemoteRunningLocation } from "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/workbench/services/extensions/common/extensionRunningLocation";
+import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost } from "vscode/vscode/vs/workbench/services/extensions/common/extensions";
+export interface IRemoteExtensionHostInitData {
+    readonly connectionData: IRemoteConnectionData | null;
+    readonly pid: number;
+    readonly appRoot: URI;
+    readonly extensionHostLogsPath: URI;
+    readonly globalStorageHome: URI;
+    readonly workspaceStorageHome: URI;
+    readonly extensions: ExtensionHostExtensions;
+}
+export interface IRemoteExtensionHostDataProvider {
+    readonly remoteAuthority: string;
+    getInitData(): Promise<IRemoteExtensionHostInitData>;
+}
+export declare class RemoteExtensionHost extends Disposable implements IExtensionHost {
+    readonly runningLocation: RemoteRunningLocation;
+    private readonly _initDataProvider;
+    private readonly remoteSocketFactoryService;
+    private readonly _contextService;
+    private readonly _environmentService;
+    private readonly _telemetryService;
+    private readonly _logService;
+    protected readonly _loggerService: ILoggerService;
+    private readonly _labelService;
+    private readonly remoteAuthorityResolverService;
+    private readonly _extensionHostDebugService;
+    private readonly _productService;
+    private readonly _signService;
+    readonly pid: null;
+    readonly remoteAuthority: string;
+    readonly startup = ExtensionHostStartup.EagerAutoStart;
+    extensions: ExtensionHostExtensions | null;
+    private _onExit;
+    readonly onExit: Event<[
+        number,
+        string | null
+    ]>;
+    private _protocol;
+    private _hasLostConnection;
+    private _terminating;
+    private _hasDisconnected;
+    private readonly _isExtensionDevHost;
+    constructor(runningLocation: RemoteRunningLocation, _initDataProvider: IRemoteExtensionHostDataProvider, remoteSocketFactoryService: IRemoteSocketFactoryService, _contextService: IWorkspaceContextService, _environmentService: IWorkbenchEnvironmentService, _telemetryService: ITelemetryService, _logService: ILogService, _loggerService: ILoggerService, _labelService: ILabelService, remoteAuthorityResolverService: IRemoteAuthorityResolverService, _extensionHostDebugService: IExtensionHostDebugService, _productService: IProductService, _signService: ISignService);
+    start(): Promise<IMessagePassingProtocol>;
+    private _onExtHostConnectionLost;
+    private _createExtHostInitData;
+    getInspectPort(): undefined;
+    enableInspectPort(): Promise<boolean>;
+    disconnect(): Promise<void>;
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -8,16 +9,18 @@ import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/comm
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { connectRemoteAgentExtensionHost } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
+import { connectRemoteAgentExtensionHost } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
 import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { isLoggingOnly } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { parseExtensionDevOptions } from './extensionDevOptions.js';
-import { isMessageOfType, UIKind, createMessageOfType } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
+import { isMessageOfType, MessageType, UIKind, createMessageOfType } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
+import { ExtensionHostStartup } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 
 let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
     constructor(runningLocation, _initDataProvider, remoteSocketFactoryService, _contextService, _environmentService, _telemetryService, _logService, _loggerService, _labelService, remoteAuthorityResolverService, _extensionHostDebugService, _productService, _signService) {
@@ -36,7 +39,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
         this._productService = _productService;
         this._signService = _signService;
         this.pid = null;
-        this.startup = 1 ;
+        this.startup = ExtensionHostStartup.EagerAutoStart;
         this.extensions = null;
         this._onExit = this._register(( new Emitter()));
         this.onExit = this._onExit.event;
@@ -101,13 +104,13 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
                         reject('The remote extension host took longer than 60s to send its ready message.');
                     }, 60 * 1000);
                     const disposable = protocol.onMessage(msg => {
-                        if (isMessageOfType(msg, 1 )) {
+                        if (isMessageOfType(msg, MessageType.Ready)) {
                             this._createExtHostInitData(isExtensionDevelopmentDebug).then(data => {
                                 protocol.send(VSBuffer.fromString(JSON.stringify(data)));
                             });
                             return;
                         }
-                        if (isMessageOfType(msg, 0 )) {
+                        if (isMessageOfType(msg, MessageType.Initialized)) {
                             clearTimeout(handle);
                             disposable.dispose();
                             this._protocol = protocol;
@@ -157,7 +160,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
                 workspaceStorageHome: remoteInitData.workspaceStorageHome,
                 extensionLogLevel: this._environmentService.extensionLogLevel
             },
-            workspace: this._contextService.getWorkbenchState() === 1  ? null : {
+            workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : {
                 configuration: workspace.configuration,
                 id: workspace.id,
                 name: this._labelService.getWorkspaceLabel(workspace),
@@ -184,7 +187,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
             logLevel: this._logService.getLevel(),
             loggers: [...this._loggerService.getRegisteredLoggers()],
             logsLocation: remoteInitData.extensionHostLogsPath,
-            autoStart: ((this.startup === 1) ),
+            autoStart: (this.startup === ExtensionHostStartup.EagerAutoStart),
             uiKind: isWeb ? UIKind.Web : UIKind.Desktop
         };
     }
@@ -196,7 +199,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
     }
     async disconnect() {
         if (this._protocol && !this._hasDisconnected) {
-            this._protocol.send(createMessageOfType(2 ));
+            this._protocol.send(createMessageOfType(MessageType.Terminate));
             this._protocol.sendDisconnect();
             this._hasDisconnected = true;
             await this._protocol.drain();

package/_virtual/semver.js

@@ -1,5 +0,0 @@
-import { __require } from 'vscode/external/vscode-semver/semver.js';
-
-var semverExports = __require();
-
-export { semverExports };