@codingame/monaco-vscode-configuration-service-override 4.5.2 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "4.5.2",
+  "version": "5.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2",
-    "@codingame/monaco-vscode-files-service-override": "4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.1",
+    "@codingame/monaco-vscode-files-service-override": "5.0.1"
   }
 }

package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js

@@ -28,26 +28,8 @@ let TextResourceConfigurationService = class TextResourceConfigurationService ex
         if (configurationTarget === undefined) {
             configurationTarget = this.deriveConfigurationTarget(configurationValue, language);
         }
-        switch (configurationTarget) {
-            case 8 :
-                return this._updateValue(key, value, configurationTarget, configurationValue.memory?.override, resource, language);
-            case 6 :
-                return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolder?.override, resource, language);
-            case 5 :
-                return this._updateValue(key, value, configurationTarget, configurationValue.workspace?.override, resource, language);
-            case 4 :
-                return this._updateValue(key, value, configurationTarget, configurationValue.userRemote?.override, resource, language);
-            default:
-                return this._updateValue(key, value, configurationTarget, configurationValue.userLocal?.override, resource, language);
-        }
-    }
-    _updateValue(key, value, configurationTarget, overriddenValue, resource, language) {
-        if (language && overriddenValue !== undefined) {
-            return this.configurationService.updateValue(key, value, { resource, overrideIdentifier: language }, configurationTarget);
-        }
-        else {
-            return this.configurationService.updateValue(key, value, { resource }, configurationTarget);
-        }
+        const overrideIdentifier = language && configurationValue.overrideIdentifiers?.includes(language) ? language : undefined;
+        return this.configurationService.updateValue(key, value, { resource, overrideIdentifier }, configurationTarget);
     }
     deriveConfigurationTarget(configurationValue, language) {
         if (language) {

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

@@ -16,8 +16,8 @@ import { DefaultConfiguration as DefaultConfiguration$1 } from 'vscode/vscode/vs
 
 class DefaultConfiguration extends DefaultConfiguration$1 {
     static { this.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY = 'DefaultOverridesCacheExists'; }
-    constructor(configurationCache, environmentService) {
-        super();
+    constructor(configurationCache, environmentService, logService) {
+        super(logService);
         this.configurationCache = configurationCache;
         this.configurationRegistry = ( Registry.as(Extensions.Configuration));
         this.cachedConfigurationDefaultsOverrides = {};
@@ -91,8 +91,8 @@ class DefaultConfiguration extends DefaultConfiguration$1 {
     }
 }
 class ApplicationConfiguration extends UserSettings {
-    constructor(userDataProfilesService, fileService, uriIdentityService) {
-        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [1 ] }, uriIdentityService.extUri, fileService);
+    constructor(userDataProfilesService, fileService, uriIdentityService, logService) {
+        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [1 ] }, uriIdentityService.extUri, fileService, logService);
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
         this._register(this.onDidChange(() => this.reloadConfigurationScheduler.schedule()));
@@ -131,7 +131,8 @@ class UserConfiguration extends Disposable {
             settingsResource,
             this.configurationParseOptions,
             uriIdentityService.extUri,
-            this.fileService
+            this.fileService,
+            logService
         ));
         this.userConfigurationChangeDisposable.value = this.userConfiguration.value.onDidChange(() => this.reloadConfigurationScheduler.schedule());
         this.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(
@@ -188,10 +189,10 @@ class FileServiceBasedConfiguration extends Disposable {
             resource => combinedDisposable(this.fileService.watch(uriIdentityService.extUri.dirname(resource)),
             this.fileService.watch(resource))
         ))));
-        this._folderSettingsModelParser = ( new ConfigurationModelParser(name));
+        this._folderSettingsModelParser = ( new ConfigurationModelParser(name, logService));
         this._folderSettingsParseOptions = configurationParseOptions;
         this._standAloneConfigurations = [];
-        this._cache = ( new ConfigurationModel());
+        this._cache = ConfigurationModel.createEmptyModel(this.logService);
         this._register(Event.debounce(Event.any(Event.filter(this.fileService.onDidFilesChange, e => this.handleFileChangesEvent(e)), Event.filter(this.fileService.onDidRunOperation, e => this.handleFileOperationEvent(e))), () => undefined, 100)(() => this._onDidChange.fire()));
     }
     async resolveContents(donotResolveSettings) {
@@ -229,7 +230,7 @@ class FileServiceBasedConfiguration extends Disposable {
         for (let index = 0; index < standAloneConfigurationContents.length; index++) {
             const contents = standAloneConfigurationContents[index][1];
             if (contents !== undefined) {
-                const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(( this.standAloneConfigurationResources[index][1].toString()), this.standAloneConfigurationResources[index][0]));
+                const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(( this.standAloneConfigurationResources[index][1].toString()), this.standAloneConfigurationResources[index][0], this.logService));
                 standAloneConfigurationModelParser.parse(contents);
                 this._standAloneConfigurations.push(standAloneConfigurationModelParser.configurationModel);
             }
@@ -279,7 +280,7 @@ class FileServiceBasedConfiguration extends Disposable {
     }
 }
 class RemoteUserConfiguration extends Disposable {
-    constructor(remoteAuthority, configurationCache, fileService, uriIdentityService, remoteAgentService) {
+    constructor(remoteAuthority, configurationCache, fileService, uriIdentityService, remoteAgentService, logService) {
         super();
         this._userConfigurationInitializationPromise = null;
         this._onDidChangeConfiguration = this._register(( new Emitter()));
@@ -287,14 +288,20 @@ class RemoteUserConfiguration extends Disposable {
         this._onDidInitialize = this._register(( new Emitter()));
         this.onDidInitialize = this._onDidInitialize.event;
         this._fileService = fileService;
-        this._userConfiguration = this._cachedConfiguration = ( new CachedRemoteUserConfiguration(remoteAuthority, configurationCache, { scopes: REMOTE_MACHINE_SCOPES }));
+        this._userConfiguration = this._cachedConfiguration = ( new CachedRemoteUserConfiguration(
+            remoteAuthority,
+            configurationCache,
+            { scopes: REMOTE_MACHINE_SCOPES },
+            logService
+        ));
         remoteAgentService.getEnvironment().then(async (environment) => {
             if (environment) {
                 const userConfiguration = this._register(( new FileServiceBasedRemoteUserConfiguration(
                     environment.settingsPath,
                     { scopes: REMOTE_MACHINE_SCOPES },
                     this._fileService,
-                    uriIdentityService
+                    uriIdentityService,
+                    logService
                 )));
                 this._register(userConfiguration.onDidChangeConfiguration(configurationModel => this.onDidUserConfigurationChange(configurationModel)));
                 this._userConfigurationInitializationPromise = userConfiguration.initialize();
@@ -346,16 +353,17 @@ class RemoteUserConfiguration extends Disposable {
     }
 }
 class FileServiceBasedRemoteUserConfiguration extends Disposable {
-    constructor(configurationResource, configurationParseOptions, fileService, uriIdentityService) {
+    constructor(configurationResource, configurationParseOptions, fileService, uriIdentityService, logService) {
         super();
         this.configurationResource = configurationResource;
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
+        this.logService = logService;
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
         this.fileWatcherDisposable = this._register(( new MutableDisposable()));
         this.directoryWatcherDisposable = this._register(( new MutableDisposable()));
-        this.parser = ( new ConfigurationModelParser(( this.configurationResource.toString())));
+        this.parser = ( new ConfigurationModelParser(( this.configurationResource.toString()), logService));
         this.parseOptions = configurationParseOptions;
         this._register(fileService.onDidFilesChange(e => this.handleFileChangesEvent(e)));
         this._register(fileService.onDidRunOperation(e => this.handleFileOperationEvent(e)));
@@ -397,7 +405,7 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
             return this.parser.configurationModel;
         }
         catch (e) {
-            return ( new ConfigurationModel());
+            return ConfigurationModel.createEmptyModel(this.logService);
         }
     }
     reparse(configurationParseOptions) {
@@ -440,15 +448,15 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
     }
 }
 class CachedRemoteUserConfiguration extends Disposable {
-    constructor(remoteAuthority, configurationCache, configurationParseOptions) {
+    constructor(remoteAuthority, configurationCache, configurationParseOptions, logService) {
         super();
         this.configurationCache = configurationCache;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this.key = { type: 'user', key: remoteAuthority };
-        this.parser = ( new ConfigurationModelParser('CachedRemoteUserConfiguration'));
+        this.parser = ( new ConfigurationModelParser('CachedRemoteUserConfiguration', logService));
         this.parseOptions = configurationParseOptions;
-        this.configurationModel = ( new ConfigurationModel());
+        this.configurationModel = ConfigurationModel.createEmptyModel(logService);
     }
     getConfigurationModel() {
         return this.configurationModel;
@@ -501,7 +509,7 @@ class WorkspaceConfiguration extends Disposable {
         this.onDidUpdateConfiguration = this._onDidUpdateConfiguration.event;
         this._initialized = false;
         this.fileService = fileService;
-        this._workspaceConfiguration = this._cachedConfiguration = ( new CachedWorkspaceConfiguration(configurationCache));
+        this._workspaceConfiguration = this._cachedConfiguration = ( new CachedWorkspaceConfiguration(configurationCache, logService));
     }
     async initialize(workspaceIdentifier, workspaceTrusted) {
         this._workspaceIdentifier = workspaceIdentifier;
@@ -589,8 +597,8 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
         this._workspaceIdentifier = null;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(''));
-        this.workspaceSettings = ( new ConfigurationModel());
+        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser('', logService));
+        this.workspaceSettings = ConfigurationModel.createEmptyModel(logService);
         this._register(Event.any(Event.filter(this.fileService.onDidFilesChange, e => !!this._workspaceIdentifier && e.contains(this._workspaceIdentifier.configPath)), Event.filter(this.fileService.onDidRunOperation, e => !!this._workspaceIdentifier && (e.isOperation(0 ) || e.isOperation(3 ) || e.isOperation(1 ) || e.isOperation(4 )) && uriIdentityService.extUri.isEqual(e.resource, this._workspaceIdentifier.configPath)))(() => this.reloadConfigurationScheduler.schedule()));
         this.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(() => this._onDidChange.fire(), 50)));
         this.workspaceConfigWatcher = this._register(this.watchWorkspaceConfigurationFile());
@@ -605,7 +613,7 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
     async load(workspaceIdentifier, configurationParseOptions) {
         if (!this._workspaceIdentifier || this._workspaceIdentifier.id !== workspaceIdentifier.id) {
             this._workspaceIdentifier = workspaceIdentifier;
-            this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(this._workspaceIdentifier.id));
+            this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(this._workspaceIdentifier.id, this.logService));
             dispose(this.workspaceConfigWatcher);
             this.workspaceConfigWatcher = this._register(this.watchWorkspaceConfigurationFile());
         }
@@ -650,11 +658,12 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
     }
 }
 class CachedWorkspaceConfiguration {
-    constructor(configurationCache) {
+    constructor(configurationCache, logService) {
         this.configurationCache = configurationCache;
+        this.logService = logService;
         this.onDidChange = Event.None;
-        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(''));
-        this.workspaceSettings = ( new ConfigurationModel());
+        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser('', logService));
+        this.workspaceSettings = ConfigurationModel.createEmptyModel(logService);
     }
     async load(workspaceIdentifier, configurationParseOptions) {
         try {
@@ -662,7 +671,7 @@ class CachedWorkspaceConfiguration {
             const contents = await this.configurationCache.read(key);
             const parsed = JSON.parse(contents);
             if (parsed.content) {
-                this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(key.key));
+                this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(key.key, this.logService));
                 this.workspaceConfigurationModelParser.parse(parsed.content, configurationParseOptions);
                 this.consolidate();
             }
@@ -717,14 +726,15 @@ class CachedWorkspaceConfiguration {
     }
 }
 class CachedFolderConfiguration {
-    constructor(folder, configFolderRelativePath, configurationParseOptions, configurationCache) {
+    constructor(folder, configFolderRelativePath, configurationParseOptions, configurationCache, logService) {
         this.configurationCache = configurationCache;
+        this.logService = logService;
         this.onDidChange = Event.None;
         this.key = { type: 'folder', key: ( hash(( joinPath(folder, configFolderRelativePath).toString())).toString(16)) };
-        this._folderSettingsModelParser = ( new ConfigurationModelParser('CachedFolderConfiguration'));
+        this._folderSettingsModelParser = ( new ConfigurationModelParser('CachedFolderConfiguration', logService));
         this._folderSettingsParseOptions = configurationParseOptions;
         this._standAloneConfigurations = [];
-        this.configurationModel = ( new ConfigurationModel());
+        this.configurationModel = ConfigurationModel.createEmptyModel(logService);
     }
     async loadConfiguration() {
         try {
@@ -736,7 +746,7 @@ class CachedFolderConfiguration {
                         this._folderSettingsModelParser.parse(configurationContents[key], this._folderSettingsParseOptions);
                     }
                     else {
-                        const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(key, key));
+                        const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(key, key, this.logService));
                         standAloneConfigurationModelParser.parse(configurationContents[key]);
                         this._standAloneConfigurations.push(standAloneConfigurationModelParser.configurationModel);
                     }
@@ -796,7 +806,8 @@ class FolderConfiguration extends Disposable {
             workspaceFolder.uri,
             configFolderRelativePath,
             { scopes: this.scopes, skipRestricted: this.isUntrusted() },
-            configurationCache
+            configurationCache,
+            logService
         ));
         if (useCache && this.configurationCache.needsCaching(workspaceFolder.uri)) {
             this.folderConfiguration = this.cachedFolderConfiguration;

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

@@ -78,20 +78,21 @@ class WorkspaceService extends Disposable {
         this.configurationRegistry = ( (Registry.as(Extensions.Configuration)));
         this.initRemoteUserConfigurationBarrier = ( (new Barrier()));
         this.completeWorkspaceBarrier = ( (new Barrier()));
-        this.defaultConfiguration = this._register(( (new DefaultConfiguration(configurationCache, environmentService))));
+        this.defaultConfiguration = this._register(( (new DefaultConfiguration(configurationCache, environmentService, logService))));
         this.policyConfiguration = policyService instanceof NullPolicyService ? ( (new NullPolicyConfiguration())) : this._register(( (new PolicyConfiguration(this.defaultConfiguration, policyService, logService))));
         this.configurationCache = configurationCache;
         this._configuration = ( (new Configuration(
             this.defaultConfiguration.configurationModel,
             this.policyConfiguration.configurationModel,
-             (new ConfigurationModel()),
-             (new ConfigurationModel()),
-             (new ConfigurationModel()),
-             (new ConfigurationModel()),
+            ConfigurationModel.createEmptyModel(logService),
+            ConfigurationModel.createEmptyModel(logService),
+            ConfigurationModel.createEmptyModel(logService),
+            ConfigurationModel.createEmptyModel(logService),
              (new ResourceMap()),
-             (new ConfigurationModel()),
+            ConfigurationModel.createEmptyModel(logService),
              (new ResourceMap()),
-            this.workspace
+            this.workspace,
+            logService
         )));
         this.applicationConfigurationDisposables = this._register(( (new DisposableStore())));
         this.createApplicationConfiguration();
@@ -111,7 +112,8 @@ class WorkspaceService extends Disposable {
                 configurationCache,
                 fileService,
                 uriIdentityService,
-                remoteAgentService
+                remoteAgentService,
+                logService
             ))));
             this._register(remoteUserConfiguration.onDidInitialize(remoteUserConfigurationModel => {
                 this._register(remoteUserConfiguration.onDidChangeConfiguration(remoteUserConfigurationModel => this.onRemoteUserConfigurationChanged(remoteUserConfigurationModel)));
@@ -140,7 +142,12 @@ class WorkspaceService extends Disposable {
             this.applicationConfiguration = null;
         }
         else {
-            this.applicationConfiguration = this.applicationConfigurationDisposables.add(this._register(( (new ApplicationConfiguration(this.userDataProfilesService, this.fileService, this.uriIdentityService)))));
+            this.applicationConfiguration = this.applicationConfigurationDisposables.add(this._register(( (new ApplicationConfiguration(
+                this.userDataProfilesService,
+                this.fileService,
+                this.uriIdentityService,
+                this.logService
+            )))));
             this.applicationConfigurationDisposables.add(this.applicationConfiguration.onDidChangeConfiguration(configurationModel => this.onApplicationConfigurationChanged(configurationModel)));
         }
     }
@@ -507,10 +514,10 @@ class WorkspaceService extends Disposable {
     async initializeConfiguration(trigger) {
         await this.defaultConfiguration.initialize();
         const initPolicyConfigurationPromise = this.policyConfiguration.initialize();
-        const initApplicationConfigurationPromise = this.applicationConfiguration ? this.applicationConfiguration.initialize() : Promise.resolve(( (new ConfigurationModel())));
+        const initApplicationConfigurationPromise = this.applicationConfiguration ? this.applicationConfiguration.initialize() : Promise.resolve(ConfigurationModel.createEmptyModel(this.logService));
         const initUserConfiguration = async () => {
             mark('code/willInitUserConfiguration');
-            const result = await Promise.all([this.localUserConfiguration.initialize(), this.remoteUserConfiguration ? this.remoteUserConfiguration.initialize() : Promise.resolve(( (new ConfigurationModel())))]);
+            const result = await Promise.all([this.localUserConfiguration.initialize(), this.remoteUserConfiguration ? this.remoteUserConfiguration.initialize() : Promise.resolve(ConfigurationModel.createEmptyModel(this.logService))]);
             if (this.applicationConfiguration) {
                 const applicationConfigurationModel = await initApplicationConfigurationPromise;
                 result[0] = this.localUserConfiguration.reparse({ exclude: applicationConfigurationModel.getValue(APPLY_ALL_PROFILES_SETTING) });
@@ -532,9 +539,7 @@ class WorkspaceService extends Disposable {
     }
     async reloadApplicationConfiguration(donotTrigger) {
         if (!this.applicationConfiguration) {
-            return (
-                 (new ConfigurationModel())
-            );
+            return ConfigurationModel.createEmptyModel(this.logService);
         }
         const model = await this.applicationConfiguration.loadConfiguration();
         if (!donotTrigger) {
@@ -561,9 +566,7 @@ class WorkspaceService extends Disposable {
             }
             return model;
         }
-        return (
-             (new ConfigurationModel())
-        );
+        return ConfigurationModel.createEmptyModel(this.logService);
     }
     async reloadWorkspaceConfiguration() {
         const workbenchState = this.getWorkbenchState();
@@ -593,9 +596,10 @@ class WorkspaceService extends Disposable {
             remoteUserConfigurationModel,
             workspaceConfiguration,
             folderConfigurationModels,
-             (new ConfigurationModel()),
+            ConfigurationModel.createEmptyModel(this.logService),
              (new ResourceMap()),
-            this.workspace
+            this.workspace,
+            this.logService
         )));
         this.initialized = true;
         if (trigger) {
@@ -611,9 +615,7 @@ class WorkspaceService extends Disposable {
             case 3 :
                 return this.workspaceConfiguration.getConfiguration();
             default:
-                return (
-                     (new ConfigurationModel())
-                );
+                return ConfigurationModel.createEmptyModel(this.logService);
         }
     }
     onUserDataProfileChanged(e) {
@@ -980,7 +982,7 @@ class WorkspaceService extends Disposable {
             if (target !== 7 ) {
                 this.logService.debug(`Configuration keys changed in ${ConfigurationTargetToString(target)} target`, ...change.keys);
             }
-            const configurationChangeEvent = ( (new ConfigurationChangeEvent(change, previous, this._configuration, this.workspace)));
+            const configurationChangeEvent = ( (new ConfigurationChangeEvent(change, previous, this._configuration, this.workspace, this.logService)));
             configurationChangeEvent.source = target;
             this._onDidChangeConfiguration.fire(configurationChangeEvent);
         }

package/vscode/src/vs/workbench/services/configuration/common/configurationModels.js

@@ -5,13 +5,13 @@ import { isBoolean } from 'vscode/vscode/vs/base/common/types';
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 
 class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
-    constructor(name) {
-        super(name);
+    constructor(name, logService) {
+        super(name, logService);
         this._folders = [];
         this._transient = false;
-        this._settingsModelParser = ( new ConfigurationModelParser(name));
-        this._launchModel = ( new ConfigurationModel());
-        this._tasksModel = ( new ConfigurationModel());
+        this._settingsModelParser = ( new ConfigurationModelParser(name, logService));
+        this._launchModel = ConfigurationModel.createEmptyModel(logService);
+        this._tasksModel = ConfigurationModel.createEmptyModel(logService);
     }
     get folders() {
         return this._folders;
@@ -49,14 +49,14 @@ class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
             const scopedContents = Object.create(null);
             scopedContents[key] = contents;
             const keys = ( ( Object.keys(data)).map(k => `${key}.${k}`));
-            return ( new ConfigurationModel(scopedContents, keys, []));
+            return ( new ConfigurationModel(scopedContents, keys, [], undefined, this.logService));
         }
-        return ( new ConfigurationModel());
+        return ConfigurationModel.createEmptyModel(this.logService);
     }
 }
 class StandaloneConfigurationModelParser extends ConfigurationModelParser {
-    constructor(name, scope) {
-        super(name);
+    constructor(name, scope, logService) {
+        super(name, logService);
         this.scope = scope;
     }
     doParseRaw(raw, configurationParseOptions) {
@@ -68,8 +68,8 @@ class StandaloneConfigurationModelParser extends ConfigurationModelParser {
     }
 }
 class Configuration extends Configuration$1 {
-    constructor(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, _workspace) {
-        super(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource);
+    constructor(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, _workspace, logService) {
+        super(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, logService);
         this._workspace = _workspace;
     }
     getValue(key, overrides = {}) {