@codingame/monaco-vscode-configuration-service-override 4.5.1 → 5.0.0

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

@@ -19,6 +19,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { TEXT_FILE_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
+const _moduleId = "vs/workbench/contrib/workspaces/browser/workspaces.contribution";
 let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Disposable {
     constructor(contextService, notificationService, fileService, quickInputService, hostService, storageService) {
         super();
@@ -47,15 +48,14 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
         const neverShowAgain = { id: 'workspaces.dontPromptToOpen', scope: NeverShowAgainScope.WORKSPACE, isSecondary: true };
         if (workspaces.length === 1) {
             const workspaceFile = workspaces[0];
-            this.notificationService.prompt(Severity$1.Info, ( localizeWithPath('vs/workbench/contrib/workspaces/browser/workspaces.contribution', {
-                key: 'foundWorkspace',
-                comment: ['{Locked="]({1})"}']
-            }, "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.", workspaceFile, 'https://go.microsoft.com/fwlink/?linkid=2025315')), [{
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/workspaces/browser/workspaces.contribution',
-                        'openWorkspace',
-                        "Open Workspace"
-                    )),
+            this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
+                _moduleId,
+                0,
+                "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.",
+                workspaceFile,
+                'https://go.microsoft.com/fwlink/?linkid=2025315'
+            )), [{
+                    label: ( localizeWithPath(_moduleId, 1, "Open Workspace")),
                     run: () => this.hostService.openWindow([{ workspaceUri: joinPath(folder, workspaceFile) }])
                 }], {
                 neverShowAgain,
@@ -63,21 +63,15 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
             });
         }
         else if (workspaces.length > 1) {
-            this.notificationService.prompt(Severity$1.Info, ( localizeWithPath('vs/workbench/contrib/workspaces/browser/workspaces.contribution', {
-                key: 'foundWorkspaces',
-                comment: ['{Locked="]({0})"}']
-            }, "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.", 'https://go.microsoft.com/fwlink/?linkid=2025315')), [{
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/workspaces/browser/workspaces.contribution',
-                        'selectWorkspace',
-                        "Select Workspace"
-                    )),
+            this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
+                _moduleId,
+                2,
+                "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.",
+                'https://go.microsoft.com/fwlink/?linkid=2025315'
+            )), [{
+                    label: ( localizeWithPath(_moduleId, 3, "Select Workspace")),
                     run: () => {
-                        this.quickInputService.pick(( workspaces.map(workspace => ({ label: workspace }))), { placeHolder: ( localizeWithPath(
-                            'vs/workbench/contrib/workspaces/browser/workspaces.contribution',
-                            'selectToOpen',
-                            "Select a workspace to open"
-                        )) }).then(pick => {
+                        this.quickInputService.pick(( (workspaces.map(workspace => ({ label: workspace })))), { placeHolder: ( localizeWithPath(_moduleId, 4, "Select a workspace to open")) }).then(pick => {
                             if (pick) {
                                 this.hostService.openWindow([{ workspaceUri: joinPath(folder, pick.label) }]);
                             }
@@ -90,28 +84,28 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
         }
     }
 };
-WorkspacesFinderContribution = ( __decorate([
-    ( __param(0, IWorkspaceContextService)),
-    ( __param(1, INotificationService)),
-    ( __param(2, IFileService)),
-    ( __param(3, IQuickInputService)),
-    ( __param(4, IHostService)),
-    ( __param(5, IStorageService))
-], WorkspacesFinderContribution));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(WorkspacesFinderContribution, 4 );
+WorkspacesFinderContribution = ( (__decorate([
+    ( (__param(0, IWorkspaceContextService))),
+    ( (__param(1, INotificationService))),
+    ( (__param(2, IFileService))),
+    ( (__param(3, IQuickInputService))),
+    ( (__param(4, IHostService))),
+    ( (__param(5, IStorageService)))
+], WorkspacesFinderContribution)));
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspacesFinderContribution, 4 );
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.openWorkspaceFromEditor',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/workspaces/browser/workspaces.contribution',
-                'openWorkspace',
-                "Open Workspace"
-            )),
+            title: ( localize2WithPath(_moduleId, 1, "Open Workspace")),
             f1: false,
             menu: {
                 id: MenuId.EditorContent,
-                when: ( ContextKeyExpr.and(( ResourceContextKey.Extension.isEqualTo(WORKSPACE_SUFFIX)), ( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), ( TemporaryWorkspaceContext.toNegated())))
+                when: ( (ContextKeyExpr.and(
+                     (ResourceContextKey.Extension.isEqualTo(WORKSPACE_SUFFIX)),
+                     (ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)),
+                     (TemporaryWorkspaceContext.toNegated())
+                )))
             }
         });
     }
@@ -122,11 +116,7 @@ registerAction2(class extends Action2 {
         if (contextService.getWorkbenchState() === 3 ) {
             const workspaceConfiguration = contextService.getWorkspace().configuration;
             if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
-                notificationService.info(( localizeWithPath(
-                    'vs/workbench/contrib/workspaces/browser/workspaces.contribution',
-                    'alreadyOpen',
-                    "This workspace is already open."
-                )));
+                notificationService.info(( localizeWithPath(_moduleId, 5, "This workspace is already open.")));
                 return;
             }
         }

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

@@ -16,8 +16,8 @@ import { DefaultConfiguration as DefaultConfiguration$1 } from 'vscode/vscode/vs
 
 class DefaultConfiguration extends DefaultConfiguration$1 {
     static { this.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY = 'DefaultOverridesCacheExists'; }
-    constructor(configurationCache, environmentService) {
-        super();
+    constructor(configurationCache, environmentService, logService) {
+        super(logService);
         this.configurationCache = configurationCache;
         this.configurationRegistry = ( Registry.as(Extensions.Configuration));
         this.cachedConfigurationDefaultsOverrides = {};
@@ -91,8 +91,8 @@ class DefaultConfiguration extends DefaultConfiguration$1 {
     }
 }
 class ApplicationConfiguration extends UserSettings {
-    constructor(userDataProfilesService, fileService, uriIdentityService) {
-        super(userDataProfilesService.defaultProfile.settingsResource, { scopes: [1 ] }, uriIdentityService.extUri, fileService);
+    constructor(userDataProfilesService, fileService, uriIdentityService, 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()));
@@ -131,7 +131,8 @@ class UserConfiguration extends Disposable {
             settingsResource,
             this.configurationParseOptions,
             uriIdentityService.extUri,
-            this.fileService
+            this.fileService,
+            logService
         ));
         this.userConfigurationChangeDisposable.value = this.userConfiguration.value.onDidChange(() => this.reloadConfigurationScheduler.schedule());
         this.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(
@@ -188,10 +189,10 @@ class FileServiceBasedConfiguration extends Disposable {
             resource => combinedDisposable(this.fileService.watch(uriIdentityService.extUri.dirname(resource)),
             this.fileService.watch(resource))
         ))));
-        this._folderSettingsModelParser = ( new ConfigurationModelParser(name));
+        this._folderSettingsModelParser = ( new ConfigurationModelParser(name, logService));
         this._folderSettingsParseOptions = configurationParseOptions;
         this._standAloneConfigurations = [];
-        this._cache = ( new ConfigurationModel());
+        this._cache = ConfigurationModel.createEmptyModel(this.logService);
         this._register(Event.debounce(Event.any(Event.filter(this.fileService.onDidFilesChange, e => this.handleFileChangesEvent(e)), Event.filter(this.fileService.onDidRunOperation, e => this.handleFileOperationEvent(e))), () => undefined, 100)(() => this._onDidChange.fire()));
     }
     async resolveContents(donotResolveSettings) {
@@ -229,7 +230,7 @@ class FileServiceBasedConfiguration extends Disposable {
         for (let index = 0; index < standAloneConfigurationContents.length; index++) {
             const contents = standAloneConfigurationContents[index][1];
             if (contents !== undefined) {
-                const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(( this.standAloneConfigurationResources[index][1].toString()), this.standAloneConfigurationResources[index][0]));
+                const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(( this.standAloneConfigurationResources[index][1].toString()), this.standAloneConfigurationResources[index][0], this.logService));
                 standAloneConfigurationModelParser.parse(contents);
                 this._standAloneConfigurations.push(standAloneConfigurationModelParser.configurationModel);
             }
@@ -279,7 +280,7 @@ class FileServiceBasedConfiguration extends Disposable {
     }
 }
 class RemoteUserConfiguration extends Disposable {
-    constructor(remoteAuthority, configurationCache, fileService, uriIdentityService, remoteAgentService) {
+    constructor(remoteAuthority, configurationCache, fileService, uriIdentityService, remoteAgentService, logService) {
         super();
         this._userConfigurationInitializationPromise = null;
         this._onDidChangeConfiguration = this._register(( new Emitter()));
@@ -287,14 +288,20 @@ class RemoteUserConfiguration extends Disposable {
         this._onDidInitialize = this._register(( new Emitter()));
         this.onDidInitialize = this._onDidInitialize.event;
         this._fileService = fileService;
-        this._userConfiguration = this._cachedConfiguration = ( new CachedRemoteUserConfiguration(remoteAuthority, configurationCache, { scopes: REMOTE_MACHINE_SCOPES }));
+        this._userConfiguration = this._cachedConfiguration = ( new CachedRemoteUserConfiguration(
+            remoteAuthority,
+            configurationCache,
+            { scopes: REMOTE_MACHINE_SCOPES },
+            logService
+        ));
         remoteAgentService.getEnvironment().then(async (environment) => {
             if (environment) {
                 const userConfiguration = this._register(( new FileServiceBasedRemoteUserConfiguration(
                     environment.settingsPath,
                     { scopes: REMOTE_MACHINE_SCOPES },
                     this._fileService,
-                    uriIdentityService
+                    uriIdentityService,
+                    logService
                 )));
                 this._register(userConfiguration.onDidChangeConfiguration(configurationModel => this.onDidUserConfigurationChange(configurationModel)));
                 this._userConfigurationInitializationPromise = userConfiguration.initialize();
@@ -346,16 +353,17 @@ class RemoteUserConfiguration extends Disposable {
     }
 }
 class FileServiceBasedRemoteUserConfiguration extends Disposable {
-    constructor(configurationResource, configurationParseOptions, fileService, uriIdentityService) {
+    constructor(configurationResource, configurationParseOptions, fileService, uriIdentityService, logService) {
         super();
         this.configurationResource = configurationResource;
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
+        this.logService = logService;
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
         this.fileWatcherDisposable = this._register(( new MutableDisposable()));
         this.directoryWatcherDisposable = this._register(( new MutableDisposable()));
-        this.parser = ( new ConfigurationModelParser(( this.configurationResource.toString())));
+        this.parser = ( new ConfigurationModelParser(( this.configurationResource.toString()), logService));
         this.parseOptions = configurationParseOptions;
         this._register(fileService.onDidFilesChange(e => this.handleFileChangesEvent(e)));
         this._register(fileService.onDidRunOperation(e => this.handleFileOperationEvent(e)));
@@ -397,7 +405,7 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
             return this.parser.configurationModel;
         }
         catch (e) {
-            return ( new ConfigurationModel());
+            return ConfigurationModel.createEmptyModel(this.logService);
         }
     }
     reparse(configurationParseOptions) {
@@ -440,15 +448,15 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
     }
 }
 class CachedRemoteUserConfiguration extends Disposable {
-    constructor(remoteAuthority, configurationCache, configurationParseOptions) {
+    constructor(remoteAuthority, configurationCache, configurationParseOptions, logService) {
         super();
         this.configurationCache = configurationCache;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this.key = { type: 'user', key: remoteAuthority };
-        this.parser = ( new ConfigurationModelParser('CachedRemoteUserConfiguration'));
+        this.parser = ( new ConfigurationModelParser('CachedRemoteUserConfiguration', logService));
         this.parseOptions = configurationParseOptions;
-        this.configurationModel = ( new ConfigurationModel());
+        this.configurationModel = ConfigurationModel.createEmptyModel(logService);
     }
     getConfigurationModel() {
         return this.configurationModel;
@@ -501,7 +509,7 @@ class WorkspaceConfiguration extends Disposable {
         this.onDidUpdateConfiguration = this._onDidUpdateConfiguration.event;
         this._initialized = false;
         this.fileService = fileService;
-        this._workspaceConfiguration = this._cachedConfiguration = ( new CachedWorkspaceConfiguration(configurationCache));
+        this._workspaceConfiguration = this._cachedConfiguration = ( new CachedWorkspaceConfiguration(configurationCache, logService));
     }
     async initialize(workspaceIdentifier, workspaceTrusted) {
         this._workspaceIdentifier = workspaceIdentifier;
@@ -589,8 +597,8 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
         this._workspaceIdentifier = null;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(''));
-        this.workspaceSettings = ( new ConfigurationModel());
+        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.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(() => this._onDidChange.fire(), 50)));
         this.workspaceConfigWatcher = this._register(this.watchWorkspaceConfigurationFile());
@@ -605,7 +613,7 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
     async load(workspaceIdentifier, configurationParseOptions) {
         if (!this._workspaceIdentifier || this._workspaceIdentifier.id !== workspaceIdentifier.id) {
             this._workspaceIdentifier = workspaceIdentifier;
-            this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(this._workspaceIdentifier.id));
+            this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(this._workspaceIdentifier.id, this.logService));
             dispose(this.workspaceConfigWatcher);
             this.workspaceConfigWatcher = this._register(this.watchWorkspaceConfigurationFile());
         }
@@ -650,11 +658,12 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable {
     }
 }
 class CachedWorkspaceConfiguration {
-    constructor(configurationCache) {
+    constructor(configurationCache, logService) {
         this.configurationCache = configurationCache;
+        this.logService = logService;
         this.onDidChange = Event.None;
-        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(''));
-        this.workspaceSettings = ( new ConfigurationModel());
+        this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser('', logService));
+        this.workspaceSettings = ConfigurationModel.createEmptyModel(logService);
     }
     async load(workspaceIdentifier, configurationParseOptions) {
         try {
@@ -662,7 +671,7 @@ class CachedWorkspaceConfiguration {
             const contents = await this.configurationCache.read(key);
             const parsed = JSON.parse(contents);
             if (parsed.content) {
-                this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(key.key));
+                this.workspaceConfigurationModelParser = ( new WorkspaceConfigurationModelParser(key.key, this.logService));
                 this.workspaceConfigurationModelParser.parse(parsed.content, configurationParseOptions);
                 this.consolidate();
             }
@@ -717,14 +726,15 @@ class CachedWorkspaceConfiguration {
     }
 }
 class CachedFolderConfiguration {
-    constructor(folder, configFolderRelativePath, configurationParseOptions, configurationCache) {
+    constructor(folder, configFolderRelativePath, configurationParseOptions, configurationCache, logService) {
         this.configurationCache = configurationCache;
+        this.logService = logService;
         this.onDidChange = Event.None;
         this.key = { type: 'folder', key: ( hash(( joinPath(folder, configFolderRelativePath).toString())).toString(16)) };
-        this._folderSettingsModelParser = ( new ConfigurationModelParser('CachedFolderConfiguration'));
+        this._folderSettingsModelParser = ( new ConfigurationModelParser('CachedFolderConfiguration', logService));
         this._folderSettingsParseOptions = configurationParseOptions;
         this._standAloneConfigurations = [];
-        this.configurationModel = ( new ConfigurationModel());
+        this.configurationModel = ConfigurationModel.createEmptyModel(logService);
     }
     async loadConfiguration() {
         try {
@@ -736,7 +746,7 @@ class CachedFolderConfiguration {
                         this._folderSettingsModelParser.parse(configurationContents[key], this._folderSettingsParseOptions);
                     }
                     else {
-                        const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(key, key));
+                        const standAloneConfigurationModelParser = ( new StandaloneConfigurationModelParser(key, key, this.logService));
                         standAloneConfigurationModelParser.parse(configurationContents[key]);
                         this._standAloneConfigurations.push(standAloneConfigurationModelParser.configurationModel);
                     }
@@ -796,7 +806,8 @@ class FolderConfiguration extends Disposable {
             workspaceFolder.uri,
             configFolderRelativePath,
             { scopes: this.scopes, skipRestricted: this.isUntrusted() },
-            configurationCache
+            configurationCache,
+            logService
         ));
         if (useCache && this.configurationCache.needsCaching(workspaceFolder.uri)) {
             this.folderConfiguration = this.cachedFolderConfiguration;