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

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

@@ -1,11 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, isUntitledWorkspace, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { WORKSPACE_FILTER, hasWorkspaceFileExtension, WORKSPACE_EXTENSION, isSavedWorkspace, WorkbenchState, 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 { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { ConfigurationScope, 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';
@@ -19,6 +20,7 @@ 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';
@@ -104,7 +106,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
             if (this.includesSingleFolderWorkspace(foldersToDelete)) {
                 return this.createAndEnterWorkspace(foldersToAdd);
             }
-            if (this.contextService.getWorkbenchState() !== 3 ) {
+            if (this.contextService.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
                 return this.doAddFolders(foldersToAdd, index, donotNotifyError);
             }
             return this.doUpdateFolders(foldersToAdd, foldersToDelete, index, donotNotifyError);
@@ -129,11 +131,11 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
     }
     async doAddFolders(foldersToAdd, index, donotNotifyError = false) {
         const state = this.contextService.getWorkbenchState();
-        if (state !== 3 ) {
+        if (state !== WorkbenchState.WORKSPACE) {
             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 === 1  && newWorkspaceFolders.length === 0 || state === 2  && newWorkspaceFolders.length === 1) {
+            if (state === WorkbenchState.EMPTY && newWorkspaceFolders.length === 0 || state === WorkbenchState.FOLDER && newWorkspaceFolders.length === 1) {
                 return;
             }
             return this.createAndEnterWorkspace(newWorkspaceFolders);
@@ -163,7 +165,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
         }
     }
     includesSingleFolderWorkspace(folders) {
-        if (this.contextService.getWorkbenchState() === 2 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
             const workspaceFolder = this.contextService.getWorkspace().folders[0];
             return (
                  (folders.some(
@@ -232,7 +234,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
         const configPathURI = workspace.configPath;
         const existingModel = this.textFileService.files.get(configPathURI);
         if (existingModel) {
-            await existingModel.save({ force: true, reason: 1  });
+            await existingModel.save({ force: true, reason: SaveReason.EXPLICIT });
             return;
         }
         const workspaceFileExists = await this.fileService.exists(configPathURI);
@@ -245,7 +247,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
     }
     handleWorkspaceConfigurationEditingError(error) {
         switch (error.code) {
-            case 0 :
+            case JSONEditingErrorCode.ERROR_INVALID_FILE:
                 this.onInvalidWorkspaceConfigurationFileError();
                 break;
             default:
@@ -271,14 +273,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
             throw ( (new Error('Entering a new workspace is not possible in tests.')));
         }
         const workspace = await this.workspacesService.getWorkspaceIdentifier(workspaceUri);
-        if (this.contextService.getWorkbenchState() === 2 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
             await this.migrateWorkspaceSettings(workspace);
         }
         await this.configurationService.initialize(workspace);
         return this.workspacesService.enterWorkspace(workspaceUri);
     }
     migrateWorkspaceSettings(toWorkspace) {
-        return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === 3 );
+        return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === ConfigurationScope.WINDOW);
     }
     copyWorkspaceSettings(toWorkspace) {
         return this.doCopyWorkspaceSettings(toWorkspace);
@@ -297,7 +299,7 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService {
         return this.jsonEditingService.write(toWorkspace.configPath, [{ path: ['settings'], value: targetWorkspaceConfiguration }], true);
     }
     async trustWorkspaceConfiguration(configPathURI) {
-        if (this.contextService.getWorkbenchState() !== 1  && this.workspaceTrustManagementService.isWorkspaceTrusted()) {
+        if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.workspaceTrustManagementService.isWorkspaceTrusted()) {
             await this.workspaceTrustManagementService.setUrisTrust([configPathURI], true);
         }
     }

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

@@ -1,13 +1,16 @@
 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, WORKSPACE_EXTENSION } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { isTemporaryWorkspace, WorkbenchState, 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';
@@ -33,7 +36,7 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.storageService.onDidChangeValue(-1 , BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, this._register(( new DisposableStore())))(() => this._onRecentlyOpenedChange.fire()));
+        this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, this._register(( new DisposableStore())))(() => this._onRecentlyOpenedChange.fire()));
         this._register(this.contextService.onDidChangeWorkspaceFolders(e => this.onDidChangeWorkspaceFolders(e)));
     }
     onDidChangeWorkspaceFolders(e) {
@@ -48,16 +51,16 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
         const workspace = this.contextService.getWorkspace();
         const remoteAuthority = this.environmentService.remoteAuthority;
         switch (this.contextService.getWorkbenchState()) {
-            case 2 :
+            case WorkbenchState.FOLDER:
                 this.addRecentlyOpened([{ folderUri: workspace.folders[0].uri, remoteAuthority }]);
                 break;
-            case 3 :
+            case WorkbenchState.WORKSPACE:
                 this.addRecentlyOpened([{ workspace: { id: workspace.id, configPath: workspace.configuration }, remoteAuthority }]);
                 break;
         }
     }
     async getRecentlyOpened() {
-        const recentlyOpenedRaw = this.storageService.get(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, -1 );
+        const recentlyOpenedRaw = this.storageService.get(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, StorageScope.APPLICATION);
         if (recentlyOpenedRaw) {
             const recentlyOpened = restoreRecentlyOpened(JSON.parse(recentlyOpenedRaw), this.logService);
             recentlyOpened.workspaces = recentlyOpened.workspaces.filter(recent => {
@@ -105,10 +108,10 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
         });
     }
     async saveRecentlyOpened(data) {
-        return this.storageService.store(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, JSON.stringify(toStoreData(data)), -1 , 0 );
+        return this.storageService.store(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, JSON.stringify(toStoreData(data)), StorageScope.APPLICATION, StorageTarget.USER);
     }
     async clearRecentlyOpened() {
-        this.storageService.remove(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, -1 );
+        this.storageService.remove(BrowserWorkspacesService_1.RECENTLY_OPENED_KEY, StorageScope.APPLICATION);
     }
     async enterWorkspace(workspaceUri) {
         return { workspace: await this.getWorkspaceIdentifier(workspaceUri) };
@@ -131,7 +134,7 @@ let BrowserWorkspacesService = class BrowserWorkspacesService extends Disposable
             await this.fileService.del(workspace.configPath);
         }
         catch (error) {
-            if (error.fileOperationResult !== 1 ) {
+            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                 throw error;
             }
         }