@codingame/monaco-vscode-configuration-service-override 9.0.3 → 10.0.1

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

@@ -2,12 +2,11 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable, MutableDisposable, combinedDisposable, toDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
-import { FileOperationResult, FileChangeType, FileOperation, whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
+import { whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
 import { UserSettings, ConfigurationModelParser, ConfigurationModel } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
 import { StandaloneConfigurationModelParser, WorkspaceConfigurationModelParser } from '../common/configurationModels.js';
 import { APPLY_ALL_PROFILES_SETTING, TASKS_CONFIGURATION_KEY, REMOTE_MACHINE_SCOPES, WORKSPACE_SCOPES, FOLDER_SETTINGS_NAME, FOLDER_SCOPES, LAUNCH_CONFIGURATION_KEY } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
-import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { Extensions, OVERRIDE_PROPERTY_REGEX, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, OVERRIDE_PROPERTY_REGEX } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { equals } from 'vscode/vscode/vs/base/common/objects';
 import { hash } from 'vscode/vscode/vs/base/common/hash';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
@@ -93,7 +92,7 @@ class DefaultConfiguration extends DefaultConfiguration$1 {
 }
 class ApplicationConfiguration extends UserSettings {
     constructor(userDataProfilesService, fileService, uriIdentityService, logService) {
-        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [ConfigurationScope.APPLICATION] }, uriIdentityService.extUri, fileService, 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()));
@@ -205,8 +204,8 @@ class FileServiceBasedConfiguration extends Disposable {
                 }
                 catch (error) {
                     this.logService.trace(`Error while resolving configuration file '${( resource.toString())}': ${getErrorMessage(error)}`);
-                    if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND
-                        && error.fileOperationResult !== FileOperationResult.FILE_NOT_DIRECTORY) {
+                    if (error.fileOperationResult !== 1
+                        && error.fileOperationResult !== 9 ) {
                         this.logService.error(error);
                     }
                 }
@@ -259,20 +258,20 @@ class FileServiceBasedConfiguration extends Disposable {
             return true;
         }
         if (( this.allResources.some(
-            resource => event.contains(this.uriIdentityService.extUri.dirname(resource), FileChangeType.DELETED)
+            resource => event.contains(this.uriIdentityService.extUri.dirname(resource), 2 )
         ))) {
             return true;
         }
         return false;
     }
     handleFileOperationEvent(event) {
-        if ((event.isOperation(FileOperation.CREATE) || event.isOperation(FileOperation.COPY) || event.isOperation(FileOperation.DELETE) || event.isOperation(FileOperation.WRITE))
+        if ((event.isOperation(0 ) || event.isOperation(3 ) || event.isOperation(1 ) || event.isOperation(4 ))
             && ( this.allResources.some(
             resource => this.uriIdentityService.extUri.isEqual(event.resource, resource)
         ))) {
             return true;
         }
-        if (event.isOperation(FileOperation.DELETE) && ( this.allResources.some(
+        if (event.isOperation(1 ) && ( this.allResources.some(
             resource => this.uriIdentityService.extUri.isEqual(event.resource, this.uriIdentityService.extUri.dirname(resource))
         ))) {
             return true;
@@ -345,7 +344,7 @@ class RemoteUserConfiguration extends Disposable {
                 content = await this._userConfiguration.resolveContent();
             }
             catch (error) {
-                if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
+                if (error.fileOperationResult !== 1 ) {
                     return;
                 }
             }
@@ -418,21 +417,24 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
         return this.parser.restrictedConfigurations;
     }
     handleFileChangesEvent(event) {
-        let affectedByChanges = event.contains(this.configurationResource, FileChangeType.UPDATED);
-        if (event.contains(this.configurationResource, FileChangeType.ADDED)) {
+        let affectedByChanges = false;
+        if (event.contains(this.configurationResource, 1 )) {
             affectedByChanges = true;
             this.onResourceExists(true);
         }
-        else if (event.contains(this.configurationResource, FileChangeType.DELETED)) {
+        else if (event.contains(this.configurationResource, 2 )) {
             affectedByChanges = true;
             this.onResourceExists(false);
         }
+        else if (event.contains(this.configurationResource, 0 )) {
+            affectedByChanges = true;
+        }
         if (affectedByChanges) {
             this.reloadConfigurationScheduler.schedule();
         }
     }
     handleFileOperationEvent(event) {
-        if ((event.isOperation(FileOperation.CREATE) || event.isOperation(FileOperation.COPY) || event.isOperation(FileOperation.DELETE) || event.isOperation(FileOperation.WRITE))
+        if ((event.isOperation(0 ) || event.isOperation(3 ) || event.isOperation(1 ) || event.isOperation(4 ))
             && this.uriIdentityService.extUri.isEqual(event.resource, this.configurationResource)) {
             this.reloadConfigurationScheduler.schedule();
         }
@@ -600,7 +602,7 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
         this.onDidChange = this._onDidChange.event;
         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(FileOperation.CREATE) || e.isOperation(FileOperation.COPY) || e.isOperation(FileOperation.DELETE) || e.isOperation(FileOperation.WRITE)) && uriIdentityService.extUri.isEqual(e.resource, this._workspaceIdentifier.configPath)))(() => this.reloadConfigurationScheduler.schedule()));
+        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());
     }
@@ -801,7 +803,7 @@ class FolderConfiguration extends Disposable {
         this.configurationCache = configurationCache;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this.scopes = WorkbenchState.WORKSPACE === this.workbenchState ? FOLDER_SCOPES : WORKSPACE_SCOPES;
+        this.scopes = 3  === this.workbenchState ? FOLDER_SCOPES : WORKSPACE_SCOPES;
         this.configurationFolder = uriIdentityService.extUri.joinPath(workspaceFolder.uri, configFolderRelativePath);
         this.cachedFolderConfiguration = ( new CachedFolderConfiguration(
             workspaceFolder.uri,

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

@@ -6,23 +6,22 @@ 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, WorkbenchState, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceFolder, toWorkspaceFolder } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { Workspace as Workspace$1, 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, ConfigurationTarget, ConfigurationTargetToString } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { isConfigurationOverrides, isConfigurationUpdateOverrides, 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, ConfigurationScope, keyFromOverrideIdentifiers, allSettings, applicationSettings, windowSettings, resourceSettings, machineSettings, machineOverridableSettings, OVERRIDE_PROPERTY_PATTERN, resourceLanguageSettingsSchemaId, configurationDefaultsSchemaId } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, 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 { EditableConfigurationTarget, ConfigurationEditing } from '../common/configurationEditing.js';
+import { 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, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { Extensions as Extensions$2, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 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 +159,12 @@ class WorkspaceService extends Disposable {
     }
     getWorkbenchState() {
         if (this.workspace.configuration) {
-            return WorkbenchState.WORKSPACE;
+            return 3 ;
         }
         if (this.workspace.folders.length === 1) {
-            return WorkbenchState.FOLDER;
+            return 2 ;
         }
-        return WorkbenchState.EMPTY;
+        return 1 ;
     }
     getWorkspaceFolder(resource) {
         return this.workspace.getFolder(resource);
@@ -184,7 +183,7 @@ class WorkspaceService extends Disposable {
     }
     isCurrentWorkspace(workspaceIdOrFolder) {
         switch (this.getWorkbenchState()) {
-            case WorkbenchState.FOLDER: {
+            case 2 : {
                 let folderUri = undefined;
                 if (URI.isUri(workspaceIdOrFolder)) {
                     folderUri = workspaceIdOrFolder;
@@ -194,13 +193,13 @@ class WorkspaceService extends Disposable {
                 }
                 return URI.isUri(folderUri) && this.uriIdentityService.extUri.isEqual(folderUri, this.workspace.folders[0].uri);
             }
-            case WorkbenchState.WORKSPACE:
+            case 3 :
                 return isWorkspaceIdentifier(workspaceIdOrFolder) && this.workspace.id === workspaceIdOrFolder.id;
         }
         return false;
     }
     async doUpdateFolders(foldersToAdd, foldersToRemove, index) {
-        if (this.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
+        if (this.getWorkbenchState() !== 3 ) {
             return Promise.resolve(undefined);
         }
         if (foldersToAdd.length + foldersToRemove.length === 0) {
@@ -290,7 +289,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] === ConfigurationTarget.USER || targets[0] === ConfigurationTarget.USER_LOCAL)) {
+            if (equals(value, inspect.defaultValue) && targets.length === 1 && ((targets[0] === 2  || targets[0] === 3) )) {
                 value = undefined;
             }
         }
@@ -312,22 +311,22 @@ class WorkspaceService extends Disposable {
             return;
         }
         switch (target) {
-            case ConfigurationTarget.DEFAULT:
+            case 7 :
                 this.reloadDefaultConfiguration();
                 return;
-            case ConfigurationTarget.USER: {
+            case 2 : {
                 const { local, remote } = await this.reloadUserConfiguration();
                 await this.loadConfiguration(this._configuration.applicationConfiguration, local, remote, true);
                 return;
             }
-            case ConfigurationTarget.USER_LOCAL:
+            case 3 :
                 await this.reloadLocalUserConfiguration();
                 return;
-            case ConfigurationTarget.USER_REMOTE:
+            case 4 :
                 await this.reloadRemoteUserConfiguration();
                 return;
-            case ConfigurationTarget.WORKSPACE:
-            case ConfigurationTarget.WORKSPACE_FOLDER:
+            case 5 :
+            case 6 :
                 await this.reloadWorkspaceConfiguration();
                 return;
         }
@@ -369,7 +368,7 @@ class WorkspaceService extends Disposable {
                 }
                 folderConfigurationModels.push(configurationModel);
             }
-            if (this.getWorkbenchState() === WorkbenchState.FOLDER) {
+            if (this.getWorkbenchState() === 2 ) {
                 if (folderConfigurationModels[0]) {
                     this._configuration.updateWorkspaceConfiguration(folderConfigurationModels[0]);
                 }
@@ -391,7 +390,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 }, ConfigurationTarget.WORKSPACE);
+                this.triggerConfigurationChange({ keys, overrides: [] }, { data, workspace: this.workspace }, 5 );
             }
         }
     }
@@ -399,7 +398,7 @@ class WorkspaceService extends Disposable {
         this.instantiationService = instantiationService;
     }
     isSettingAppliedForAllProfiles(key) {
-        if (this.configurationRegistry.getConfigurationProperties()[key]?.scope === ConfigurationScope.APPLICATION) {
+        if (this.configurationRegistry.getConfigurationProperties()[key]?.scope === 1 ) {
             return true;
         }
         const allProfilesSettings = this.getValue(APPLY_ALL_PROFILES_SETTING) ?? [];
@@ -570,10 +569,10 @@ class WorkspaceService extends Disposable {
     }
     async reloadWorkspaceConfiguration() {
         const workbenchState = this.getWorkbenchState();
-        if (workbenchState === WorkbenchState.FOLDER) {
+        if (workbenchState === 2 ) {
             return this.onWorkspaceFolderConfigurationChanged(this.workspace.folders[0]);
         }
-        if (workbenchState === WorkbenchState.WORKSPACE) {
+        if (workbenchState === 3 ) {
             return this.workspaceConfiguration.reload().then(() => this.onWorkspaceConfigurationChanged(false));
         }
     }
@@ -604,15 +603,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 }, ConfigurationTarget.WORKSPACE);
+            this.triggerConfigurationChange(change, { data: currentConfiguration.toData(), workspace: this.workspace }, 5 );
         }
         this.updateRestrictedSettings();
     }
     getWorkspaceConfigurationModel(folderConfigurations) {
         switch (this.getWorkbenchState()) {
-            case WorkbenchState.FOLDER:
+            case 2 :
                 return folderConfigurations[0];
-            case WorkbenchState.WORKSPACE:
+            case 3 :
                 return this.workspaceConfiguration.getConfiguration();
             default:
                 return ConfigurationModel.createEmptyModel(this.logService);
@@ -648,7 +647,7 @@ class WorkspaceService extends Disposable {
                 this._configuration.updateLocalUserConfiguration(this.localUserConfiguration.reparse());
                 this._configuration.updateRemoteUserConfiguration(this.remoteUserConfiguration.reparse());
             }
-            if (this.getWorkbenchState() === WorkbenchState.FOLDER) {
+            if (this.getWorkbenchState() === 2 ) {
                 const folderConfiguration = this.cachedFolderConfigs.get(this.workspace.folders[0].uri);
                 if (folderConfiguration) {
                     this._configuration.updateWorkspaceConfiguration(folderConfiguration.reparse());
@@ -664,14 +663,14 @@ class WorkspaceService extends Disposable {
                     }
                 }
             }
-            this.triggerConfigurationChange(change, { data: previousData, workspace: this.workspace }, ConfigurationTarget.DEFAULT);
+            this.triggerConfigurationChange(change, { data: previousData, workspace: this.workspace }, 7 );
             this.updateRestrictedSettings();
         }
     }
     onPolicyConfigurationChanged(policyConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const change = this._configuration.compareAndUpdatePolicyConfiguration(policyConfiguration);
-        this.triggerConfigurationChange(change, previous, ConfigurationTarget.DEFAULT);
+        this.triggerConfigurationChange(change, previous, 7 );
     }
     onApplicationConfigurationChanged(applicationConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
@@ -681,7 +680,7 @@ class WorkspaceService extends Disposable {
         const configurationProperties = this.configurationRegistry.getConfigurationProperties();
         const changedKeys = [];
         for (const changedKey of change.keys) {
-            if (configurationProperties[changedKey]?.scope === ConfigurationScope.APPLICATION) {
+            if (configurationProperties[changedKey]?.scope === 1 ) {
                 changedKeys.push(changedKey);
                 if (changedKey === APPLY_ALL_PROFILES_SETTING) {
                     for (const previousAllProfileSetting of previousAllProfilesSettings) {
@@ -704,17 +703,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, ConfigurationTarget.USER);
+        this.triggerConfigurationChange(change, previous, 2 );
     }
     onLocalUserConfigurationChanged(userConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const change = this._configuration.compareAndUpdateLocalUserConfiguration(userConfiguration);
-        this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER);
+        this.triggerConfigurationChange(change, previous, 2 );
     }
     onRemoteUserConfigurationChanged(userConfiguration) {
         const previous = { data: this._configuration.toData(), workspace: this.workspace };
         const change = this._configuration.compareAndUpdateRemoteUserConfiguration(userConfiguration);
-        this.triggerConfigurationChange(change, previous, ConfigurationTarget.USER);
+        this.triggerConfigurationChange(change, previous, 2 );
     }
     async onWorkspaceConfigurationChanged(fromCache) {
         if (this.workspace && this.workspace.configuration) {
@@ -757,7 +756,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() === WorkbenchState.WORKSPACE ? this.workspaceConfiguration.getRestrictedSettings().sort((a, b) => a.localeCompare(b))
+        const workspace = this.getWorkbenchState() === 3  ? 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 +780,11 @@ class WorkspaceService extends Disposable {
             this.workspace.folders = workspaceFolders;
             const change = await this.onFoldersChanged();
             await this.handleWillChangeWorkspaceFolders(changes, fromCache);
-            this.triggerConfigurationChange(change, previous, ConfigurationTarget.WORKSPACE_FOLDER);
+            this.triggerConfigurationChange(change, previous, 6 );
             this._onDidChangeWorkspaceFolders.fire(changes);
         }
         else {
-            this.triggerConfigurationChange(change, previous, ConfigurationTarget.WORKSPACE);
+            this.triggerConfigurationChange(change, previous, 5 );
         }
         this.updateRestrictedSettings();
     }
@@ -807,12 +806,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() === WorkbenchState.FOLDER) {
+        if (this.getWorkbenchState() === 2 ) {
             const workspaceConfigurationChange = this._configuration.compareAndUpdateWorkspaceConfiguration(folderConfiguration);
-            this.triggerConfigurationChange(mergeChanges(folderConfigurationChange, workspaceConfigurationChange), previous, ConfigurationTarget.WORKSPACE);
+            this.triggerConfigurationChange(mergeChanges(folderConfigurationChange, workspaceConfigurationChange), previous, 5 );
         }
         else {
-            this.triggerConfigurationChange(folderConfigurationChange, previous, ConfigurationTarget.WORKSPACE_FOLDER);
+            this.triggerConfigurationChange(folderConfigurationChange, previous, 6 );
         }
         this.updateRestrictedSettings();
     }
@@ -885,10 +884,10 @@ class WorkspaceService extends Disposable {
                 'Cannot write configuration because the configuration service is not yet ready to accept writes.'
             )));
         }
-        if (target === ConfigurationTarget.DEFAULT) {
+        if (target === 7 ) {
             throw ( (new Error('Invalid configuration target')));
         }
-        if (target === ConfigurationTarget.MEMORY) {
+        if (target === 8 ) {
             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 +897,7 @@ class WorkspaceService extends Disposable {
         if (!editableConfigurationTarget) {
             throw ( (new Error('Invalid configuration target')));
         }
-        if (editableConfigurationTarget === EditableConfigurationTarget.USER_REMOTE && !this.remoteUserConfiguration) {
+        if (editableConfigurationTarget === 2  && !this.remoteUserConfiguration) {
             throw ( (new Error('Invalid configuration target')));
         }
         if (overrides?.overrideIdentifiers?.length && overrides.overrideIdentifiers.length > 1) {
@@ -914,7 +913,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 EditableConfigurationTarget.USER_LOCAL:
+            case 1 :
                 if (this.applicationConfiguration && this.isSettingAppliedForAllProfiles(key)) {
                     await this.reloadApplicationConfiguration();
                 }
@@ -922,11 +921,11 @@ class WorkspaceService extends Disposable {
                     await this.reloadLocalUserConfiguration();
                 }
                 return;
-            case EditableConfigurationTarget.USER_REMOTE:
+            case 2 :
                 return this.reloadRemoteUserConfiguration().then(() => undefined);
-            case EditableConfigurationTarget.WORKSPACE:
+            case 3 :
                 return this.reloadWorkspaceConfiguration();
-            case EditableConfigurationTarget.WORKSPACE_FOLDER: {
+            case 4 : {
                 const workspaceFolder = overrides && overrides.resource ? this.workspace.getFolder(overrides.resource) : null;
                 if (workspaceFolder) {
                     return this.reloadWorkspaceFolderConfiguration(workspaceFolder);
@@ -940,18 +939,18 @@ class WorkspaceService extends Disposable {
     }
     getConfigurationModelForEditableConfigurationTarget(target, resource) {
         switch (target) {
-            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;
+            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;
         }
     }
     getConfigurationModel(target, resource) {
         switch (target) {
-            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;
+            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;
         }
     }
@@ -961,28 +960,28 @@ class WorkspaceService extends Disposable {
         }
         const definedTargets = [];
         if (inspect.workspaceFolderValue !== undefined) {
-            definedTargets.push(ConfigurationTarget.WORKSPACE_FOLDER);
+            definedTargets.push(6 );
         }
         if (inspect.workspaceValue !== undefined) {
-            definedTargets.push(ConfigurationTarget.WORKSPACE);
+            definedTargets.push(5 );
         }
         if (inspect.userRemoteValue !== undefined) {
-            definedTargets.push(ConfigurationTarget.USER_REMOTE);
+            definedTargets.push(4 );
         }
         if (inspect.userLocalValue !== undefined) {
-            definedTargets.push(ConfigurationTarget.USER_LOCAL);
+            definedTargets.push(3 );
         }
         if (inspect.applicationValue !== undefined) {
-            definedTargets.push(ConfigurationTarget.APPLICATION);
+            definedTargets.push(1 );
         }
         if (value === undefined) {
             return definedTargets;
         }
-        return [definedTargets[0] || ConfigurationTarget.USER];
+        return [definedTargets[0] || 2 ];
     }
     triggerConfigurationChange(change, previous, target) {
         if (change.keys.length) {
-            if (target !== ConfigurationTarget.DEFAULT) {
+            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, this.logService)));
@@ -991,32 +990,32 @@ class WorkspaceService extends Disposable {
         }
     }
     toEditableConfigurationTarget(target, key) {
-        if (target === ConfigurationTarget.APPLICATION) {
-            return EditableConfigurationTarget.USER_LOCAL;
+        if (target === 1 ) {
+            return 1 ;
         }
-        if (target === ConfigurationTarget.USER) {
+        if (target === 2 ) {
             if (this.remoteUserConfiguration) {
                 const scope = this.configurationRegistry.getConfigurationProperties()[key]?.scope;
-                if (scope === ConfigurationScope.MACHINE || scope === ConfigurationScope.MACHINE_OVERRIDABLE) {
-                    return EditableConfigurationTarget.USER_REMOTE;
+                if (scope === 2  || scope === 6 ) {
+                    return 2 ;
                 }
                 if (this.inspect(key).userRemoteValue !== undefined) {
-                    return EditableConfigurationTarget.USER_REMOTE;
+                    return 2 ;
                 }
             }
-            return EditableConfigurationTarget.USER_LOCAL;
+            return 1 ;
         }
-        if (target === ConfigurationTarget.USER_LOCAL) {
-            return EditableConfigurationTarget.USER_LOCAL;
+        if (target === 3 ) {
+            return 1 ;
         }
-        if (target === ConfigurationTarget.USER_REMOTE) {
-            return EditableConfigurationTarget.USER_REMOTE;
+        if (target === 4 ) {
+            return 2 ;
         }
-        if (target === ConfigurationTarget.WORKSPACE) {
-            return EditableConfigurationTarget.WORKSPACE;
+        if (target === 5 ) {
+            return 3 ;
         }
-        if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
-            return EditableConfigurationTarget.WORKSPACE_FOLDER;
+        if (target === 6 ) {
+            return 4 ;
         }
         return null;
     }
@@ -1031,7 +1030,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 === LifecyclePhase.Eventually ? undefined : 2500 )));
+            this._register(Event.any(configurationRegistry.onDidUpdateConfiguration, configurationRegistry.onDidSchemaChange, workspaceTrustManagementService.onDidChangeTrust)(() => delayer.trigger(() => this.registerConfigurationSchemas(), lifecycleService.phase === 4  ? undefined : 2500 )));
         });
     }
     registerConfigurationSchemas() {
@@ -1085,7 +1084,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
             allowTrailingCommas: true,
             allowComments: true
         };
-        const folderSettingsSchema = WorkbenchState.WORKSPACE === this.workspaceContextService.getWorkbenchState() ?
+        const folderSettingsSchema = 3  === this.workspaceContextService.getWorkbenchState() ?
             {
                 properties: Object.assign({}, this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties), this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)),
                 patternProperties: allSettings.patternProperties,
@@ -1095,7 +1094,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
             } : workspaceSettingsSchema;
         const configDefaultsSchema = {
             type: 'object',
-            description: ( localize(3653, 'Contribute defaults for configurations')),
+            description: ( localize(3681, 'Contribute defaults for configurations')),
             properties: Object.assign({}, this.filterDefaultOverridableProperties(machineOverridableSettings.properties), this.filterDefaultOverridableProperties(windowSettings.properties), this.filterDefaultOverridableProperties(resourceSettings.properties)),
             patternProperties: {
                 [OVERRIDE_PROPERTY_PATTERN]: {
@@ -1159,7 +1158,7 @@ let ResetConfigurationDefaultsOverridesCache = class ResetConfigurationDefaultsO
     constructor(configurationService, extensionService) {
         super();
         if (configurationService.hasCachedConfigurationDefaultsOverrides()) {
-            extensionService.whenInstalledExtensionsRegistered().then(() => configurationService.reloadConfiguration(ConfigurationTarget.DEFAULT));
+            extensionService.whenInstalledExtensionsRegistered().then(() => configurationService.reloadConfiguration(7 ));
         }
     }
 };
@@ -1206,18 +1205,18 @@ UpdateExperimentalSettingsDefaults = ( (__decorate([
     ( (__param(0, IWorkbenchAssignmentService)))
 ], UpdateExperimentalSettingsDefaults)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions$2.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, LifecyclePhase.Restored);
-workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, LifecyclePhase.Eventually);
-registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, WorkbenchPhase.BlockRestore);
+workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, 3 );
+workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, 4 );
+registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, 2 );
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
         [APPLY_ALL_PROFILES_SETTING]: {
             'type': 'array',
-            description: ( localize(3654, "Configure settings to be applied for all profiles.")),
+            description: ( localize(3682, "Configure settings to be applied for all profiles.")),
             'default': [],
-            'scope': ConfigurationScope.APPLICATION,
+            'scope': 1 ,
             additionalProperties: true,
             uniqueItems: true,
         }

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

@@ -1,4 +1,3 @@
-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';
@@ -61,7 +60,7 @@ class CachedConfiguration {
             await this.queue.queue(() => this.fileService.del(this.cachedConfigurationFolderResource, { recursive: true, useTrash: false }));
         }
         catch (error) {
-            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
+            if (error.fileOperationResult !== 1 ) {
                 throw error;
             }
         }