@codingame/monaco-vscode-configuration-service-override 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,14 +18,14 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-files-service-override": "2.0.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.3",
-    "@codingame/monaco-vscode-extensions-service-override": "2.0.3",
-    "@codingame/monaco-vscode-environment-service-override": "2.0.3",
-    "@codingame/monaco-vscode-layout-service-override": "2.0.3",
-    "@codingame/monaco-vscode-host-service-override": "2.0.3",
-    "@codingame/monaco-vscode-base-service-override": "2.0.3"
+    "@codingame/monaco-vscode-files-service-override": "2.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.1.0",
+    "@codingame/monaco-vscode-extensions-service-override": "2.1.0",
+    "@codingame/monaco-vscode-environment-service-override": "2.1.0",
+    "@codingame/monaco-vscode-layout-service-override": "2.1.0",
+    "@codingame/monaco-vscode-host-service-override": "2.1.0",
+    "@codingame/monaco-vscode-base-service-override": "2.1.0"
   }
 }

package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js

@@ -879,7 +879,7 @@ class WorkspaceService extends Disposable {
             throw new Error('Invalid configuration target');
         }
         if (overrides?.overrideIdentifiers?.length && overrides.overrideIdentifiers.length > 1) {
-            const configurationModel = this.getConfigurationModel(editableConfigurationTarget, overrides.resource);
+            const configurationModel = this.getConfigurationModelForEditableConfigurationTarget(editableConfigurationTarget, overrides.resource);
             if (configurationModel) {
                 const overrideIdentifiers = overrides.overrideIdentifiers.sort();
                 const existingOverrides = configurationModel.overrides.find(override => equals$1([...override.identifiers].sort(), overrideIdentifiers));
@@ -888,8 +888,8 @@ class WorkspaceService extends Disposable {
                 }
             }
         }
-        this.configurationEditing = this.configurationEditing ?? this.instantiationService.createInstance(ConfigurationEditing, (await this.remoteAgentService.getEnvironment())?.settingsPath ?? null);
-        await this.configurationEditing.writeConfiguration(editableConfigurationTarget, { key, value }, { scopes: overrides, ...options });
+        this.configurationEditing = this.configurationEditing ?? this.createConfigurationEditingService(this.instantiationService);
+        await (await this.configurationEditing).writeConfiguration(editableConfigurationTarget, { key, value }, { scopes: overrides, ...options });
         switch (editableConfigurationTarget) {
             case 1 :
                 if (this.applicationConfiguration && this.isSettingAppliedForAllProfiles(key)) {
@@ -911,7 +911,11 @@ class WorkspaceService extends Disposable {
             }
         }
     }
-    getConfigurationModel(target, resource) {
+    async createConfigurationEditingService(instantiationService) {
+        const remoteSettingsResource = (await this.remoteAgentService.getEnvironment())?.settingsPath ?? null;
+        return instantiationService.createInstance(ConfigurationEditing, remoteSettingsResource);
+    }
+    getConfigurationModelForEditableConfigurationTarget(target, resource) {
         switch (target) {
             case 1 : return this._configuration.localUserConfiguration;
             case 2 : return this._configuration.remoteUserConfiguration;
@@ -919,6 +923,15 @@ class WorkspaceService extends Disposable {
             case 4 : return resource ? this._configuration.folderConfigurations.get(resource) : undefined;
         }
     }
+    getConfigurationModel(target, resource) {
+        switch (target) {
+            case 3 : return this._configuration.localUserConfiguration;
+            case 4 : return this._configuration.remoteUserConfiguration;
+            case 5 : return this._configuration.workspaceConfiguration;
+            case 6 : return resource ? this._configuration.folderConfigurations.get(resource) : undefined;
+            default: return undefined;
+        }
+    }
     deriveConfigurationTargets(key, value, inspect) {
         if (equals(value, inspect.value)) {
             return [];
@@ -948,21 +961,9 @@ class WorkspaceService extends Disposable {
             }
             const configurationChangeEvent = ( new ConfigurationChangeEvent(change, previous, this._configuration, this.workspace));
             configurationChangeEvent.source = target;
-            configurationChangeEvent.sourceConfig = this.getTargetConfiguration(target);
             this._onDidChangeConfiguration.fire(configurationChangeEvent);
         }
     }
-    getTargetConfiguration(target) {
-        switch (target) {
-            case 7 :
-                return this._configuration.defaults.contents;
-            case 2 :
-                return this._configuration.userConfiguration.contents;
-            case 5 :
-                return this._configuration.workspaceConfiguration.contents;
-        }
-        return {};
-    }
     toEditableConfigurationTarget(target, key) {
         if (target === 2 ) {
             if (this.remoteUserConfiguration) {