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

package/package.json

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

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

@@ -4,6 +4,7 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 let TextResourceConfigurationService = class TextResourceConfigurationService extends Disposable {
@@ -34,34 +35,34 @@ let TextResourceConfigurationService = class TextResourceConfigurationService ex
     deriveConfigurationTarget(configurationValue, language) {
         if (language) {
             if (configurationValue.memory?.override !== undefined) {
-                return 8 ;
+                return ConfigurationTarget.MEMORY;
             }
             if (configurationValue.workspaceFolder?.override !== undefined) {
-                return 6 ;
+                return ConfigurationTarget.WORKSPACE_FOLDER;
             }
             if (configurationValue.workspace?.override !== undefined) {
-                return 5 ;
+                return ConfigurationTarget.WORKSPACE;
             }
             if (configurationValue.userRemote?.override !== undefined) {
-                return 4 ;
+                return ConfigurationTarget.USER_REMOTE;
             }
             if (configurationValue.userLocal?.override !== undefined) {
-                return 3 ;
+                return ConfigurationTarget.USER_LOCAL;
             }
         }
         if (configurationValue.memory?.value !== undefined) {
-            return 8 ;
+            return ConfigurationTarget.MEMORY;
         }
         if (configurationValue.workspaceFolder?.value !== undefined) {
-            return 6 ;
+            return ConfigurationTarget.WORKSPACE_FOLDER;
         }
         if (configurationValue.workspace?.value !== undefined) {
-            return 5 ;
+            return ConfigurationTarget.WORKSPACE;
         }
         if (configurationValue.userRemote?.value !== undefined) {
-            return 4 ;
+            return ConfigurationTarget.USER_REMOTE;
         }
-        return 3 ;
+        return ConfigurationTarget.USER_LOCAL;
     }
     _getValue(resource, position, section) {
         const language = resource ? this.getLanguage(resource, position) : undefined;

package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js

@@ -2,7 +2,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { Extensions as Extensions$1, configurationDefaultsSchemaId, OVERRIDE_PROPERTY_REGEX, validateProperty, getDefaultValue } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1, configurationDefaultsSchemaId, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, validateProperty, getDefaultValue } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 import { isObject, isUndefined } from 'vscode/vscode/vs/base/common/types';
@@ -202,7 +202,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
     }
     if (added.length) {
         const registeredProperties = configurationRegistry.getConfigurationProperties();
-        const allowedScopes = [6 , 3 , 4 , 5 ];
+        const allowedScopes = [ConfigurationScope.MACHINE_OVERRIDABLE, ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE, ConfigurationScope.LANGUAGE_OVERRIDABLE];
         const addedDefaultConfigurations = ( (added.map(extension => {
             const overrides = deepClone(extension.value);
             for (const key of ( (Object.keys(overrides)))) {
@@ -302,26 +302,26 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
                 seenProperties.add(key);
                 if (propertyConfiguration.scope) {
                     if (( (propertyConfiguration.scope.toString())) === 'application') {
-                        propertyConfiguration.scope = 1 ;
+                        propertyConfiguration.scope = ConfigurationScope.APPLICATION;
                     }
                     else if (( (propertyConfiguration.scope.toString())) === 'machine') {
-                        propertyConfiguration.scope = 2 ;
+                        propertyConfiguration.scope = ConfigurationScope.MACHINE;
                     }
                     else if (( (propertyConfiguration.scope.toString())) === 'resource') {
-                        propertyConfiguration.scope = 4 ;
+                        propertyConfiguration.scope = ConfigurationScope.RESOURCE;
                     }
                     else if (( (propertyConfiguration.scope.toString())) === 'machine-overridable') {
-                        propertyConfiguration.scope = 6 ;
+                        propertyConfiguration.scope = ConfigurationScope.MACHINE_OVERRIDABLE;
                     }
                     else if (( (propertyConfiguration.scope.toString())) === 'language-overridable') {
-                        propertyConfiguration.scope = 5 ;
+                        propertyConfiguration.scope = ConfigurationScope.LANGUAGE_OVERRIDABLE;
                     }
                     else {
-                        propertyConfiguration.scope = 3 ;
+                        propertyConfiguration.scope = ConfigurationScope.WINDOW;
                     }
                 }
                 else {
-                    propertyConfiguration.scope = 3 ;
+                    propertyConfiguration.scope = ConfigurationScope.WINDOW;
                 }
             }
         }

package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js

@@ -2,7 +2,8 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { hasWorkspaceFileExtension, WORKSPACE_SUFFIX } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { WorkbenchState, hasWorkspaceFileExtension, WORKSPACE_SUFFIX } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -11,6 +12,7 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { joinPath, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { isVirtualWorkspace } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -33,7 +35,7 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
     }
     async findWorkspaces() {
         const folder = this.contextService.getWorkspace().folders[0];
-        if (!folder || this.contextService.getWorkbenchState() !== 2  || isVirtualWorkspace(this.contextService.getWorkspace())) {
+        if (!folder || this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER || isVirtualWorkspace(this.contextService.getWorkspace())) {
             return;
         }
         const rootFileNames = (await this.fileService.resolve(folder.uri)).children?.map(child => child.name);
@@ -59,7 +61,7 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
                     run: () => this.hostService.openWindow([{ workspaceUri: joinPath(folder, workspaceFile) }])
                 }], {
                 neverShowAgain,
-                priority: !this.storageService.isNew(1 ) ? NotificationPriority.SILENT : undefined
+                priority: !this.storageService.isNew(StorageScope.WORKSPACE) ? NotificationPriority.SILENT : undefined
             });
         }
         else if (workspaces.length > 1) {
@@ -79,7 +81,7 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
                     }
                 }], {
                 neverShowAgain,
-                priority: !this.storageService.isNew(1 ) ? NotificationPriority.SILENT : undefined
+                priority: !this.storageService.isNew(StorageScope.WORKSPACE) ? NotificationPriority.SILENT : undefined
             });
         }
     }
@@ -92,7 +94,7 @@ WorkspacesFinderContribution = ( (__decorate([
     ( (__param(4, IHostService))),
     ( (__param(5, IStorageService)))
 ], WorkspacesFinderContribution)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspacesFinderContribution, 4 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspacesFinderContribution, LifecyclePhase.Eventually);
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -113,7 +115,7 @@ registerAction2(class extends Action2 {
         const hostService = accessor.get(IHostService);
         const contextService = accessor.get(IWorkspaceContextService);
         const notificationService = accessor.get(INotificationService);
-        if (contextService.getWorkbenchState() === 3 ) {
+        if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             const workspaceConfiguration = contextService.getWorkspace().configuration;
             if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
                 notificationService.info(( localizeWithPath(_moduleId, 5, "This workspace is already open.")));

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

@@ -2,11 +2,12 @@ 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 { whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationResult, FileChangeType, FileOperation, 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 { Extensions, OVERRIDE_PROPERTY_REGEX } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+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 { 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';
@@ -92,7 +93,7 @@ class DefaultConfiguration extends DefaultConfiguration$1 {
 }
 class ApplicationConfiguration extends UserSettings {
     constructor(userDataProfilesService, fileService, uriIdentityService, logService) {
-        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [1 ] }, uriIdentityService.extUri, fileService, logService);
+        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [ConfigurationScope.APPLICATION] }, uriIdentityService.extUri, fileService, logService);
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
         this._register(this.onDidChange(() => this.reloadConfigurationScheduler.schedule()));
@@ -204,8 +205,8 @@ class FileServiceBasedConfiguration extends Disposable {
                 }
                 catch (error) {
                     this.logService.trace(`Error while resolving configuration file '${( resource.toString())}': ${getErrorMessage(error)}`);
-                    if (error.fileOperationResult !== 1
-                        && error.fileOperationResult !== 9 ) {
+                    if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND
+                        && error.fileOperationResult !== FileOperationResult.FILE_NOT_DIRECTORY) {
                         this.logService.error(error);
                     }
                 }
@@ -258,20 +259,20 @@ class FileServiceBasedConfiguration extends Disposable {
             return true;
         }
         if (( this.allResources.some(
-            resource => event.contains(this.uriIdentityService.extUri.dirname(resource), 2 )
+            resource => event.contains(this.uriIdentityService.extUri.dirname(resource), FileChangeType.DELETED)
         ))) {
             return true;
         }
         return false;
     }
     handleFileOperationEvent(event) {
-        if ((event.isOperation(0 ) || event.isOperation(3 ) || event.isOperation(1 ) || event.isOperation(4 ))
+        if ((event.isOperation(FileOperation.CREATE) || event.isOperation(FileOperation.COPY) || event.isOperation(FileOperation.DELETE) || event.isOperation(FileOperation.WRITE))
             && ( this.allResources.some(
             resource => this.uriIdentityService.extUri.isEqual(event.resource, resource)
         ))) {
             return true;
         }
-        if (event.isOperation(1 ) && ( this.allResources.some(
+        if (event.isOperation(FileOperation.DELETE) && ( this.allResources.some(
             resource => this.uriIdentityService.extUri.isEqual(event.resource, this.uriIdentityService.extUri.dirname(resource))
         ))) {
             return true;
@@ -344,7 +345,7 @@ class RemoteUserConfiguration extends Disposable {
                 content = await this._userConfiguration.resolveContent();
             }
             catch (error) {
-                if (error.fileOperationResult !== 1 ) {
+                if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                     return;
                 }
             }
@@ -417,12 +418,12 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
         return this.parser.restrictedConfigurations;
     }
     handleFileChangesEvent(event) {
-        let affectedByChanges = event.contains(this.configurationResource, 0 );
-        if (event.contains(this.configurationResource, 1 )) {
+        let affectedByChanges = event.contains(this.configurationResource, FileChangeType.UPDATED);
+        if (event.contains(this.configurationResource, FileChangeType.ADDED)) {
             affectedByChanges = true;
             this.onResourceExists(true);
         }
-        else if (event.contains(this.configurationResource, 2 )) {
+        else if (event.contains(this.configurationResource, FileChangeType.DELETED)) {
             affectedByChanges = true;
             this.onResourceExists(false);
         }
@@ -431,7 +432,7 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
         }
     }
     handleFileOperationEvent(event) {
-        if ((event.isOperation(0 ) || event.isOperation(3 ) || event.isOperation(1 ) || event.isOperation(4 ))
+        if ((event.isOperation(FileOperation.CREATE) || event.isOperation(FileOperation.COPY) || event.isOperation(FileOperation.DELETE) || event.isOperation(FileOperation.WRITE))
             && this.uriIdentityService.extUri.isEqual(event.resource, this.configurationResource)) {
             this.reloadConfigurationScheduler.schedule();
         }
@@ -599,7 +600,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(0 ) || e.isOperation(3 ) || e.isOperation(1 ) || e.isOperation(4 )) && 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(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.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(() => this._onDidChange.fire(), 50)));
         this.workspaceConfigWatcher = this._register(this.watchWorkspaceConfigurationFile());
     }
@@ -800,7 +801,7 @@ class FolderConfiguration extends Disposable {
         this.configurationCache = configurationCache;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this.scopes = 3  === this.workbenchState ? FOLDER_SCOPES : WORKSPACE_SCOPES;
+        this.scopes = WorkbenchState.WORKSPACE === this.workbenchState ? FOLDER_SCOPES : WORKSPACE_SCOPES;
         this.configurationFolder = uriIdentityService.extUri.joinPath(workspaceFolder.uri, configFolderRelativePath);
         this.cachedFolderConfiguration = ( new CachedFolderConfiguration(
             workspaceFolder.uri,