@codingame/monaco-vscode-extensions-service-override 5.3.0 → 6.0.0

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

@@ -4,7 +4,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { determineExtensionHostKinds } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
+import { determineExtensionHostKinds, ExtensionHostKind, ExtensionRunningPreference } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { RemoteRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
 
@@ -171,29 +171,29 @@ let ExtensionRunningLocationTracker = class ExtensionRunningLocationTracker {
         const localWebWorkerExtensions = [];
         for (const [extensionIdKey, extensionHostKind] of extensionHostKinds) {
             let runningLocation = null;
-            if (extensionHostKind === 1 ) {
+            if (extensionHostKind === ExtensionHostKind.LocalProcess) {
                 const extensionDescription = extensions.get(extensionIdKey);
                 if (extensionDescription) {
                     localProcessExtensions.push(extensionDescription);
                 }
             }
-            else if (extensionHostKind === 2 ) {
+            else if (extensionHostKind === ExtensionHostKind.LocalWebWorker) {
                 const extensionDescription = extensions.get(extensionIdKey);
                 if (extensionDescription) {
                     localWebWorkerExtensions.push(extensionDescription);
                 }
             }
-            else if (extensionHostKind === 3 ) {
+            else if (extensionHostKind === ExtensionHostKind.Remote) {
                 runningLocation = ( new RemoteRunningLocation());
             }
             result.set(extensionIdKey, runningLocation);
         }
-        const { affinities, maxAffinity } = this._computeAffinity(localProcessExtensions, 1 , isInitialAllocation);
+        const { affinities, maxAffinity } = this._computeAffinity(localProcessExtensions, ExtensionHostKind.LocalProcess, isInitialAllocation);
         for (const extension of localProcessExtensions) {
             const affinity = affinities.get(extension.identifier) || 0;
             result.set(extension.identifier, ( new LocalProcessRunningLocation(affinity)));
         }
-        const { affinities: localWebWorkerAffinities, maxAffinity: maxLocalWebWorkerAffinity } = this._computeAffinity(localWebWorkerExtensions, 2 , isInitialAllocation);
+        const { affinities: localWebWorkerAffinities, maxAffinity: maxLocalWebWorkerAffinity } = this._computeAffinity(localWebWorkerExtensions, ExtensionHostKind.LocalWebWorker, isInitialAllocation);
         for (const extension of localWebWorkerExtensions) {
             const affinity = localWebWorkerAffinities.get(extension.identifier) || 0;
             result.set(extension.identifier, ( new LocalWebWorkerRunningLocation(affinity)));
@@ -227,25 +227,25 @@ let ExtensionRunningLocationTracker = class ExtensionRunningLocationTracker {
         for (const extension of toAdd) {
             const extensionKind = this.readExtensionKinds(extension);
             const isRemote = extension.extensionLocation.scheme === Schemas.vscodeRemote;
-            const extensionHostKind = this._extensionHostKindPicker.pickExtensionHostKind(extension.identifier, extensionKind, !isRemote, isRemote, 0 );
+            const extensionHostKind = this._extensionHostKindPicker.pickExtensionHostKind(extension.identifier, extensionKind, !isRemote, isRemote, ExtensionRunningPreference.None);
             let runningLocation = null;
-            if (extensionHostKind === 1 ) {
+            if (extensionHostKind === ExtensionHostKind.LocalProcess) {
                 localProcessExtensions.push(extension);
             }
-            else if (extensionHostKind === 2 ) {
+            else if (extensionHostKind === ExtensionHostKind.LocalWebWorker) {
                 localWebWorkerExtensions.push(extension);
             }
-            else if (extensionHostKind === 3 ) {
+            else if (extensionHostKind === ExtensionHostKind.Remote) {
                 runningLocation = ( new RemoteRunningLocation());
             }
             this._runningLocation.set(extension.identifier, runningLocation);
         }
-        const { affinities } = this._computeAffinity(localProcessExtensions, 1 , false);
+        const { affinities } = this._computeAffinity(localProcessExtensions, ExtensionHostKind.LocalProcess, false);
         for (const extension of localProcessExtensions) {
             const affinity = affinities.get(extension.identifier) || 0;
             this._runningLocation.set(extension.identifier, ( new LocalProcessRunningLocation(affinity)));
         }
-        const { affinities: webWorkerExtensionsAffinities } = this._computeAffinity(localWebWorkerExtensions, 2 , false);
+        const { affinities: webWorkerExtensionsAffinities } = this._computeAffinity(localWebWorkerExtensions, ExtensionHostKind.LocalWebWorker, false);
         for (const extension of localWebWorkerExtensions) {
             const affinity = webWorkerExtensionsAffinities.get(extension.identifier) || 0;
             this._runningLocation.set(extension.identifier, ( new LocalWebWorkerRunningLocation(affinity)));

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

@@ -4,6 +4,7 @@ import { IExtensionStorageService } from 'vscode/vscode/vs/platform/extensionMan
 import { FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
@@ -30,7 +31,7 @@ async function migrateExtensionStorage(fromExtensionId, toExtensionId, global, i
             }
             return uriIdentityService.extUri.joinPath(environmentService.workspaceStorageHome, workspaceContextService.getWorkspace().id, extensionId);
         };
-        const storageScope = global ? 0  : 1 ;
+        const storageScope = global ? StorageScope.PROFILE : StorageScope.WORKSPACE;
         if (!storageService.getBoolean(storageMigratedKey, storageScope, false) && !(migrateLowerCaseStorageKey && storageService.getBoolean(migrateLowerCaseStorageKey, storageScope, false))) {
             logService.info(`Migrating ${global ? 'global' : 'workspace'} extension storage from ${fromExtensionId} to ${toExtensionId}...`);
             const value = extensionStorageService.getExtensionState(fromExtensionId, global);
@@ -51,7 +52,7 @@ async function migrateExtensionStorage(fromExtensionId, toExtensionId, global, i
                 }
             }
             logService.info(`Migrated ${global ? 'global' : 'workspace'} extension storage from ${fromExtensionId} to ${toExtensionId}`);
-            storageService.store(storageMigratedKey, true, storageScope, 1 );
+            storageService.store(storageMigratedKey, true, storageScope, StorageTarget.MACHINE);
         }
     });
 }

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

@@ -3,7 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
 
 const _moduleId = "vs/workbench/services/extensions/common/extensionsUtil";
-function dedupExtensions(system, user, development, logService) {
+function dedupExtensions(system, user, workspace, development, logService) {
     const result = ( (new ExtensionIdentifierMap()));
     system.forEach((systemExtension) => {
         const extension = result.get(systemExtension.identifier);
@@ -44,10 +44,23 @@ function dedupExtensions(system, user, development, logService) {
         }
         result.set(userExtension.identifier, userExtension);
     });
+    workspace.forEach(workspaceExtension => {
+        const extension = result.get(workspaceExtension.identifier);
+        if (extension) {
+            logService.warn(( localizeWithPath(
+                _moduleId,
+                1,
+                "Overwriting {0} with Workspace Extension {1}.",
+                extension.extensionLocation.fsPath,
+                workspaceExtension.extensionLocation.fsPath
+            )));
+        }
+        result.set(workspaceExtension.identifier, workspaceExtension);
+    });
     development.forEach(developedExtension => {
         logService.info(( localizeWithPath(
             _moduleId,
-            1,
+            2,
             "Loading development extension at {0}",
             developedExtension.extensionLocation.fsPath
         )));

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

@@ -6,7 +6,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() {
@@ -83,7 +83,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/remoteExtensionHost.js

@@ -14,10 +14,12 @@ import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/co
 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 +38,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;
@@ -100,13 +102,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;
@@ -156,7 +158,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),
@@ -176,13 +178,14 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
                 sessionId: this._telemetryService.sessionId,
                 machineId: this._telemetryService.machineId,
                 sqmId: this._telemetryService.sqmId,
+                devDeviceId: this._telemetryService.devDeviceId,
                 firstSessionDate: this._telemetryService.firstSessionDate,
                 msftInternal: this._telemetryService.msftInternal
             },
             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
         };
     }
@@ -197,7 +200,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
         this._terminating = true;
         if (this._protocol) {
             const socket = this._protocol.getSocket();
-            this._protocol.send(createMessageOfType(2 ));
+            this._protocol.send(createMessageOfType(MessageType.Terminate));
             this._protocol.sendDisconnect();
             this._protocol.dispose();
             socket.end();

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

@@ -1,72 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat.service';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-
-let MainThreadInlineChat = class MainThreadInlineChat {
-    constructor(extHostContext, _inlineChatService, _uriIdentService) {
-        this._inlineChatService = _inlineChatService;
-        this._uriIdentService = _uriIdentService;
-        this._registrations = ( new DisposableMap());
-        this._progresses = ( new Map());
-        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostInlineChat));
-    }
-    dispose() {
-        this._registrations.dispose();
-    }
-    async $registerInteractiveEditorProvider(handle, label, extensionId, supportsFeedback, supportsFollowups, supportIssueReporting) {
-        const unreg = this._inlineChatService.addProvider({
-            extensionId,
-            label,
-            supportIssueReporting,
-            prepareInlineChatSession: async (model, range, token) => {
-                const session = await this._proxy.$prepareSession(handle, model.uri, range, token);
-                if (!session) {
-                    return undefined;
-                }
-                return {
-                    ...session,
-                    dispose: () => {
-                        this._proxy.$releaseSession(handle, session.id);
-                    }
-                };
-            },
-            provideResponse: async (item, request, progress, token) => {
-                this._progresses.set(request.requestId, progress);
-                try {
-                    const result = await this._proxy.$provideResponse(handle, item, request, token);
-                    if (result?.type === 'bulkEdit') {
-                        result.edits = reviveWorkspaceEditDto(result.edits, this._uriIdentService);
-                    }
-                    return result;
-                }
-                finally {
-                    this._progresses.delete(request.requestId);
-                }
-            },
-            provideFollowups: !supportsFollowups ? undefined : async (session, response, token) => {
-                return this._proxy.$provideFollowups(handle, session.id, response.id, token);
-            },
-            handleInlineChatResponseFeedback: !supportsFeedback ? undefined : async (session, response, kind) => {
-                this._proxy.$handleFeedback(handle, session.id, response.id, kind);
-            }
-        });
-        this._registrations.set(handle, unreg);
-    }
-    async $handleProgressChunk(requestId, chunk) {
-        await Promise.resolve(this._progresses.get(requestId)?.report(chunk));
-    }
-    async $unregisterInteractiveEditorProvider(handle) {
-        this._registrations.deleteAndDispose(handle);
-    }
-};
-MainThreadInlineChat = __decorate([
-    extHostNamedCustomer(MainContext.MainThreadInlineChat),
-    ( __param(1, IInlineChatService)),
-    ( __param(2, IUriIdentityService))
-], MainThreadInlineChat);
-
-export { MainThreadInlineChat };