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

package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js

@@ -4,9 +4,6 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isUndefinedOrNull, isString } from 'vscode/vscode/vs/base/common/types';
 import { isCodeEditor, isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localize } from 'vscode/vscode/vs/nls';
-import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { AbstractVariableResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/variableResolver';
 
@@ -137,15 +134,15 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
             return Promise.resolve(undefined);
         }
         let inputs = [];
-        if (this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && section) {
+        if (this.workspaceContextService.getWorkbenchState() !== 1  && section) {
             const overrides = folder ? { resource: folder.uri } : {};
             const result = this.configurationService.inspect(section, overrides);
             if (result && (result.userValue || result.workspaceValue || result.workspaceFolderValue)) {
                 switch (target) {
-                    case ConfigurationTarget.USER:
+                    case 2 :
                         inputs = result.userValue?.inputs;
                         break;
-                    case ConfigurationTarget.WORKSPACE:
+                    case 5 :
                         inputs = result.workspaceValue?.inputs;
                         break;
                     default: inputs = result.workspaceFolderValue?.inputs;
@@ -173,7 +170,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                     result = await this.commandService.executeCommand(commandId, configuration);
                     if (typeof result !== 'string' && !isUndefinedOrNull(result)) {
                         throw ( (new Error(localize(
-                            8838,
+                            8899,
                             "Cannot substitute command variable '{0}' because command did not return a result of type string.",
                             commandId
                         ))));
@@ -225,7 +222,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
     showUserInput(section, variable, inputInfos) {
         if (!inputInfos) {
             return Promise.reject(( (new Error(( localize(
-                8839,
+                8900,
                 "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
                 variable,
                 'inputs'
@@ -235,7 +232,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
         if (info) {
             const missingAttribute = (attrName) => {
                 throw ( (new Error(localize(
-                    8840,
+                    8901,
                     "Input variable '{0}' is of type '{1}' and must include '{2}'.",
                     variable,
                     info.type,
@@ -287,7 +284,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                             value: value
                         };
                         if (value === info.default) {
-                            item.description = ( localize(8841, "(Default)"));
+                            item.description = ( localize(8902, "(Default)"));
                             picks.unshift(item);
                         }
                         else if (!info.default && value === previousPickedValue) {
@@ -316,7 +313,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                             return result;
                         }
                         throw ( (new Error(localize(
-                            8842,
+                            8903,
                             "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
                             variable,
                             info.command
@@ -325,23 +322,23 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 }
                 default:
                     throw ( (new Error(localize(
-                        8843,
+                        8904,
                         "Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
                         variable
                     ))));
             }
         }
         return Promise.reject(( (new Error(( localize(
-            8844,
+            8905,
             "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
             variable
         ))))));
     }
     storeInputLru(lru) {
-        this.storageService.store(LAST_INPUT_STORAGE_KEY, JSON.stringify(lru.toJSON()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store(LAST_INPUT_STORAGE_KEY, JSON.stringify(lru.toJSON()), 1 , 1 );
     }
     readInputLru() {
-        const contents = this.storageService.get(LAST_INPUT_STORAGE_KEY, StorageScope.WORKSPACE);
+        const contents = this.storageService.get(LAST_INPUT_STORAGE_KEY, 1 );
         const lru = ( (new LRUCache(LAST_INPUT_CACHE_SIZE)));
         try {
             if (contents) {

package/vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';

package/vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js

@@ -1,12 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { OperatingSystem, OS } from 'vscode/vscode/vs/base/common/platform';
+import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 
 let TextResourcePropertiesService = class TextResourcePropertiesService {
@@ -23,7 +21,7 @@ let TextResourcePropertiesService = class TextResourcePropertiesService {
             return eol;
         }
         const os = this.getOS(resource);
-        return os === OperatingSystem.Linux || os === OperatingSystem.Macintosh ? '\n' : '\r\n';
+        return os === 3  || os === 2  ? '\n' : '\r\n';
     }
     getOS(resource) {
         let os = OS;
@@ -31,8 +29,8 @@ let TextResourcePropertiesService = class TextResourcePropertiesService {
         if (remoteAuthority) {
             if (resource && resource.scheme !== Schemas.file) {
                 const osCacheKey = `resource.authority.os.${remoteAuthority}`;
-                os = this.remoteEnvironment ? this.remoteEnvironment.os :  this.storageService.getNumber(osCacheKey, StorageScope.WORKSPACE, OS);
-                this.storageService.store(osCacheKey, os, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+                os = this.remoteEnvironment ? this.remoteEnvironment.os :  this.storageService.getNumber(osCacheKey, 1 , OS);
+                this.storageService.store(osCacheKey, os, 1 , 1 );
             }
         }
         return os;

package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js

@@ -1,15 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
-import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, WorkbenchState, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { JSONEditingErrorCode } from '@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/configuration/common/jsonEditing';
 import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
 import { rewriteWorkspaceFileForNewLocation } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
 import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces.service';
-import { ConfigurationScope, Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { firstOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { joinPath, basename, removeTrailingPathSeparator, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -20,7 +19,6 @@ import { mnemonicButtonLabel } from 'vscode/vscode/vs/base/common/labels';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { SaveReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration.service';
@@ -55,8 +53,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
             availableFileSystems.unshift(Schemas.vscodeRemote);
         }
         let workspacePath = await this.fileDialogService.showSaveDialog({
-            saveLabel: mnemonicButtonLabel(( localize(3655, "Save"))),
-            title: ( localize(3656, "Save Workspace")),
+            saveLabel: mnemonicButtonLabel(( localize(3683, "Save"))),
+            title: ( localize(3684, "Save Workspace")),
             filters: WORKSPACE_FILTER,
             defaultUri: joinPath(await this.fileDialogService.defaultWorkspacePath(), this.getNewWorkspaceName()),
             availableFileSystems
@@ -74,7 +72,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         if (configPathURI && isSavedWorkspace(configPathURI, this.environmentService)) {
             return basename(configPathURI);
         }
-        const folder = firstOrDefault(this.contextService.getWorkspace().folders);
+        const folder = this.contextService.getWorkspace().folders.at(0);
         if (folder) {
             return `${basename(folder.uri)}.${WORKSPACE_EXTENSION}`;
         }
@@ -107,7 +105,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
             if (this.includesSingleFolderWorkspace(foldersToDelete)) {
                 return this.createAndEnterWorkspace(foldersToAdd);
             }
-            if (this.contextService.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
+            if (this.contextService.getWorkbenchState() !== 3 ) {
                 return this.doAddFolders(foldersToAdd, index, donotNotifyError);
             }
             return this.doUpdateFolders(foldersToAdd, foldersToDelete, index, donotNotifyError);
@@ -132,11 +130,11 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
     }
     async doAddFolders(foldersToAdd, index, donotNotifyError = false) {
         const state = this.contextService.getWorkbenchState();
-        if (state !== WorkbenchState.WORKSPACE) {
+        if (state !== 3 ) {
             let newWorkspaceFolders = ( (this.contextService.getWorkspace().folders.map(folder => ({ uri: folder.uri }))));
             newWorkspaceFolders.splice(typeof index === 'number' ? index : newWorkspaceFolders.length, 0, ...foldersToAdd);
             newWorkspaceFolders = distinct(newWorkspaceFolders, folder => this.uriIdentityService.extUri.getComparisonKey(folder.uri));
-            if (state === WorkbenchState.EMPTY && newWorkspaceFolders.length === 0 || state === WorkbenchState.FOLDER && newWorkspaceFolders.length === 1) {
+            if (state === 1  && newWorkspaceFolders.length === 0 || state === 2  && newWorkspaceFolders.length === 1) {
                 return;
             }
             return this.createAndEnterWorkspace(newWorkspaceFolders);
@@ -166,7 +164,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         }
     }
     includesSingleFolderWorkspace(folders) {
-        if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+        if (this.contextService.getWorkbenchState() === 2 ) {
             const workspaceFolder = this.contextService.getWorkspace().folders[0];
             return (
                  (folders.some(
@@ -235,7 +233,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         const configPathURI = workspace.configPath;
         const existingModel = this.textFileService.files.get(configPathURI);
         if (existingModel) {
-            await existingModel.save({ force: true, reason: SaveReason.EXPLICIT });
+            await existingModel.save({ force: true, reason: 1  });
             return;
         }
         const workspaceFileExists = await this.fileService.exists(configPathURI);
@@ -248,7 +246,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
     }
     handleWorkspaceConfigurationEditingError(error) {
         switch (error.code) {
-            case JSONEditingErrorCode.ERROR_INVALID_FILE:
+            case 0 :
                 this.onInvalidWorkspaceConfigurationFileError();
                 break;
             default:
@@ -257,14 +255,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
     }
     onInvalidWorkspaceConfigurationFileError() {
         const message = ( localize(
-            3657,
+            3685,
             "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again."
         ));
         this.askToOpenWorkspaceConfigurationFile(message);
     }
     askToOpenWorkspaceConfigurationFile(message) {
         this.notificationService.prompt(Severity$1.Error, message, [{
-                label: ( localize(3658, "Open Workspace Configuration")),
+                label: ( localize(3686, "Open Workspace Configuration")),
                 run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
             }]);
     }
@@ -273,14 +271,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
             throw ( (new Error('Entering a new workspace is not possible in tests.')));
         }
         const workspace = await this.workspacesService.getWorkspaceIdentifier(workspaceUri);
-        if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+        if (this.contextService.getWorkbenchState() === 2 ) {
             await this.migrateWorkspaceSettings(workspace);
         }
         await this.configurationService.initialize(workspace);
         return this.workspacesService.enterWorkspace(workspaceUri);
     }
     migrateWorkspaceSettings(toWorkspace) {
-        return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === ConfigurationScope.WINDOW);
+        return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === 3 );
     }
     copyWorkspaceSettings(toWorkspace) {
         return this.doCopyWorkspaceSettings(toWorkspace);
@@ -299,7 +297,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
         return this.jsonEditingService.write(toWorkspace.configPath, [{ path: ['settings'], value: targetWorkspaceConfiguration }], true);
     }
     async trustWorkspaceConfiguration(configPathURI) {
-        if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.workspaceTrustManagementService.isWorkspaceTrusted()) {
+        if (this.contextService.getWorkbenchState() !== 1  && this.workspaceTrustManagementService.isWorkspaceTrusted()) {
             await this.workspaceTrustManagementService.setUrisTrust([configPathURI], true);
         }
     }

package/vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js

@@ -1,16 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { restoreRecentlyOpened, isRecentFolder, isRecentWorkspace, isRecentFile, toStoreData, getStoredWorkspaceFolder } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { isTemporaryWorkspace, WorkbenchState, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { isTemporaryWorkspace, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { getWorkspaceIdentifier } from 'vscode/vscode/vs/workbench/services/workspaces/browser/workspaces';
-import { FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
@@ -36,7 +33,7 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, this._register(( new DisposableStore())))(() => this._onRecentlyOpenedChange.fire()));
+        this._register(this.storageService.onDidChangeValue(-1 , BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, this._register(( new DisposableStore())))(() => this._onRecentlyOpenedChange.fire()));
         this._register(this.contextService.onDidChangeWorkspaceFolders(e => this.onDidChangeWorkspaceFolders(e)));
     }
     onDidChangeWorkspaceFolders(e) {
@@ -51,16 +48,16 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
         const workspace = this.contextService.getWorkspace();
         const remoteAuthority = this.environmentService.remoteAuthority;
         switch (this.contextService.getWorkbenchState()) {
-            case WorkbenchState.FOLDER:
+            case 2 :
                 this.addRecentlyOpened([{ folderUri: workspace.folders[0].uri, remoteAuthority }]);
                 break;
-            case WorkbenchState.WORKSPACE:
+            case 3 :
                 this.addRecentlyOpened([{ workspace: { id: workspace.id, configPath: workspace.configuration }, remoteAuthority }]);
                 break;
         }
     }
     async getRecentlyOpened() {
-        const recentlyOpenedRaw = this.storageService.get(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, StorageScope.APPLICATION);
+        const recentlyOpenedRaw = this.storageService.get(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, -1 );
         if (recentlyOpenedRaw) {
             const recentlyOpened = restoreRecentlyOpened(JSON.parse(recentlyOpenedRaw), this.logService);
             recentlyOpened.workspaces = recentlyOpened.workspaces.filter(recent => {
@@ -108,10 +105,10 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
         });
     }
     async saveRecentlyOpened(data) {
-        return this.storageService.store(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, JSON.stringify(toStoreData(data)), StorageScope.APPLICATION, StorageTarget.USER);
+        return this.storageService.store(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, JSON.stringify(toStoreData(data)), -1 , 0 );
     }
     async clearRecentlyOpened() {
-        this.storageService.remove(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, StorageScope.APPLICATION);
+        this.storageService.remove(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, -1 );
     }
     async enterWorkspace(workspaceUri) {
         return { workspace: await this.getWorkspaceIdentifier(workspaceUri) };
@@ -134,7 +131,7 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
             await this.fileService.del(workspace.configPath);
         }
         catch (error) {
-            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
+            if (error.fileOperationResult !== 1 ) {
                 throw error;
             }
         }