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

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

@@ -6,22 +6,23 @@ import { equals } from 'vscode/vscode/vs/base/common/objects';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Barrier, Queue, Promises, Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { Workspace as Workspace$1, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { Workspace as Workspace$1, WorkbenchState, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { ConfigurationModel, mergeChanges, ConfigurationChangeEvent } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
-import { isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { isConfigurationOverrides, isConfigurationUpdateOverrides, ConfigurationTarget, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { NullPolicyConfiguration, PolicyConfiguration } from 'vscode/vscode/vs/platform/configuration/common/configurations';
 import { Configuration } from '../common/configurationModels.js';
 import { LOCAL_MACHINE_SCOPES, LOCAL_MACHINE_PROFILE_SCOPES, PROFILE_SCOPES, APPLY_ALL_PROFILES_SETTING, FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, profileSettingsSchemaId, machineSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions, keyFromOverrideIdentifiers, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope, keyFromOverrideIdentifiers, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { isStoredWorkspaceFolder, toWorkspaceFolders, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
-import { ConfigurationEditing } from '../common/configurationEditing.js';
+import { EditableConfigurationTarget, ConfigurationEditing } from '../common/configurationEditing.js';
 import { DefaultConfiguration, UserConfiguration, RemoteUserConfiguration, WorkspaceConfiguration, ApplicationConfiguration, FolderConfiguration } from './configuration.js';
 import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { Extensions as Extensions$2, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$2, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
@@ -160,12 +161,12 @@ class WorkspaceService extends Disposable {
     }
     getWorkbenchState() {
         if (this.workspace.configuration) {
-            return 3 ;
+            return WorkbenchState.WORKSPACE;
         }
         if (this.workspace.folders.length === 1) {
-            return 2 ;
+            return WorkbenchState.FOLDER;
         }
-        return 1 ;
+        return WorkbenchState.EMPTY;
     }
     getWorkspaceFolder(resource) {
         return this.workspace.getFolder(resource);
@@ -184,7 +185,7 @@ class WorkspaceService extends Disposable {
     }
     isCurrentWorkspace(workspaceIdOrFolder) {
         switch (this.getWorkbenchState()) {
-            case 2 : {
+            case WorkbenchState.FOLDER: {
                 let folderUri = undefined;
                 if (URI.isUri(workspaceIdOrFolder)) {
                     folderUri = workspaceIdOrFolder;
@@ -194,13 +195,13 @@ class WorkspaceService extends Disposable {
                 }
                 return URI.isUri(folderUri) && this.uriIdentityService.extUri.isEqual(folderUri, this.workspace.folders[0].uri);
             }
-            case 3 :
+            case WorkbenchState.WORKSPACE:
                 return isWorkspaceIdentifier(workspaceIdOrFolder) && this.workspace.id === workspaceIdOrFolder.id;
         }
         return false;
     }
     async doUpdateFolders(foldersToAdd, foldersToRemove, index) {
-        if (this.getWorkbenchState() !== 3 ) {
+        if (this.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
             return Promise.resolve(undefined);
         }
         if (foldersToAdd.length + foldersToRemove.length === 0) {
@@ -290,7 +291,7 @@ class WorkspaceService extends Disposable {
             }
             const inspect = this.inspect(key, { resource: overrides?.resource, overrideIdentifier: overrides?.overrideIdentifiers ? overrides.overrideIdentifiers[0] : undefined });
             targets.push(...this.deriveConfigurationTargets(key, value, inspect));
-            if (equals(value, inspect.defaultValue) && targets.length === 1 && ((targets[0] === 2  || targets[0] === 3) )) {
+            if (equals(value, inspect.defaultValue) && targets.length === 1 && (targets[0] === ConfigurationTarget.USER || targets[0] === ConfigurationTarget.USER_LOCAL)) {
                 value = undefined;
             }
         }
@@ -312,22 +313,22 @@ class WorkspaceService extends Disposable {
             return;
         }
         switch (target) {
-            case 7 :
+            case ConfigurationTarget.DEFAULT:
                 this.reloadDefaultConfiguration();
                 return;
-            case 2 : {
+            case ConfigurationTarget.USER: {
                 const { local, remote } = await this.reloadUserConfiguration();
                 await this.loadConfiguration(this._configuration.applicationConfiguration, local, remote, true);
                 return;
             }
-            case 3 :
+            case ConfigurationTarget.USER_LOCAL:
                 await this.reloadLocalUserConfiguration();
                 return;
-            case 4 :
+            case ConfigurationTarget.USER_REMOTE:
                 await this.reloadRemoteUserConfiguration();
                 return;
-            case 5 :
-            case 6 :
+            case ConfigurationTarget.WORKSPACE:
+            case ConfigurationTarget.WORKSPACE_FOLDER:
                 await this.reloadWorkspaceConfiguration();
                 return;
         }
@@ -369,7 +370,7 @@ class WorkspaceService extends Disposable {
                 }
                 folderConfigurationModels.push(configurationModel);
             }
-            if (this.getWorkbenchState() === 2 ) {
+            if (this.getWorkbenchState() === WorkbenchState.FOLDER) {
                 if (folderConfigurationModels[0]) {
                     this._configuration.updateWorkspaceConfiguration(folderConfigurationModels[0]);
                 }
@@ -391,7 +392,7 @@ class WorkspaceService extends Disposable {
             this.restrictedSettings.workspaceFolder?.forEach((value) => keys.push(...value));
             keys = distinct(keys);
             if (keys.length) {
-                this.triggerConfigurationChange({ keys, overrides: [] }, { data, workspace: this.workspace }, 5 );
+                this.triggerConfigurationChange({ keys, overrides: [] }, { data, workspace: this.workspace }, ConfigurationTarget.WORKSPACE);
             }
         }
     }
@@ -399,7 +400,7 @@ class WorkspaceService extends Disposable {
         this.instantiationService = instantiationService;
     }
     isSettingAppliedForAllProfiles(key) {
-        if (this.configurationRegistry.getConfigurationProperties()[key]?.scope === 1 ) {
+        if (this.configurationRegistry.getConfigurationProperties()[key]?.scope === ConfigurationScope.APPLICATION) {
             return true;
         }
         const allProfilesSettings = this.getValue(APPLY_ALL_PROFILES_SETTING) ?? [];
@@ -570,10 +571,10 @@ class WorkspaceService extends Disposable {
     }
     async reloadWorkspaceConfiguration() {
         const workbenchState = this.getWorkbenchState();
-        if (workbenchState === 2 ) {
+        if (workbenchState === WorkbenchState.FOLDER) {
             return this.onWorkspaceFolderConfigurationChanged(this.workspace.folders[0]);
         }
-        if (workbenchState === 3 ) {
+        if (workbenchState === WorkbenchState.WORKSPACE) {
             return this.workspaceConfiguration.reload().then(() => this.onWorkspaceConfigurationChanged(false));
         }
     }
@@ -604,15 +605,15 @@ class WorkspaceService extends Disposable {
         this.initialized = true;
         if (trigger) {
             const change = this._configuration.compare(currentConfiguration);
-            this.triggerConfigurationChange(change, { data: currentConfiguration.toData(), workspace: this.workspace }, 5 );
+            this.triggerConfigurationChange(change, { data: currentConfiguration.toData(), workspace: this.workspace }, ConfigurationTarget.WORKSPACE);
         }
         this.updateRestrictedSettings();
     }
     getWorkspaceConfigurationModel(folderConfigurations) {
         switch (this.getWorkbenchState()) {
-            case 2 :
+            case WorkbenchState.FOLDER:
                 return folderConfigurations[0];
-            case 3 :
+            case WorkbenchState.WORKSPACE:
                 return this.workspaceConfiguration.getConfiguration();
             default:
                 return ConfigurationModel.createEmptyModel(this.logService);
@@ -648,7 +649,7 @@ class WorkspaceService extends Disposable {
                 this._configuration.updateLocalUserConfiguration(this.localUserConfiguration.reparse());
                 this._configuration.updateRemoteUserConfiguration(this.remoteUserConfiguration.reparse());
             }
-            if (this.getWorkbenchState() === 2 ) {
+            if (this.getWorkbenchState() === WorkbenchState.FOLDER) {
                 const folderConfiguration = this.cachedFolderConfigs.get(this.workspace.folders[0].uri);
                 if (folderConfiguration) {
                     this._configuration.updateWorkspaceConfiguration(folderConfiguration.reparse());
@@ -664,14 +665,14 @@ class WorkspaceService extends Disposable {
                     }
                 }
             }
-            this.triggerConfigurationChange(change, { data: previousData, workspace: this.workspace }, 7 );
+            this.triggerConfigurationChange(change, { data: previousData, workspace: this.workspace }, ConfigurationTarget.DEFAULT);
             this.updateRestrictedSettings();
         }
     }
     onPolicyConfigurationChanged(policyConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const change = this._configuration.compareAndUpdatePolicyConfiguration(policyConfiguration);
-        this.triggerConfigurationChange(change, previous, 7 );
+        this.triggerConfigurationChange(change, previous, ConfigurationTarget.DEFAULT);
     }
     onApplicationConfigurationChanged(applicationConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
@@ -681,7 +682,7 @@ class WorkspaceService extends Disposable {
         const configurationProperties = this.configurationRegistry.getConfigurationProperties();
         const changedKeys = [];
         for (const changedKey of change.keys) {
-            if (configurationProperties[changedKey]?.scope === 1 ) {
+            if (configurationProperties[changedKey]?.scope === ConfigurationScope.APPLICATION) {
                 changedKeys.push(changedKey);
                 if (changedKey === APPLY_ALL_PROFILES_SETTING) {
                     for (const previousAllProfileSetting of previousAllProfilesSettings) {
@@ -704,17 +705,17 @@ class WorkspaceService extends Disposable {
         if (change.keys.includes(APPLY_ALL_PROFILES_SETTING)) {
             this._configuration.updateLocalUserConfiguration(this.localUserConfiguration.reparse({ exclude: currentAllProfilesSettings }));
         }
-        this.triggerConfigurationChange(change, previous, 2 );
+        this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER);
     }
     onLocalUserConfigurationChanged(userConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const change = this._configuration.compareAndUpdateLocalUserConfiguration(userConfiguration);
-        this.triggerConfigurationChange(change, previous, 2 );
+        this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER);
     }
     onRemoteUserConfigurationChanged(userConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const change = this._configuration.compareAndUpdateRemoteUserConfiguration(userConfiguration);
-        this.triggerConfigurationChange(change, previous, 2 );
+        this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER);
     }
     async onWorkspaceConfigurationChanged(fromCache) {
         if (this.workspace && this.workspace.configuration) {
@@ -757,7 +758,7 @@ class WorkspaceService extends Disposable {
             const workspaceFolderDelta = delta(folderRestrictedSettings, previous, (a, b) => a.localeCompare(b));
             changed.push(...workspaceFolderDelta.added, ...workspaceFolderDelta.removed);
         }
-        const workspace = this.getWorkbenchState() === 3  ? this.workspaceConfiguration.getRestrictedSettings().sort((a, b) => a.localeCompare(b))
+        const workspace = this.getWorkbenchState() === WorkbenchState.WORKSPACE ? this.workspaceConfiguration.getRestrictedSettings().sort((a, b) => a.localeCompare(b))
             : this.workspace.folders[0] ? (workspaceFolderMap.get(this.workspace.folders[0].uri) || []) : [];
         const workspaceDelta = delta(workspace, this._restrictedSettings.workspace || [], (a, b) => a.localeCompare(b));
         changed.push(...workspaceDelta.added, ...workspaceDelta.removed);
@@ -781,11 +782,11 @@ class WorkspaceService extends Disposable {
             this.workspace.folders = workspaceFolders;
             const change = await this.onFoldersChanged();
             await this.handleWillChangeWorkspaceFolders(changes, fromCache);
-            this.triggerConfigurationChange(change, previous, 6 );
+            this.triggerConfigurationChange(change, previous, ConfigurationTarget.WORKSPACE_FOLDER);
             this._onDidChangeWorkspaceFolders.fire(changes);
         }
         else {
-            this.triggerConfigurationChange(change, previous, 5 );
+            this.triggerConfigurationChange(change, previous, ConfigurationTarget.WORKSPACE);
         }
         this.updateRestrictedSettings();
     }
@@ -807,12 +808,12 @@ class WorkspaceService extends Disposable {
         const [folderConfiguration] = await this.loadFolderConfigurations([folder]);
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const folderConfigurationChange = this._configuration.compareAndUpdateFolderConfiguration(folder.uri, folderConfiguration);
-        if (this.getWorkbenchState() === 2 ) {
+        if (this.getWorkbenchState() === WorkbenchState.FOLDER) {
             const workspaceConfigurationChange = this._configuration.compareAndUpdateWorkspaceConfiguration(folderConfiguration);
-            this.triggerConfigurationChange(mergeChanges(folderConfigurationChange, workspaceConfigurationChange), previous, 5 );
+            this.triggerConfigurationChange(mergeChanges(folderConfigurationChange, workspaceConfigurationChange), previous, ConfigurationTarget.WORKSPACE);
         }
         else {
-            this.triggerConfigurationChange(folderConfigurationChange, previous, 6 );
+            this.triggerConfigurationChange(folderConfigurationChange, previous, ConfigurationTarget.WORKSPACE_FOLDER);
         }
         this.updateRestrictedSettings();
     }
@@ -885,10 +886,10 @@ class WorkspaceService extends Disposable {
                 'Cannot write configuration because the configuration service is not yet ready to accept writes.'
             )));
         }
-        if (target === 7 ) {
+        if (target === ConfigurationTarget.DEFAULT) {
             throw ( (new Error('Invalid configuration target')));
         }
-        if (target === 8 ) {
+        if (target === ConfigurationTarget.MEMORY) {
             const previous = { data: this._configuration.toData(), workspace: this.workspace };
             this._configuration.updateValue(key, value, overrides);
             this.triggerConfigurationChange({ keys: overrides?.overrideIdentifiers?.length ? [keyFromOverrideIdentifiers(overrides.overrideIdentifiers), key] : [key], overrides: overrides?.overrideIdentifiers?.length ? ( (overrides.overrideIdentifiers.map(overrideIdentifier => ([overrideIdentifier, [key]])))) : [] }, previous, target);
@@ -898,7 +899,7 @@ class WorkspaceService extends Disposable {
         if (!editableConfigurationTarget) {
             throw ( (new Error('Invalid configuration target')));
         }
-        if (editableConfigurationTarget === 2  && !this.remoteUserConfiguration) {
+        if (editableConfigurationTarget === EditableConfigurationTarget.USER_REMOTE && !this.remoteUserConfiguration) {
             throw ( (new Error('Invalid configuration target')));
         }
         if (overrides?.overrideIdentifiers?.length && overrides.overrideIdentifiers.length > 1) {
@@ -914,7 +915,7 @@ class WorkspaceService extends Disposable {
         this.configurationEditing = this.configurationEditing ?? this.createConfigurationEditingService(this.instantiationService);
         await (await this.configurationEditing).writeConfiguration(editableConfigurationTarget, { key, value }, { scopes: overrides, ...options });
         switch (editableConfigurationTarget) {
-            case 1 :
+            case EditableConfigurationTarget.USER_LOCAL:
                 if (this.applicationConfiguration && this.isSettingAppliedForAllProfiles(key)) {
                     await this.reloadApplicationConfiguration();
                 }
@@ -922,11 +923,11 @@ class WorkspaceService extends Disposable {
                     await this.reloadLocalUserConfiguration();
                 }
                 return;
-            case 2 :
+            case EditableConfigurationTarget.USER_REMOTE:
                 return this.reloadRemoteUserConfiguration().then(() => undefined);
-            case 3 :
+            case EditableConfigurationTarget.WORKSPACE:
                 return this.reloadWorkspaceConfiguration();
-            case 4 : {
+            case EditableConfigurationTarget.WORKSPACE_FOLDER: {
                 const workspaceFolder = overrides && overrides.resource ? this.workspace.getFolder(overrides.resource) : null;
                 if (workspaceFolder) {
                     return this.reloadWorkspaceFolderConfiguration(workspaceFolder);
@@ -940,18 +941,18 @@ class WorkspaceService extends Disposable {
     }
     getConfigurationModelForEditableConfigurationTarget(target, resource) {
         switch (target) {
-            case 1 : return this._configuration.localUserConfiguration;
-            case 2 : return this._configuration.remoteUserConfiguration;
-            case 3 : return this._configuration.workspaceConfiguration;
-            case 4 : return resource ? this._configuration.folderConfigurations.get(resource) : undefined;
+            case EditableConfigurationTarget.USER_LOCAL: return this._configuration.localUserConfiguration;
+            case EditableConfigurationTarget.USER_REMOTE: return this._configuration.remoteUserConfiguration;
+            case EditableConfigurationTarget.WORKSPACE: return this._configuration.workspaceConfiguration;
+            case EditableConfigurationTarget.WORKSPACE_FOLDER: 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;
+            case ConfigurationTarget.USER_LOCAL: return this._configuration.localUserConfiguration;
+            case ConfigurationTarget.USER_REMOTE: return this._configuration.remoteUserConfiguration;
+            case ConfigurationTarget.WORKSPACE: return this._configuration.workspaceConfiguration;
+            case ConfigurationTarget.WORKSPACE_FOLDER: return resource ? this._configuration.folderConfigurations.get(resource) : undefined;
             default: return undefined;
         }
     }
@@ -961,25 +962,28 @@ class WorkspaceService extends Disposable {
         }
         const definedTargets = [];
         if (inspect.workspaceFolderValue !== undefined) {
-            definedTargets.push(6 );
+            definedTargets.push(ConfigurationTarget.WORKSPACE_FOLDER);
         }
         if (inspect.workspaceValue !== undefined) {
-            definedTargets.push(5 );
+            definedTargets.push(ConfigurationTarget.WORKSPACE);
         }
         if (inspect.userRemoteValue !== undefined) {
-            definedTargets.push(4 );
+            definedTargets.push(ConfigurationTarget.USER_REMOTE);
         }
         if (inspect.userLocalValue !== undefined) {
-            definedTargets.push(3 );
+            definedTargets.push(ConfigurationTarget.USER_LOCAL);
+        }
+        if (inspect.applicationValue !== undefined) {
+            definedTargets.push(ConfigurationTarget.APPLICATION);
         }
         if (value === undefined) {
             return definedTargets;
         }
-        return [definedTargets[0] || 2 ];
+        return [definedTargets[0] || ConfigurationTarget.USER];
     }
     triggerConfigurationChange(change, previous, target) {
         if (change.keys.length) {
-            if (target !== 7 ) {
+            if (target !== ConfigurationTarget.DEFAULT) {
                 this.logService.debug(`Configuration keys changed in ${ConfigurationTargetToString(target)} target`, ...change.keys);
             }
             const configurationChangeEvent = ( (new ConfigurationChangeEvent(change, previous, this._configuration, this.workspace, this.logService)));
@@ -988,29 +992,32 @@ class WorkspaceService extends Disposable {
         }
     }
     toEditableConfigurationTarget(target, key) {
-        if (target === 2 ) {
+        if (target === ConfigurationTarget.APPLICATION) {
+            return EditableConfigurationTarget.USER_LOCAL;
+        }
+        if (target === ConfigurationTarget.USER) {
             if (this.remoteUserConfiguration) {
                 const scope = this.configurationRegistry.getConfigurationProperties()[key]?.scope;
-                if (scope === 2  || scope === 6 ) {
-                    return 2 ;
+                if (scope === ConfigurationScope.MACHINE || scope === ConfigurationScope.MACHINE_OVERRIDABLE) {
+                    return EditableConfigurationTarget.USER_REMOTE;
                 }
                 if (this.inspect(key).userRemoteValue !== undefined) {
-                    return 2 ;
+                    return EditableConfigurationTarget.USER_REMOTE;
                 }
             }
-            return 1 ;
+            return EditableConfigurationTarget.USER_LOCAL;
         }
-        if (target === 3 ) {
-            return 1 ;
+        if (target === ConfigurationTarget.USER_LOCAL) {
+            return EditableConfigurationTarget.USER_LOCAL;
         }
-        if (target === 4 ) {
-            return 2 ;
+        if (target === ConfigurationTarget.USER_REMOTE) {
+            return EditableConfigurationTarget.USER_REMOTE;
         }
-        if (target === 5 ) {
-            return 3 ;
+        if (target === ConfigurationTarget.WORKSPACE) {
+            return EditableConfigurationTarget.WORKSPACE;
         }
-        if (target === 6 ) {
-            return 4 ;
+        if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
+            return EditableConfigurationTarget.WORKSPACE_FOLDER;
         }
         return null;
     }
@@ -1025,7 +1032,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
             this.registerConfigurationSchemas();
             const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
             const delayer = this._register(( (new Delayer(50))));
-            this._register(Event.any(configurationRegistry.onDidUpdateConfiguration, configurationRegistry.onDidSchemaChange, workspaceTrustManagementService.onDidChangeTrust)(() => delayer.trigger(() => this.registerConfigurationSchemas(), lifecycleService.phase === 4  ? undefined : 2500 )));
+            this._register(Event.any(configurationRegistry.onDidUpdateConfiguration, configurationRegistry.onDidSchemaChange, workspaceTrustManagementService.onDidChangeTrust)(() => delayer.trigger(() => this.registerConfigurationSchemas(), lifecycleService.phase === LifecyclePhase.Eventually ? undefined : 2500 )));
         });
     }
     registerConfigurationSchemas() {
@@ -1079,7 +1086,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
             allowTrailingCommas: true,
             allowComments: true
         };
-        const folderSettingsSchema = 3  === this.workspaceContextService.getWorkbenchState() ?
+        const folderSettingsSchema = WorkbenchState.WORKSPACE === this.workspaceContextService.getWorkbenchState() ?
             {
                 properties: Object.assign({}, this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties), this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)),
                 patternProperties: allSettings.patternProperties,
@@ -1144,7 +1151,7 @@ let ResetConfigurationDefaultsOverridesCache = class ResetConfigurationDefaultsO
     constructor(configurationService, extensionService) {
         super();
         if (configurationService.hasCachedConfigurationDefaultsOverrides()) {
-            extensionService.whenInstalledExtensionsRegistered().then(() => configurationService.reloadConfiguration(7 ));
+            extensionService.whenInstalledExtensionsRegistered().then(() => configurationService.reloadConfiguration(ConfigurationTarget.DEFAULT));
         }
     }
 };
@@ -1191,9 +1198,9 @@ UpdateExperimentalSettingsDefaults = ( (__decorate([
     ( (__param(0, IWorkbenchAssignmentService)))
 ], UpdateExperimentalSettingsDefaults)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions$2.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, 3 );
-workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, 4 );
-registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, 2 );
+workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, LifecyclePhase.Restored);
+workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, LifecyclePhase.Eventually);
+registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, WorkbenchPhase.BlockRestore);
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
@@ -1202,7 +1209,7 @@ configurationRegistry.registerConfiguration({
             'type': 'array',
             description: ( localizeWithPath(_moduleId, 2, "Configure settings to be applied for all profiles.")),
             'default': [],
-            'scope': 1 ,
+            'scope': ConfigurationScope.APPLICATION,
             additionalProperties: true,
             uniqueItems: true,
         }

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

@@ -1,3 +1,4 @@
+import { FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Queue } from 'vscode/vscode/vs/base/common/async';
@@ -60,7 +61,7 @@ class CachedConfiguration {
             await this.queue.queue(() => this.fileService.del(this.cachedConfigurationFolderResource, { recursive: true, useTrash: false }));
         }
         catch (error) {
-            if (error.fileOperationResult !== 1 ) {
+            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                 throw error;
             }
         }