@codingame/monaco-vscode-extensions-service-override 2.2.0-next.2 → 2.2.0-next.4

package/extensions.js

@@ -36,6 +36,7 @@ import { IExtensionBisectService, ExtensionBisectService } from 'vscode/vscode/v
 import { changeUrlDomain } from './tools/url.js';
 import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from 'vscode/assets';
+import { getForcedExtensionHostKind } from 'vscode/extensions';
 import 'vscode/vscode/vs/workbench/services/themes/common/colorExtensionPoint';
 import 'vscode/vscode/vs/workbench/services/themes/common/iconExtensionPoint';
 import 'vscode/vscode/vs/nls';
@@ -188,10 +189,9 @@ let LocalBrowserExtensionHostKindPicker = class LocalBrowserExtensionHostKindPic
     constructor(allowedExtHostKinds, _logService) {
         super(_logService);
         this.allowedExtHostKinds = allowedExtHostKinds;
-        this.extensionHostKinds = new Map();
     }
     pickExtensionHostKind(extensionId, extensionKinds, isInstalledLocally, isInstalledRemotely, preference) {
-        const forcedKind = this.extensionHostKinds.get(extensionId.value);
+        const forcedKind = getForcedExtensionHostKind(extensionId.value);
         if (forcedKind != null) {
             return forcedKind;
         }
@@ -201,12 +201,6 @@ let LocalBrowserExtensionHostKindPicker = class LocalBrowserExtensionHostKindPic
         }
         return detectedKind;
     }
-    setForcedExtensionHostKind(id, kind) {
-        this.extensionHostKinds.set(id, kind);
-    }
-    removeForcedExtensionHostKind(id) {
-        this.extensionHostKinds.delete(id);
-    }
 };
 LocalBrowserExtensionHostKindPicker = __decorate([
     ( __param(1, ILogService))
@@ -218,15 +212,6 @@ let ExtensionServiceOverride = class ExtensionServiceOverride extends ExtensionS
         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) {
-        const extHostPicker = this._extensionHostKindPicker;
-        for (const extension of toRemove) {
-            extHostPicker.removeForcedExtensionHostKind(extension.identifier.id);
-        }
-        for (const extension of toAdd) {
-            if (extension.extHostKind != null) {
-                extHostPicker.setForcedExtensionHostKind(extension.identifier.id, extension.extHostKind);
-            }
-        }
         await this._handleDeltaExtensions(new DeltaExtensionsQueueItem(toAdd, toRemove));
     }
     async _scanSingleExtension(extension) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "2.2.0-next.2",
+  "version": "2.2.0-next.4",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,9 +18,15 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.4",
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.2"
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.4",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.4"
   }
 }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';