@codingame/monaco-vscode-extensions-service-override 1.83.13 → 1.83.15-next.0

package/extensions.d.ts

@@ -21,21 +21,16 @@ import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/servi
 import { ExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/browser/extensionService';
 import { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
-import { ExtHostExtensionService } from './vscode/src/vs/workbench/api/worker/extHostExtensionService.js';
-import * as vscode from 'vscode';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { LocalExtensionHost } from './localExtensionHost.js';
 
-declare class LocalExtHostExtensionService extends ExtHostExtensionService {
-    private _defaultApiImpl?;
-    private readonly _extApiImpl;
-    getApi(extensionId?: string): Promise<typeof vscode>;
-}
 interface WorkerConfig {
     url: string;
     options?: WorkerOptions;
 }
+declare function setLocalExtensionHost(_localExtensionHost: typeof LocalExtensionHost): void;
 interface IExtensionWithExtHostKind extends IExtension {
     extHostKind?: ExtensionHostKind;
 }
@@ -45,6 +40,5 @@ declare class ExtensionServiceOverride extends ExtensionService implements IExte
     protected _scanSingleExtension(extension: IExtension): Promise<Readonly<IRelaxedExtensionDescription> | null>;
 }
 declare function getServiceOverride(workerConfig?: WorkerConfig, _iframeAlternateDomains?: string): IEditorOverrideServices;
-declare function getLocalExtHostExtensionService(): Promise<LocalExtHostExtensionService>;
 
-export { ExtensionServiceOverride, type IExtensionWithExtHostKind, LocalExtHostExtensionService, type WorkerConfig, getServiceOverride as default, getLocalExtHostExtensionService };
+export { ExtensionServiceOverride, type IExtensionWithExtHostKind, type WorkerConfig, getServiceOverride as default, setLocalExtensionHost };

package/extensions.js

@@ -1,15 +1,13 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { nullExtensionDescription, toExtensionDescription, IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { toExtensionDescription, IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ILogService, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { ExtensionIdentifierMap } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
 import { DeltaExtensionsQueueItem } from './vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import './override/vs/platform/dialogs/common/dialogs.js';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
@@ -24,19 +22,7 @@ import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/servi
 import { ExtensionsProposedApi } from './vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js';
 import { ExtensionService, BrowserExtensionHostFactory, BrowserExtensionHostKindPicker } from './vscode/src/vs/workbench/services/extensions/browser/extensionService.js';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
-import { IExtHostExtensionService } from 'vscode/vscode/vs/workbench/api/common/extHostExtensionService';
-import { ExtHostExtensionService } from 'vscode/vscode/vs/workbench/api/worker/extHostExtensionService';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { registerSingleton } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
-import { IExtensionStoragePaths, ExtensionStoragePaths } from 'vscode/vscode/vs/workbench/api/common/extHostStoragePaths';
 import { WebWorkerExtensionHost } from './vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js';
-import { ExtensionHostMain } from 'vscode/vscode/vs/workbench/api/common/extensionHostMain';
-import { BufferedEmitter } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
-import { isLoggingOnly } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import { UIKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
 import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
 import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
@@ -44,12 +30,13 @@ import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IWorkspaceTrustManagementService } from 'monaco-editor/esm/vs/platform/workspace/common/workspaceTrust.js';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { ExtensionResourceLoaderService } from './vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js';
+import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
 import { changeUrlDomain } from './tools/url.js';
 import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from 'vscode/assets';
-import { unsupported } from './tools.js';
 import 'vscode/vscode/vs/workbench/services/themes/common/colorExtensionPoint';
-import './vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js';
+import 'vscode/vscode/vs/workbench/services/themes/common/iconExtensionPoint';
 import 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint';
@@ -125,178 +112,8 @@ import './vscode/src/vs/workbench/api/browser/mainThreadProfilContentHandlers.js
 import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadIssueReporter.js';
-import 'vscode/missing-services';
-import 'vscode/vscode/vs/workbench/api/common/extHost.common.services';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
-function createMessagePassingProtocolPair() {
-    const emitterA = new BufferedEmitter();
-    const emitterB = new BufferedEmitter();
-    class SimpleMessagePassingProtocol {
-        constructor(emitterIn, emitterOut) {
-            this.emitterIn = emitterIn;
-            this.emitterOut = emitterOut;
-            this.onMessage = this.emitterIn.event;
-        }
-        send(buffer) {
-            this.emitterOut.fire(buffer);
-        }
-    }
-    return [new SimpleMessagePassingProtocol(emitterA, emitterB), new SimpleMessagePassingProtocol(emitterB, emitterA)];
-}
-class LocalExtHostExtensionService extends ExtHostExtensionService {
-    constructor() {
-        super(...arguments);
-        this._extApiImpl = new ExtensionIdentifierMap();
-    }
-    async getApi(extensionId) {
-        const [myRegistry, configProvider] = await Promise.all([
-            this.getExtensionRegistry(),
-            this._extHostConfiguration.getConfigProvider()
-        ]);
-        const extensionRegistry = { mine: myRegistry, all: this._globalRegistry };
-        const ext = extensionId != null ? myRegistry.getExtensionDescription(extensionId) : undefined;
-        if (ext != null) {
-            let apiImpl = this._extApiImpl.get(ext.identifier);
-            if (apiImpl == null) {
-                apiImpl = this._apiFactory(ext, extensionRegistry, configProvider);
-                this._extApiImpl.set(ext.identifier, apiImpl);
-            }
-            return apiImpl;
-        }
-        if (this._defaultApiImpl == null) {
-            this._defaultApiImpl = this._apiFactory(nullExtensionDescription, extensionRegistry, configProvider);
-        }
-        return this._defaultApiImpl;
-    }
-}
-registerSingleton(IExtHostExtensionService, LocalExtHostExtensionService, 0 );
-registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, 0 );
-const hostUtil = new class {
-    constructor() {
-        this.pid = undefined;
-        this.exit = unsupported;
-    }
-    async exists(_path) {
-        return true;
-    }
-    async realpath(path) {
-        return path;
-    }
-}();
-const localExtHostDeferred = new DeferredPromise();
-const localExtHostPromise = localExtHostDeferred.p;
-let LocalExtensionHost = class LocalExtensionHost {
-    constructor(runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _productService, _userDataProfilesService) {
-        this.runningLocation = runningLocation;
-        this.startup = startup;
-        this._initDataProvider = _initDataProvider;
-        this._telemetryService = _telemetryService;
-        this._contextService = _contextService;
-        this._labelService = _labelService;
-        this._logService = _logService;
-        this._loggerService = _loggerService;
-        this._environmentService = _environmentService;
-        this._productService = _productService;
-        this._userDataProfilesService = _userDataProfilesService;
-        this.remoteAuthority = null;
-        this.extensions = null;
-        this.onExit = Event.None;
-        this._protocolPromise = null;
-        this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath, 'local');
-    }
-    async start() {
-        if (this._protocolPromise == null) {
-            this._protocolPromise = this._start();
-        }
-        return this._protocolPromise;
-    }
-    async _start() {
-        const [mainThreadMessagePassingProtocol, extHostMessagePassingProtocol] = createMessagePassingProtocolPair();
-        const initData = await this._createExtHostInitData();
-        const hostMain = new ExtensionHostMain(extHostMessagePassingProtocol, initData, hostUtil, null);
-        await localExtHostDeferred.complete(hostMain.getExtHostExtensionService());
-        return mainThreadMessagePassingProtocol;
-    }
-    async _createExtHostInitData() {
-        const initData = await this._initDataProvider.getInitData();
-        this.extensions = initData.extensions;
-        const workspace = this._contextService.getWorkspace();
-        const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
-        let nlsUrlWithDetails;
-        if (nlsBaseUrl != null && this._productService.commit != null && !platform.Language.isDefaultVariant()) {
-            nlsUrlWithDetails = URI.joinPath(( URI.parse(nlsBaseUrl)), this._productService.commit, this._productService.version, platform.Language.value());
-        }
-        return {
-            commit: this._productService.commit,
-            version: this._productService.version,
-            quality: this._productService.quality,
-            parentPid: 0,
-            environment: {
-                isExtensionDevelopmentDebug: this._environmentService.debugRenderer,
-                appName: this._productService.nameLong,
-                appHost: this._productService.embedderIdentifier ?? (platform.isWeb ? 'web' : 'desktop'),
-                appUriScheme: this._productService.urlProtocol,
-                appLanguage: platform.language,
-                extensionTelemetryLogResource: this._environmentService.extHostTelemetryLogFile,
-                isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
-                extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
-                extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
-                globalStorageHome: this._userDataProfilesService.defaultProfile.globalStorageHome,
-                workspaceStorageHome: this._environmentService.workspaceStorageHome,
-                extensionLogLevel: this._environmentService.extensionLogLevel
-            },
-            workspace: this._contextService.getWorkbenchState() === 1
-                ? undefined
-                : {
-                    configuration: workspace.configuration ?? undefined,
-                    id: workspace.id,
-                    name: this._labelService.getWorkspaceLabel(workspace),
-                    transient: workspace.transient
-                },
-            consoleForward: {
-                includeStack: false,
-                logNative: this._environmentService.debugRenderer
-            },
-            extensions: initData.extensions.toSnapshot(),
-            nlsBaseUrl: nlsUrlWithDetails,
-            telemetryInfo: {
-                sessionId: this._telemetryService.sessionId,
-                machineId: this._telemetryService.machineId,
-                firstSessionDate: this._telemetryService.firstSessionDate,
-                msftInternal: this._telemetryService.msftInternal
-            },
-            logLevel: this._logService.getLevel(),
-            loggers: [...this._loggerService.getRegisteredLoggers()],
-            logsLocation: this._extensionHostLogsLocation,
-            autoStart: ((this.startup === 1) ),
-            remote: {
-                authority: this._environmentService.remoteAuthority,
-                connectionData: null,
-                isRemote: false
-            },
-            uiKind: platform.isWeb ? UIKind.Web : UIKind.Desktop
-        };
-    }
-    getInspectPort() {
-        return undefined;
-    }
-    enableInspectPort() {
-        return Promise.resolve(false);
-    }
-    dispose() {
-    }
-};
-LocalExtensionHost = __decorate([
-    ( __param(3, ITelemetryService)),
-    ( __param(4, IWorkspaceContextService)),
-    ( __param(5, ILabelService)),
-    ( __param(6, ILogService)),
-    ( __param(7, ILoggerService)),
-    ( __param(8, IBrowserWorkbenchEnvironmentService)),
-    ( __param(9, IProductService)),
-    ( __param(10, IUserDataProfilesService))
-], LocalExtensionHost);
 let EsmWebWorkerExtensionHost = class EsmWebWorkerExtensionHost extends WebWorkerExtensionHost {
     constructor(workerConfig, runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {
         super(runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService);
@@ -324,7 +141,11 @@ EsmWebWorkerExtensionHost = __decorate([
     ( __param(12, ILayoutService)),
     ( __param(13, IStorageService))
 ], EsmWebWorkerExtensionHost);
-let LocalBrowserExtensionHostFactory = class LocalBrowserExtensionHostFactory extends BrowserExtensionHostFactory {
+let localExtensionHost;
+function setLocalExtensionHost(_localExtensionHost) {
+    localExtensionHost = _localExtensionHost;
+}
+let BrowserExtensionHostFactoryOverride = class BrowserExtensionHostFactoryOverride extends BrowserExtensionHostFactory {
     constructor(workerConfig, _extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
         super(_extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService);
         this.workerConfig = workerConfig;
@@ -332,7 +153,10 @@ let LocalBrowserExtensionHostFactory = class LocalBrowserExtensionHostFactory ex
     createExtensionHost(runningLocations, runningLocation, isInitialStart) {
         switch (runningLocation.kind) {
             case 1 : {
-                return this._instantiationService.createInstance(LocalExtensionHost, runningLocation, 1 , this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
+                if (localExtensionHost == null) {
+                    return null;
+                }
+                return this._instantiationService.createInstance(localExtensionHost, runningLocation, 1 , this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case 2 : {
                 if (this.workerConfig == null) {
@@ -347,13 +171,13 @@ let LocalBrowserExtensionHostFactory = class LocalBrowserExtensionHostFactory ex
         }
     }
 };
-LocalBrowserExtensionHostFactory = __decorate([
+BrowserExtensionHostFactoryOverride = __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IRemoteAgentService)),
     ( __param(6, IRemoteAuthorityResolverService)),
     ( __param(7, IWorkbenchExtensionEnablementService)),
     ( __param(8, ILogService))
-], LocalBrowserExtensionHostFactory);
+], BrowserExtensionHostFactoryOverride);
 let LocalBrowserExtensionHostKindPicker = class LocalBrowserExtensionHostKindPicker extends BrowserExtensionHostKindPicker {
     constructor(allowedExtHostKinds, _logService) {
         super(_logService);
@@ -384,7 +208,7 @@ LocalBrowserExtensionHostKindPicker = __decorate([
 let ExtensionServiceOverride = class ExtensionServiceOverride extends ExtensionService {
     constructor(workerConfig, instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService) {
         const extensionsProposedApi = instantiationService.createInstance(ExtensionsProposedApi);
-        const extensionHostFactory = new LocalBrowserExtensionHostFactory(workerConfig, extensionsProposedApi, async () => this._scanWebExtensions(), () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
+        const extensionHostFactory = new BrowserExtensionHostFactoryOverride(workerConfig, extensionsProposedApi, async () => this._scanWebExtensions(), () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
         super(extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerConfig != null ? [2 , 1 , 3 ] : [1 , 3 ], logService), instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService);
     }
     async deltaExtensions(toAdd, toRemove) {
@@ -430,6 +254,15 @@ ExtensionServiceOverride = __decorate([
     ( __param(21, IRemoteExplorerService)),
     ( __param(22, IDialogService))
 ], ExtensionServiceOverride);
+class ExtensionResourceLoaderServiceOverride extends ExtensionResourceLoaderService {
+    async readExtensionResource(uri) {
+        if (uri.scheme === CustomSchemas.extensionFile) {
+            const result = await this._fileService.readFile(uri);
+            return ( result.value.toString());
+        }
+        return super.readExtensionResource(uri);
+    }
+}
 let iframeAlternateDomains;
 registerAssets({
     'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomains)
@@ -446,11 +279,9 @@ function getServiceOverride(workerConfig, _iframeAlternateDomains) {
         : undefined;
     return {
         [( IExtensionService.toString())]: new SyncDescriptor(ExtensionServiceOverride, [_workerConfig], false),
-        [( IExtensionManifestPropertiesService.toString())]: new SyncDescriptor(ExtensionManifestPropertiesService, [], true)
+        [( IExtensionManifestPropertiesService.toString())]: new SyncDescriptor(ExtensionManifestPropertiesService, [], true),
+        [( IExtensionResourceLoaderService.toString())]: new SyncDescriptor(ExtensionResourceLoaderServiceOverride, [], true)
     };
 }
-function getLocalExtHostExtensionService() {
-    return localExtHostPromise;
-}
 
-export { ExtensionServiceOverride, LocalExtHostExtensionService, getServiceOverride as default, getLocalExtHostExtensionService };
+export { ExtensionServiceOverride, getServiceOverride as default, setLocalExtensionHost };

package/index.d.ts

@@ -1,2 +1,2 @@
-export { ExtensionServiceOverride, IExtensionWithExtHostKind, LocalExtHostExtensionService, WorkerConfig, default, getLocalExtHostExtensionService } from './extensions.js';
+export { ExtensionServiceOverride, IExtensionWithExtHostKind, WorkerConfig, default, setLocalExtensionHost } from './extensions.js';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';

package/index.js

@@ -1,2 +1,2 @@
-export { ExtensionServiceOverride, LocalExtHostExtensionService, default, getLocalExtHostExtensionService } from './extensions.js';
+export { ExtensionServiceOverride, default, setLocalExtensionHost } from './extensions.js';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';

package/localExtensionHost.d.ts

@@ -0,0 +1,40 @@
+import { IMessagePassingProtocol } from 'vscode/vscode/vs/base/parts/ipc/common/ipc';
+import { LocalProcessRunningLocation } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
+import { IExtensionHost, ExtensionHostStartup, ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IWebWorkerExtensionHostDataProvider } from 'vscode/vscode/vs/workbench/services/extensions/browser/webWorkerExtensionHost';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+
+declare class LocalExtensionHost implements IExtensionHost {
+    readonly runningLocation: LocalProcessRunningLocation;
+    readonly startup: ExtensionHostStartup;
+    private readonly _initDataProvider;
+    private readonly _telemetryService;
+    private readonly _contextService;
+    private readonly _labelService;
+    private readonly _logService;
+    private readonly _loggerService;
+    private readonly _environmentService;
+    private readonly _productService;
+    private readonly _userDataProfilesService;
+    readonly remoteAuthority: null;
+    extensions: ExtensionHostExtensions | null;
+    private readonly _extensionHostLogsLocation;
+    private _protocolPromise;
+    constructor(runningLocation: LocalProcessRunningLocation, startup: ExtensionHostStartup, _initDataProvider: IWebWorkerExtensionHostDataProvider, _telemetryService: ITelemetryService, _contextService: IWorkspaceContextService, _labelService: ILabelService, _logService: ILogService, _loggerService: ILoggerService, _environmentService: IBrowserWorkbenchEnvironmentService, _productService: IProductService, _userDataProfilesService: IUserDataProfilesService);
+    onExit: Event<any>;
+    start(): Promise<IMessagePassingProtocol>;
+    _start(): Promise<IMessagePassingProtocol>;
+    private _createExtHostInitData;
+    getInspectPort(): number | undefined;
+    enableInspectPort(): Promise<boolean>;
+    dispose(): void;
+}
+
+export { LocalExtensionHost };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "1.83.13",
+  "version": "1.83.15-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,9 +18,9 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.13",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.15-next.0",
     "monaco-editor": "0.44.0",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "1.83.13"
+    "@codingame/monaco-vscode-files-service-override": "1.83.15-next.0"
   }
 }

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -0,0 +1,44 @@
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { FileAccess, Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { AbstractExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
+
+let ExtensionResourceLoaderService = class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
+    constructor(fileService, storageService, productService, environmentService, configurationService, _logService) {
+        super(fileService, storageService, productService, environmentService, configurationService);
+        this._logService = _logService;
+    }
+    async readExtensionResource(uri) {
+        uri = FileAccess.uriToBrowserUri(uri);
+        if (uri.scheme !== Schemas.http && uri.scheme !== Schemas.https && uri.scheme !== Schemas.data) {
+            const result = await this._fileService.readFile(uri);
+            return ( result.value.toString());
+        }
+        const requestInit = {};
+        if (this.isExtensionGalleryResource(uri)) {
+            requestInit.headers = await this.getExtensionGalleryRequestHeaders();
+            requestInit.mode = 'cors';
+        }
+        const response = await fetch(( uri.toString(true)), requestInit);
+        if (response.status !== 200) {
+            this._logService.info(`Request to '${( uri.toString(true))}' failed with status code ${response.status}`);
+            throw new Error(response.statusText);
+        }
+        return response.text();
+    }
+};
+ExtensionResourceLoaderService = ( __decorate([
+    ( __param(0, IFileService)),
+    ( __param(1, IStorageService)),
+    ( __param(2, IProductService)),
+    ( __param(3, IEnvironmentService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, ILogService))
+], ExtensionResourceLoaderService));
+
+export { ExtensionResourceLoaderService };

package/tools.js

@@ -1,5 +0,0 @@
-function unsupported() {
-    throw new Error('unsupported');
-}
-
-export { unsupported };

package/vscode/src/vs/workbench/api/common/extHost.api.impl.d.ts

@@ -1,14 +0,0 @@
-import { ExtHostConfigProvider } from './extHostConfiguration.js';
-import { ExtensionDescriptionRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionDescriptionRegistry';
-import * as vscode from 'vscode';
-import { IExtensionDescription } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-
-interface IExtensionRegistries {
-    mine: ExtensionDescriptionRegistry;
-    all: ExtensionDescriptionRegistry;
-}
-interface IExtensionApiFactory {
-    (extension: IExtensionDescription, extensionInfo: IExtensionRegistries, configProvider: ExtHostConfigProvider): typeof vscode;
-}
-
-export type { IExtensionApiFactory, IExtensionRegistries };