@codingame/monaco-vscode-configuration-service-override 4.5.0 → 4.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +2 -5
- package/package.json +3 -3
- package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js +89 -188
- package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js +33 -43
- package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +120 -113
- package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +103 -142
- package/vscode/src/vs/workbench/services/label/common/labelService.js +39 -63
- package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +39 -48
- package/configuration.d.ts +0 -29
|
@@ -36,6 +36,7 @@ import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/commo
|
|
|
36
36
|
import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
|
|
37
37
|
import { runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
|
|
38
38
|
|
|
39
|
+
const _moduleId = "vs/workbench/services/configuration/browser/configurationService";
|
|
39
40
|
function getLocalUserConfigurationScopes(userDataProfile, hasRemote) {
|
|
40
41
|
return (userDataProfile.isDefault || userDataProfile.useDefaultFlags?.settings)
|
|
41
42
|
? hasRemote ? LOCAL_MACHINE_SCOPES : undefined
|
|
@@ -60,58 +61,58 @@ class WorkspaceService extends Disposable {
|
|
|
60
61
|
this.initialized = false;
|
|
61
62
|
this.applicationConfiguration = null;
|
|
62
63
|
this.remoteUserConfiguration = null;
|
|
63
|
-
this._onDidChangeConfiguration = this._register(( new Emitter()));
|
|
64
|
+
this._onDidChangeConfiguration = this._register(( (new Emitter())));
|
|
64
65
|
this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
|
|
65
|
-
this._onWillChangeWorkspaceFolders = this._register(( new Emitter()));
|
|
66
|
+
this._onWillChangeWorkspaceFolders = this._register(( (new Emitter())));
|
|
66
67
|
this.onWillChangeWorkspaceFolders = this._onWillChangeWorkspaceFolders.event;
|
|
67
|
-
this._onDidChangeWorkspaceFolders = this._register(( new Emitter()));
|
|
68
|
+
this._onDidChangeWorkspaceFolders = this._register(( (new Emitter())));
|
|
68
69
|
this.onDidChangeWorkspaceFolders = this._onDidChangeWorkspaceFolders.event;
|
|
69
|
-
this._onDidChangeWorkspaceName = this._register(( new Emitter()));
|
|
70
|
+
this._onDidChangeWorkspaceName = this._register(( (new Emitter())));
|
|
70
71
|
this.onDidChangeWorkspaceName = this._onDidChangeWorkspaceName.event;
|
|
71
|
-
this._onDidChangeWorkbenchState = this._register(( new Emitter()));
|
|
72
|
+
this._onDidChangeWorkbenchState = this._register(( (new Emitter())));
|
|
72
73
|
this.onDidChangeWorkbenchState = this._onDidChangeWorkbenchState.event;
|
|
73
74
|
this.isWorkspaceTrusted = true;
|
|
74
75
|
this._restrictedSettings = { default: [] };
|
|
75
|
-
this._onDidChangeRestrictedSettings = this._register(( new Emitter()));
|
|
76
|
+
this._onDidChangeRestrictedSettings = this._register(( (new Emitter())));
|
|
76
77
|
this.onDidChangeRestrictedSettings = this._onDidChangeRestrictedSettings.event;
|
|
77
|
-
this.configurationRegistry = ( Registry.as(Extensions.Configuration));
|
|
78
|
-
this.initRemoteUserConfigurationBarrier = ( new Barrier());
|
|
79
|
-
this.completeWorkspaceBarrier = ( new Barrier());
|
|
80
|
-
this.defaultConfiguration = this._register(( new DefaultConfiguration(configurationCache, environmentService)));
|
|
81
|
-
this.policyConfiguration = policyService instanceof NullPolicyService ? ( new NullPolicyConfiguration()) : this._register(( new PolicyConfiguration(this.defaultConfiguration, policyService, logService)));
|
|
78
|
+
this.configurationRegistry = ( (Registry.as(Extensions.Configuration)));
|
|
79
|
+
this.initRemoteUserConfigurationBarrier = ( (new Barrier()));
|
|
80
|
+
this.completeWorkspaceBarrier = ( (new Barrier()));
|
|
81
|
+
this.defaultConfiguration = this._register(( (new DefaultConfiguration(configurationCache, environmentService))));
|
|
82
|
+
this.policyConfiguration = policyService instanceof NullPolicyService ? ( (new NullPolicyConfiguration())) : this._register(( (new PolicyConfiguration(this.defaultConfiguration, policyService, logService))));
|
|
82
83
|
this.configurationCache = configurationCache;
|
|
83
|
-
this._configuration = ( new Configuration(
|
|
84
|
+
this._configuration = ( (new Configuration(
|
|
84
85
|
this.defaultConfiguration.configurationModel,
|
|
85
86
|
this.policyConfiguration.configurationModel,
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
87
|
+
(new ConfigurationModel()),
|
|
88
|
+
(new ConfigurationModel()),
|
|
89
|
+
(new ConfigurationModel()),
|
|
90
|
+
(new ConfigurationModel()),
|
|
91
|
+
(new ResourceMap()),
|
|
92
|
+
(new ConfigurationModel()),
|
|
93
|
+
(new ResourceMap()),
|
|
93
94
|
this.workspace
|
|
94
|
-
));
|
|
95
|
-
this.applicationConfigurationDisposables = this._register(( new DisposableStore()));
|
|
95
|
+
)));
|
|
96
|
+
this.applicationConfigurationDisposables = this._register(( (new DisposableStore())));
|
|
96
97
|
this.createApplicationConfiguration();
|
|
97
|
-
this.localUserConfiguration = this._register(( new UserConfiguration(
|
|
98
|
+
this.localUserConfiguration = this._register(( (new UserConfiguration(
|
|
98
99
|
userDataProfileService.currentProfile.settingsResource,
|
|
99
100
|
userDataProfileService.currentProfile.tasksResource,
|
|
100
101
|
{ scopes: getLocalUserConfigurationScopes(userDataProfileService.currentProfile, !!remoteAuthority) },
|
|
101
102
|
fileService,
|
|
102
103
|
uriIdentityService,
|
|
103
104
|
logService
|
|
104
|
-
)));
|
|
105
|
-
this.cachedFolderConfigs = ( new ResourceMap());
|
|
105
|
+
))));
|
|
106
|
+
this.cachedFolderConfigs = ( (new ResourceMap()));
|
|
106
107
|
this._register(this.localUserConfiguration.onDidChangeConfiguration(userConfiguration => this.onLocalUserConfigurationChanged(userConfiguration)));
|
|
107
108
|
if (remoteAuthority) {
|
|
108
|
-
const remoteUserConfiguration = this.remoteUserConfiguration = this._register(( new RemoteUserConfiguration(
|
|
109
|
+
const remoteUserConfiguration = this.remoteUserConfiguration = this._register(( (new RemoteUserConfiguration(
|
|
109
110
|
remoteAuthority,
|
|
110
111
|
configurationCache,
|
|
111
112
|
fileService,
|
|
112
113
|
uriIdentityService,
|
|
113
114
|
remoteAgentService
|
|
114
|
-
)));
|
|
115
|
+
))));
|
|
115
116
|
this._register(remoteUserConfiguration.onDidInitialize(remoteUserConfigurationModel => {
|
|
116
117
|
this._register(remoteUserConfiguration.onDidChangeConfiguration(remoteUserConfigurationModel => this.onRemoteUserConfigurationChanged(remoteUserConfigurationModel)));
|
|
117
118
|
this.onRemoteUserConfigurationChanged(remoteUserConfigurationModel);
|
|
@@ -121,7 +122,7 @@ class WorkspaceService extends Disposable {
|
|
|
121
122
|
else {
|
|
122
123
|
this.initRemoteUserConfigurationBarrier.open();
|
|
123
124
|
}
|
|
124
|
-
this.workspaceConfiguration = this._register(( new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService)));
|
|
125
|
+
this.workspaceConfiguration = this._register(( (new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService))));
|
|
125
126
|
this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => {
|
|
126
127
|
this.onWorkspaceConfigurationChanged(fromCache).then(() => {
|
|
127
128
|
this.workspace.initialized = this.workspaceConfiguration.initialized;
|
|
@@ -131,7 +132,7 @@ class WorkspaceService extends Disposable {
|
|
|
131
132
|
this._register(this.defaultConfiguration.onDidChangeConfiguration(({ properties, defaults }) => this.onDefaultConfigurationChanged(defaults, properties)));
|
|
132
133
|
this._register(this.policyConfiguration.onDidChangeConfiguration(configurationModel => this.onPolicyConfigurationChanged(configurationModel)));
|
|
133
134
|
this._register(userDataProfileService.onDidChangeCurrentProfile(e => this.onUserDataProfileChanged(e)));
|
|
134
|
-
this.workspaceEditingQueue = ( new Queue());
|
|
135
|
+
this.workspaceEditingQueue = ( (new Queue()));
|
|
135
136
|
}
|
|
136
137
|
createApplicationConfiguration() {
|
|
137
138
|
this.applicationConfigurationDisposables.clear();
|
|
@@ -139,7 +140,7 @@ class WorkspaceService extends Disposable {
|
|
|
139
140
|
this.applicationConfiguration = null;
|
|
140
141
|
}
|
|
141
142
|
else {
|
|
142
|
-
this.applicationConfiguration = this.applicationConfigurationDisposables.add(this._register(( new ApplicationConfiguration(this.userDataProfilesService, this.fileService, this.uriIdentityService))));
|
|
143
|
+
this.applicationConfiguration = this.applicationConfigurationDisposables.add(this._register(( (new ApplicationConfiguration(this.userDataProfilesService, this.fileService, this.uriIdentityService)))));
|
|
143
144
|
this.applicationConfigurationDisposables.add(this.applicationConfiguration.onDidChangeConfiguration(configurationModel => this.onApplicationConfigurationChanged(configurationModel)));
|
|
144
145
|
}
|
|
145
146
|
}
|
|
@@ -200,7 +201,7 @@ class WorkspaceService extends Disposable {
|
|
|
200
201
|
}
|
|
201
202
|
let foldersHaveChanged = false;
|
|
202
203
|
let currentWorkspaceFolders = this.getWorkspace().folders;
|
|
203
|
-
let newStoredFolders = ( currentWorkspaceFolders.map(f => f.raw)).filter((folder, index) => {
|
|
204
|
+
let newStoredFolders = ( (currentWorkspaceFolders.map(f => f.raw))).filter((folder, index) => {
|
|
204
205
|
if (!isStoredWorkspaceFolder(folder)) {
|
|
205
206
|
return true;
|
|
206
207
|
}
|
|
@@ -211,7 +212,7 @@ class WorkspaceService extends Disposable {
|
|
|
211
212
|
const workspaceConfigPath = this.getWorkspace().configuration;
|
|
212
213
|
const workspaceConfigFolder = this.uriIdentityService.extUri.dirname(workspaceConfigPath);
|
|
213
214
|
currentWorkspaceFolders = toWorkspaceFolders(newStoredFolders, workspaceConfigPath, this.uriIdentityService.extUri);
|
|
214
|
-
const currentWorkspaceFolderUris = ( currentWorkspaceFolders.map(folder => folder.uri));
|
|
215
|
+
const currentWorkspaceFolderUris = ( (currentWorkspaceFolders.map(folder => folder.uri)));
|
|
215
216
|
const storedFoldersToAdd = [];
|
|
216
217
|
for (const folderToAdd of foldersToAdd) {
|
|
217
218
|
const folderURI = folderToAdd.uri;
|
|
@@ -245,13 +246,17 @@ class WorkspaceService extends Disposable {
|
|
|
245
246
|
}
|
|
246
247
|
async setFolders(folders) {
|
|
247
248
|
if (!this.instantiationService) {
|
|
248
|
-
throw new Error(
|
|
249
|
+
throw ( (new Error(
|
|
250
|
+
'Cannot update workspace folders because workspace service is not yet ready to accept writes.'
|
|
251
|
+
)));
|
|
249
252
|
}
|
|
250
253
|
await this.instantiationService.invokeFunction(accessor => this.workspaceConfiguration.setFolders(folders, accessor.get(IJSONEditingService)));
|
|
251
254
|
return this.onWorkspaceConfigurationChanged(false);
|
|
252
255
|
}
|
|
253
256
|
contains(resources, toCheck) {
|
|
254
|
-
return (
|
|
257
|
+
return (
|
|
258
|
+
(resources.some(resource => this.uriIdentityService.extUri.isEqual(resource, toCheck)))
|
|
259
|
+
);
|
|
255
260
|
}
|
|
256
261
|
getConfigurationData() {
|
|
257
262
|
return this._configuration.toData();
|
|
@@ -272,7 +277,9 @@ class WorkspaceService extends Disposable {
|
|
|
272
277
|
}
|
|
273
278
|
if (!targets.length) {
|
|
274
279
|
if (overrides?.overrideIdentifiers && overrides.overrideIdentifiers.length > 1) {
|
|
275
|
-
throw new Error(
|
|
280
|
+
throw ( (new Error(
|
|
281
|
+
'Configuration Target is required while updating the value for multiple override identifiers'
|
|
282
|
+
)));
|
|
276
283
|
}
|
|
277
284
|
const inspect = this.inspect(key, { resource: overrides?.resource, overrideIdentifier: overrides?.overrideIdentifiers ? overrides.overrideIdentifiers[0] : undefined });
|
|
278
285
|
targets.push(...this.deriveConfigurationTargets(key, value, inspect));
|
|
@@ -280,9 +287,9 @@ class WorkspaceService extends Disposable {
|
|
|
280
287
|
value = undefined;
|
|
281
288
|
}
|
|
282
289
|
}
|
|
283
|
-
await Promises.settled(( targets.map(
|
|
290
|
+
await Promises.settled(( (targets.map(
|
|
284
291
|
target => this.writeConfigurationValue(key, value, target, overrides, options)
|
|
285
|
-
)));
|
|
292
|
+
))));
|
|
286
293
|
}
|
|
287
294
|
async reloadConfiguration(target) {
|
|
288
295
|
if (target === undefined) {
|
|
@@ -325,7 +332,9 @@ class WorkspaceService extends Disposable {
|
|
|
325
332
|
return this._configuration.inspect(key, overrides);
|
|
326
333
|
}
|
|
327
334
|
keys() {
|
|
328
|
-
return (
|
|
335
|
+
return (
|
|
336
|
+
(this._configuration.keys())
|
|
337
|
+
);
|
|
329
338
|
}
|
|
330
339
|
async whenRemoteConfigurationLoaded() {
|
|
331
340
|
await this.initRemoteUserConfigurationBarrier.wait();
|
|
@@ -403,35 +412,35 @@ class WorkspaceService extends Disposable {
|
|
|
403
412
|
const workspaceConfigPath = workspaceIdentifier.configPath;
|
|
404
413
|
const workspaceFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), workspaceConfigPath, this.uriIdentityService.extUri);
|
|
405
414
|
const workspaceId = workspaceIdentifier.id;
|
|
406
|
-
const workspace = ( new Workspace(
|
|
415
|
+
const workspace = ( (new Workspace(
|
|
407
416
|
workspaceId,
|
|
408
417
|
workspaceFolders,
|
|
409
418
|
this.workspaceConfiguration.isTransient(),
|
|
410
419
|
workspaceConfigPath,
|
|
411
420
|
uri => this.uriIdentityService.extUri.ignorePathCasing(uri)
|
|
412
|
-
));
|
|
421
|
+
)));
|
|
413
422
|
workspace.initialized = this.workspaceConfiguration.initialized;
|
|
414
423
|
return workspace;
|
|
415
424
|
}
|
|
416
425
|
createSingleFolderWorkspace(singleFolderWorkspaceIdentifier) {
|
|
417
|
-
const workspace = ( new Workspace(
|
|
426
|
+
const workspace = ( (new Workspace(
|
|
418
427
|
singleFolderWorkspaceIdentifier.id,
|
|
419
428
|
[toWorkspaceFolder(singleFolderWorkspaceIdentifier.uri)],
|
|
420
429
|
false,
|
|
421
430
|
null,
|
|
422
431
|
uri => this.uriIdentityService.extUri.ignorePathCasing(uri)
|
|
423
|
-
));
|
|
432
|
+
)));
|
|
424
433
|
workspace.initialized = true;
|
|
425
434
|
return workspace;
|
|
426
435
|
}
|
|
427
436
|
createEmptyWorkspace(emptyWorkspaceIdentifier) {
|
|
428
|
-
const workspace = ( new Workspace(
|
|
437
|
+
const workspace = ( (new Workspace(
|
|
429
438
|
emptyWorkspaceIdentifier.id,
|
|
430
439
|
[],
|
|
431
440
|
false,
|
|
432
441
|
null,
|
|
433
442
|
uri => this.uriIdentityService.extUri.ignorePathCasing(uri)
|
|
434
|
-
));
|
|
443
|
+
)));
|
|
435
444
|
workspace.initialized = true;
|
|
436
445
|
return Promise.resolve(workspace);
|
|
437
446
|
}
|
|
@@ -477,11 +486,13 @@ class WorkspaceService extends Disposable {
|
|
|
477
486
|
}
|
|
478
487
|
compareFolders(currentFolders, newFolders) {
|
|
479
488
|
const result = { added: [], removed: [], changed: [] };
|
|
480
|
-
result.added = newFolders.filter(newFolder => !( currentFolders.some(
|
|
489
|
+
result.added = newFolders.filter(newFolder => !( (currentFolders.some(
|
|
490
|
+
currentFolder => ( (newFolder.uri.toString())) === ( (currentFolder.uri.toString()))
|
|
491
|
+
))));
|
|
481
492
|
for (let currentIndex = 0; currentIndex < currentFolders.length; currentIndex++) {
|
|
482
493
|
const currentFolder = currentFolders[currentIndex];
|
|
483
494
|
let newIndex = 0;
|
|
484
|
-
for (newIndex = 0; newIndex < newFolders.length && ( currentFolder.uri.toString()) !== ( newFolders[newIndex].uri.toString()); newIndex++) { }
|
|
495
|
+
for (newIndex = 0; newIndex < newFolders.length && ( (currentFolder.uri.toString())) !== ( (newFolders[newIndex].uri.toString())); newIndex++) { }
|
|
485
496
|
if (newIndex < newFolders.length) {
|
|
486
497
|
if (currentIndex !== newIndex || currentFolder.name !== newFolders[newIndex].name) {
|
|
487
498
|
result.changed.push(currentFolder);
|
|
@@ -496,10 +507,10 @@ class WorkspaceService extends Disposable {
|
|
|
496
507
|
async initializeConfiguration(trigger) {
|
|
497
508
|
await this.defaultConfiguration.initialize();
|
|
498
509
|
const initPolicyConfigurationPromise = this.policyConfiguration.initialize();
|
|
499
|
-
const initApplicationConfigurationPromise = this.applicationConfiguration ? this.applicationConfiguration.initialize() : Promise.resolve(( new ConfigurationModel()));
|
|
510
|
+
const initApplicationConfigurationPromise = this.applicationConfiguration ? this.applicationConfiguration.initialize() : Promise.resolve(( (new ConfigurationModel())));
|
|
500
511
|
const initUserConfiguration = async () => {
|
|
501
512
|
mark('code/willInitUserConfiguration');
|
|
502
|
-
const result = await Promise.all([this.localUserConfiguration.initialize(), this.remoteUserConfiguration ? this.remoteUserConfiguration.initialize() : Promise.resolve(( new ConfigurationModel()))]);
|
|
513
|
+
const result = await Promise.all([this.localUserConfiguration.initialize(), this.remoteUserConfiguration ? this.remoteUserConfiguration.initialize() : Promise.resolve(( (new ConfigurationModel())))]);
|
|
503
514
|
if (this.applicationConfiguration) {
|
|
504
515
|
const applicationConfigurationModel = await initApplicationConfigurationPromise;
|
|
505
516
|
result[0] = this.localUserConfiguration.reparse({ exclude: applicationConfigurationModel.getValue(APPLY_ALL_PROFILES_SETTING) });
|
|
@@ -521,7 +532,9 @@ class WorkspaceService extends Disposable {
|
|
|
521
532
|
}
|
|
522
533
|
async reloadApplicationConfiguration(donotTrigger) {
|
|
523
534
|
if (!this.applicationConfiguration) {
|
|
524
|
-
return (
|
|
535
|
+
return (
|
|
536
|
+
(new ConfigurationModel())
|
|
537
|
+
);
|
|
525
538
|
}
|
|
526
539
|
const model = await this.applicationConfiguration.loadConfiguration();
|
|
527
540
|
if (!donotTrigger) {
|
|
@@ -548,7 +561,9 @@ class WorkspaceService extends Disposable {
|
|
|
548
561
|
}
|
|
549
562
|
return model;
|
|
550
563
|
}
|
|
551
|
-
return (
|
|
564
|
+
return (
|
|
565
|
+
(new ConfigurationModel())
|
|
566
|
+
);
|
|
552
567
|
}
|
|
553
568
|
async reloadWorkspaceConfiguration() {
|
|
554
569
|
const workbenchState = this.getWorkbenchState();
|
|
@@ -563,14 +578,14 @@ class WorkspaceService extends Disposable {
|
|
|
563
578
|
return this.onWorkspaceFolderConfigurationChanged(folder);
|
|
564
579
|
}
|
|
565
580
|
async loadConfiguration(applicationConfigurationModel, userConfigurationModel, remoteUserConfigurationModel, trigger) {
|
|
566
|
-
this.cachedFolderConfigs = ( new ResourceMap());
|
|
581
|
+
this.cachedFolderConfigs = ( (new ResourceMap()));
|
|
567
582
|
const folders = this.workspace.folders;
|
|
568
583
|
const folderConfigurations = await this.loadFolderConfigurations(folders);
|
|
569
584
|
const workspaceConfiguration = this.getWorkspaceConfigurationModel(folderConfigurations);
|
|
570
|
-
const folderConfigurationModels = ( new ResourceMap());
|
|
585
|
+
const folderConfigurationModels = ( (new ResourceMap()));
|
|
571
586
|
folderConfigurations.forEach((folderConfiguration, index) => folderConfigurationModels.set(folders[index].uri, folderConfiguration));
|
|
572
587
|
const currentConfiguration = this._configuration;
|
|
573
|
-
this._configuration = ( new Configuration(
|
|
588
|
+
this._configuration = ( (new Configuration(
|
|
574
589
|
this.defaultConfiguration.configurationModel,
|
|
575
590
|
this.policyConfiguration.configurationModel,
|
|
576
591
|
applicationConfigurationModel,
|
|
@@ -578,10 +593,10 @@ class WorkspaceService extends Disposable {
|
|
|
578
593
|
remoteUserConfigurationModel,
|
|
579
594
|
workspaceConfiguration,
|
|
580
595
|
folderConfigurationModels,
|
|
581
|
-
|
|
582
|
-
|
|
596
|
+
(new ConfigurationModel()),
|
|
597
|
+
(new ResourceMap()),
|
|
583
598
|
this.workspace
|
|
584
|
-
));
|
|
599
|
+
)));
|
|
585
600
|
this.initialized = true;
|
|
586
601
|
if (trigger) {
|
|
587
602
|
const change = this._configuration.compare(currentConfiguration);
|
|
@@ -596,7 +611,9 @@ class WorkspaceService extends Disposable {
|
|
|
596
611
|
case 3 :
|
|
597
612
|
return this.workspaceConfiguration.getConfiguration();
|
|
598
613
|
default:
|
|
599
|
-
return (
|
|
614
|
+
return (
|
|
615
|
+
(new ConfigurationModel())
|
|
616
|
+
);
|
|
600
617
|
}
|
|
601
618
|
}
|
|
602
619
|
onUserDataProfileChanged(e) {
|
|
@@ -715,7 +732,7 @@ class WorkspaceService extends Disposable {
|
|
|
715
732
|
updateRestrictedSettings() {
|
|
716
733
|
const changed = [];
|
|
717
734
|
const allProperties = this.configurationRegistry.getConfigurationProperties();
|
|
718
|
-
const defaultRestrictedSettings = ( Object.keys(allProperties)).filter(key => allProperties[key].restricted).sort((a, b) => a.localeCompare(b));
|
|
735
|
+
const defaultRestrictedSettings = ( (Object.keys(allProperties))).filter(key => allProperties[key].restricted).sort((a, b) => a.localeCompare(b));
|
|
719
736
|
const defaultDelta = delta(defaultRestrictedSettings, this._restrictedSettings.default, (a, b) => a.localeCompare(b));
|
|
720
737
|
changed.push(...defaultDelta.added, ...defaultDelta.removed);
|
|
721
738
|
const application = (this.applicationConfiguration?.getRestrictedSettings() || []).sort((a, b) => a.localeCompare(b));
|
|
@@ -727,7 +744,7 @@ class WorkspaceService extends Disposable {
|
|
|
727
744
|
const userRemote = (this.remoteUserConfiguration?.getRestrictedSettings() || []).sort((a, b) => a.localeCompare(b));
|
|
728
745
|
const userRemoteDelta = delta(userRemote, this._restrictedSettings.userRemote || [], (a, b) => a.localeCompare(b));
|
|
729
746
|
changed.push(...userRemoteDelta.added, ...userRemoteDelta.removed);
|
|
730
|
-
const workspaceFolderMap = ( new ResourceMap());
|
|
747
|
+
const workspaceFolderMap = ( (new ResourceMap()));
|
|
731
748
|
for (const workspaceFolder of this.workspace.folders) {
|
|
732
749
|
const cachedFolderConfig = this.cachedFolderConfigs.get(workspaceFolder.uri);
|
|
733
750
|
const folderRestrictedSettings = (cachedFolderConfig?.getRestrictedSettings() || []).sort((a, b) => a.localeCompare(b));
|
|
@@ -799,15 +816,15 @@ class WorkspaceService extends Disposable {
|
|
|
799
816
|
}
|
|
800
817
|
async onFoldersChanged() {
|
|
801
818
|
const changes = [];
|
|
802
|
-
for (const key of ( this.cachedFolderConfigs.keys())) {
|
|
803
|
-
if (!this.workspace.folders.filter(folder => ( folder.uri.toString()) === ( key.toString()))[0]) {
|
|
819
|
+
for (const key of ( (this.cachedFolderConfigs.keys()))) {
|
|
820
|
+
if (!this.workspace.folders.filter(folder => ( (folder.uri.toString())) === ( (key.toString())))[0]) {
|
|
804
821
|
const folderConfiguration = this.cachedFolderConfigs.get(key);
|
|
805
822
|
folderConfiguration.dispose();
|
|
806
823
|
this.cachedFolderConfigs.delete(key);
|
|
807
824
|
changes.push(this._configuration.compareAndDeleteFolderConfiguration(key));
|
|
808
825
|
}
|
|
809
826
|
}
|
|
810
|
-
const toInitialize = this.workspace.folders.filter(folder => !( this.cachedFolderConfigs.has(folder.uri)));
|
|
827
|
+
const toInitialize = this.workspace.folders.filter(folder => !( (this.cachedFolderConfigs.has(folder.uri))));
|
|
811
828
|
if (toInitialize.length) {
|
|
812
829
|
const folderConfigurations = await this.loadFolderConfigurations(toInitialize);
|
|
813
830
|
folderConfigurations.forEach((folderConfiguration, index) => {
|
|
@@ -817,10 +834,10 @@ class WorkspaceService extends Disposable {
|
|
|
817
834
|
return mergeChanges(...changes);
|
|
818
835
|
}
|
|
819
836
|
loadFolderConfigurations(folders) {
|
|
820
|
-
return Promise.all([...( folders.map(folder => {
|
|
837
|
+
return Promise.all([...( (folders.map(folder => {
|
|
821
838
|
let folderConfiguration = this.cachedFolderConfigs.get(folder.uri);
|
|
822
839
|
if (!folderConfiguration) {
|
|
823
|
-
folderConfiguration = ( new FolderConfiguration(
|
|
840
|
+
folderConfiguration = ( (new FolderConfiguration(
|
|
824
841
|
!this.initialized,
|
|
825
842
|
folder,
|
|
826
843
|
FOLDER_CONFIG_FOLDER_NAME,
|
|
@@ -830,12 +847,12 @@ class WorkspaceService extends Disposable {
|
|
|
830
847
|
this.uriIdentityService,
|
|
831
848
|
this.logService,
|
|
832
849
|
this.configurationCache
|
|
833
|
-
));
|
|
850
|
+
)));
|
|
834
851
|
this._register(folderConfiguration.onDidChange(() => this.onWorkspaceFolderConfigurationChanged(folder)));
|
|
835
852
|
this.cachedFolderConfigs.set(folder.uri, this._register(folderConfiguration));
|
|
836
853
|
}
|
|
837
854
|
return folderConfiguration.loadConfiguration();
|
|
838
|
-
}))]);
|
|
855
|
+
})))]);
|
|
839
856
|
}
|
|
840
857
|
async validateWorkspaceFoldersAndReload(fromCache) {
|
|
841
858
|
const validWorkspaceFolders = await this.toValidWorkspaceFolders(this.workspace.folders);
|
|
@@ -854,7 +871,7 @@ class WorkspaceService extends Disposable {
|
|
|
854
871
|
}
|
|
855
872
|
}
|
|
856
873
|
catch (e) {
|
|
857
|
-
this.logService.warn(`Ignoring the error while validating workspace folder ${( workspaceFolder.uri.toString())} - ${toErrorMessage(e)}`);
|
|
874
|
+
this.logService.warn(`Ignoring the error while validating workspace folder ${( (workspaceFolder.uri.toString()))} - ${toErrorMessage(e)}`);
|
|
858
875
|
}
|
|
859
876
|
validWorkspaceFolders.push(workspaceFolder);
|
|
860
877
|
}
|
|
@@ -862,23 +879,25 @@ class WorkspaceService extends Disposable {
|
|
|
862
879
|
}
|
|
863
880
|
async writeConfigurationValue(key, value, target, overrides, options) {
|
|
864
881
|
if (!this.instantiationService) {
|
|
865
|
-
throw new Error(
|
|
882
|
+
throw ( (new Error(
|
|
883
|
+
'Cannot write configuration because the configuration service is not yet ready to accept writes.'
|
|
884
|
+
)));
|
|
866
885
|
}
|
|
867
886
|
if (target === 7 ) {
|
|
868
|
-
throw new Error('Invalid configuration target');
|
|
887
|
+
throw ( (new Error('Invalid configuration target')));
|
|
869
888
|
}
|
|
870
889
|
if (target === 8 ) {
|
|
871
890
|
const previous = { data: this._configuration.toData(), workspace: this.workspace };
|
|
872
891
|
this._configuration.updateValue(key, value, overrides);
|
|
873
|
-
this.triggerConfigurationChange({ keys: overrides?.overrideIdentifiers?.length ? [keyFromOverrideIdentifiers(overrides.overrideIdentifiers), key] : [key], overrides: overrides?.overrideIdentifiers?.length ? ( overrides.overrideIdentifiers.map(overrideIdentifier => ([overrideIdentifier, [key]]))) : [] }, previous, target);
|
|
892
|
+
this.triggerConfigurationChange({ keys: overrides?.overrideIdentifiers?.length ? [keyFromOverrideIdentifiers(overrides.overrideIdentifiers), key] : [key], overrides: overrides?.overrideIdentifiers?.length ? ( (overrides.overrideIdentifiers.map(overrideIdentifier => ([overrideIdentifier, [key]])))) : [] }, previous, target);
|
|
874
893
|
return;
|
|
875
894
|
}
|
|
876
895
|
const editableConfigurationTarget = this.toEditableConfigurationTarget(target, key);
|
|
877
896
|
if (!editableConfigurationTarget) {
|
|
878
|
-
throw new Error('Invalid configuration target');
|
|
897
|
+
throw ( (new Error('Invalid configuration target')));
|
|
879
898
|
}
|
|
880
899
|
if (editableConfigurationTarget === 2 && !this.remoteUserConfiguration) {
|
|
881
|
-
throw new Error('Invalid configuration target');
|
|
900
|
+
throw ( (new Error('Invalid configuration target')));
|
|
882
901
|
}
|
|
883
902
|
if (overrides?.overrideIdentifiers?.length && overrides.overrideIdentifiers.length > 1) {
|
|
884
903
|
const configurationModel = this.getConfigurationModelForEditableConfigurationTarget(editableConfigurationTarget, overrides.resource);
|
|
@@ -961,7 +980,7 @@ class WorkspaceService extends Disposable {
|
|
|
961
980
|
if (target !== 7 ) {
|
|
962
981
|
this.logService.debug(`Configuration keys changed in ${ConfigurationTargetToString(target)} target`, ...change.keys);
|
|
963
982
|
}
|
|
964
|
-
const configurationChangeEvent = ( new ConfigurationChangeEvent(change, previous, this._configuration, this.workspace));
|
|
983
|
+
const configurationChangeEvent = ( (new ConfigurationChangeEvent(change, previous, this._configuration, this.workspace)));
|
|
965
984
|
configurationChangeEvent.source = target;
|
|
966
985
|
this._onDidChangeConfiguration.fire(configurationChangeEvent);
|
|
967
986
|
}
|
|
@@ -1002,8 +1021,8 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1002
1021
|
this.workspaceTrustManagementService = workspaceTrustManagementService;
|
|
1003
1022
|
extensionService.whenInstalledExtensionsRegistered().then(() => {
|
|
1004
1023
|
this.registerConfigurationSchemas();
|
|
1005
|
-
const configurationRegistry = ( Registry.as(Extensions.Configuration));
|
|
1006
|
-
const delayer = this._register(( new Delayer(50)));
|
|
1024
|
+
const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
|
|
1025
|
+
const delayer = this._register(( (new Delayer(50))));
|
|
1007
1026
|
this._register(Event.any(configurationRegistry.onDidUpdateConfiguration, configurationRegistry.onDidSchemaChange, workspaceTrustManagementService.onDidChangeTrust)(() => delayer.trigger(() => this.registerConfigurationSchemas(), lifecycleService.phase === 4 ? undefined : 2500 )));
|
|
1008
1027
|
});
|
|
1009
1028
|
}
|
|
@@ -1046,11 +1065,11 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1046
1065
|
allowComments: true
|
|
1047
1066
|
};
|
|
1048
1067
|
const defaultSettingsSchema = {
|
|
1049
|
-
properties: ( Object.keys(allSettings.properties)).reduce((result, key) => {
|
|
1068
|
+
properties: ( (Object.keys(allSettings.properties))).reduce((result, key) => {
|
|
1050
1069
|
result[key] = Object.assign({ deprecationMessage: undefined }, allSettings.properties[key]);
|
|
1051
1070
|
return result;
|
|
1052
1071
|
}, {}),
|
|
1053
|
-
patternProperties: ( Object.keys(allSettings.patternProperties)).reduce((result, key) => {
|
|
1072
|
+
patternProperties: ( (Object.keys(allSettings.patternProperties))).reduce((result, key) => {
|
|
1054
1073
|
result[key] = Object.assign({ deprecationMessage: undefined }, allSettings.patternProperties[key]);
|
|
1055
1074
|
return result;
|
|
1056
1075
|
}, {}),
|
|
@@ -1068,11 +1087,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1068
1087
|
} : workspaceSettingsSchema;
|
|
1069
1088
|
const configDefaultsSchema = {
|
|
1070
1089
|
type: 'object',
|
|
1071
|
-
description: ( localizeWithPath(
|
|
1072
|
-
'vs/workbench/services/configuration/browser/configurationService',
|
|
1073
|
-
'configurationDefaults.description',
|
|
1074
|
-
'Contribute defaults for configurations'
|
|
1075
|
-
)),
|
|
1090
|
+
description: ( localizeWithPath(_moduleId, 0, 'Contribute defaults for configurations')),
|
|
1076
1091
|
properties: Object.assign({}, machineOverridableSettings.properties, windowSettings.properties, resourceSettings.properties),
|
|
1077
1092
|
patternProperties: {
|
|
1078
1093
|
[OVERRIDE_PROPERTY_PATTERN]: {
|
|
@@ -1094,7 +1109,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1094
1109
|
});
|
|
1095
1110
|
}
|
|
1096
1111
|
registerSchemas(schemas) {
|
|
1097
|
-
const jsonRegistry = ( Registry.as(Extensions$1.JSONContribution));
|
|
1112
|
+
const jsonRegistry = ( (Registry.as(Extensions$1.JSONContribution)));
|
|
1098
1113
|
jsonRegistry.registerSchema(defaultSettingsSchemaId, schemas.defaultSettingsSchema);
|
|
1099
1114
|
jsonRegistry.registerSchema(userSettingsSchemaId, schemas.userSettingsSchema);
|
|
1100
1115
|
jsonRegistry.registerSchema(profileSettingsSchemaId, schemas.profileSettingsSchema);
|
|
@@ -1116,13 +1131,13 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1116
1131
|
return result;
|
|
1117
1132
|
}
|
|
1118
1133
|
};
|
|
1119
|
-
RegisterConfigurationSchemasContribution = ( __decorate([
|
|
1120
|
-
( __param(0, IWorkspaceContextService)),
|
|
1121
|
-
( __param(1, IWorkbenchEnvironmentService)),
|
|
1122
|
-
( __param(2, IWorkspaceTrustManagementService)),
|
|
1123
|
-
( __param(3, IExtensionService)),
|
|
1124
|
-
( __param(4, ILifecycleService))
|
|
1125
|
-
], RegisterConfigurationSchemasContribution));
|
|
1134
|
+
RegisterConfigurationSchemasContribution = ( (__decorate([
|
|
1135
|
+
( (__param(0, IWorkspaceContextService))),
|
|
1136
|
+
( (__param(1, IWorkbenchEnvironmentService))),
|
|
1137
|
+
( (__param(2, IWorkspaceTrustManagementService))),
|
|
1138
|
+
( (__param(3, IExtensionService))),
|
|
1139
|
+
( (__param(4, ILifecycleService)))
|
|
1140
|
+
], RegisterConfigurationSchemasContribution)));
|
|
1126
1141
|
let ResetConfigurationDefaultsOverridesCache = class ResetConfigurationDefaultsOverridesCache extends Disposable {
|
|
1127
1142
|
constructor(configurationService, extensionService) {
|
|
1128
1143
|
super();
|
|
@@ -1131,18 +1146,18 @@ let ResetConfigurationDefaultsOverridesCache = class ResetConfigurationDefaultsO
|
|
|
1131
1146
|
}
|
|
1132
1147
|
}
|
|
1133
1148
|
};
|
|
1134
|
-
ResetConfigurationDefaultsOverridesCache = ( __decorate([
|
|
1135
|
-
( __param(0, IConfigurationService)),
|
|
1136
|
-
( __param(1, IExtensionService))
|
|
1137
|
-
], ResetConfigurationDefaultsOverridesCache));
|
|
1149
|
+
ResetConfigurationDefaultsOverridesCache = ( (__decorate([
|
|
1150
|
+
( (__param(0, IConfigurationService))),
|
|
1151
|
+
( (__param(1, IExtensionService)))
|
|
1152
|
+
], ResetConfigurationDefaultsOverridesCache)));
|
|
1138
1153
|
let UpdateExperimentalSettingsDefaults = class UpdateExperimentalSettingsDefaults extends Disposable {
|
|
1139
1154
|
static { this.ID = 'workbench.contrib.updateExperimentalSettingsDefaults'; }
|
|
1140
1155
|
constructor(workbenchAssignmentService) {
|
|
1141
1156
|
super();
|
|
1142
1157
|
this.workbenchAssignmentService = workbenchAssignmentService;
|
|
1143
|
-
this.processedExperimentalSettings = ( new Set());
|
|
1144
|
-
this.configurationRegistry = ( Registry.as(Extensions.Configuration));
|
|
1145
|
-
this.processExperimentalSettings(( Object.keys(this.configurationRegistry.getConfigurationProperties())));
|
|
1158
|
+
this.processedExperimentalSettings = ( (new Set()));
|
|
1159
|
+
this.configurationRegistry = ( (Registry.as(Extensions.Configuration)));
|
|
1160
|
+
this.processExperimentalSettings(( (Object.keys(this.configurationRegistry.getConfigurationProperties()))));
|
|
1146
1161
|
this._register(this.configurationRegistry.onDidUpdateConfiguration(({ properties }) => this.processExperimentalSettings(properties)));
|
|
1147
1162
|
}
|
|
1148
1163
|
async processExperimentalSettings(properties) {
|
|
@@ -1153,7 +1168,7 @@ let UpdateExperimentalSettingsDefaults = class UpdateExperimentalSettingsDefault
|
|
|
1153
1168
|
if (!schema?.tags?.includes('experimental')) {
|
|
1154
1169
|
continue;
|
|
1155
1170
|
}
|
|
1156
|
-
if (( this.processedExperimentalSettings.has(property))) {
|
|
1171
|
+
if (( (this.processedExperimentalSettings.has(property)))) {
|
|
1157
1172
|
continue;
|
|
1158
1173
|
}
|
|
1159
1174
|
this.processedExperimentalSettings.add(property);
|
|
@@ -1165,33 +1180,25 @@ let UpdateExperimentalSettingsDefaults = class UpdateExperimentalSettingsDefault
|
|
|
1165
1180
|
}
|
|
1166
1181
|
catch (error) { }
|
|
1167
1182
|
}
|
|
1168
|
-
if (( Object.keys(overrides)).length) {
|
|
1169
|
-
this.configurationRegistry.registerDefaultConfigurations([{ overrides, source: ( localizeWithPath(
|
|
1170
|
-
'vs/workbench/services/configuration/browser/configurationService',
|
|
1171
|
-
'experimental',
|
|
1172
|
-
"Experiments"
|
|
1173
|
-
)) }]);
|
|
1183
|
+
if (( (Object.keys(overrides))).length) {
|
|
1184
|
+
this.configurationRegistry.registerDefaultConfigurations([{ overrides, source: ( localizeWithPath(_moduleId, 1, "Experiments")) }]);
|
|
1174
1185
|
}
|
|
1175
1186
|
}
|
|
1176
1187
|
};
|
|
1177
|
-
UpdateExperimentalSettingsDefaults = ( __decorate([
|
|
1178
|
-
( __param(0, IWorkbenchAssignmentService))
|
|
1179
|
-
], UpdateExperimentalSettingsDefaults));
|
|
1180
|
-
const workbenchContributionsRegistry = ( Registry.as(Extensions$2.Workbench));
|
|
1188
|
+
UpdateExperimentalSettingsDefaults = ( (__decorate([
|
|
1189
|
+
( (__param(0, IWorkbenchAssignmentService)))
|
|
1190
|
+
], UpdateExperimentalSettingsDefaults)));
|
|
1191
|
+
const workbenchContributionsRegistry = ( (Registry.as(Extensions$2.Workbench)));
|
|
1181
1192
|
workbenchContributionsRegistry.registerWorkbenchContribution(RegisterConfigurationSchemasContribution, 3 );
|
|
1182
1193
|
workbenchContributionsRegistry.registerWorkbenchContribution(ResetConfigurationDefaultsOverridesCache, 4 );
|
|
1183
1194
|
registerWorkbenchContribution2(UpdateExperimentalSettingsDefaults.ID, UpdateExperimentalSettingsDefaults, 2 );
|
|
1184
|
-
const configurationRegistry = ( Registry.as(Extensions.Configuration));
|
|
1195
|
+
const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
|
|
1185
1196
|
configurationRegistry.registerConfiguration({
|
|
1186
1197
|
...workbenchConfigurationNodeBase,
|
|
1187
1198
|
properties: {
|
|
1188
1199
|
[APPLY_ALL_PROFILES_SETTING]: {
|
|
1189
1200
|
'type': 'array',
|
|
1190
|
-
description: ( localizeWithPath(
|
|
1191
|
-
'vs/workbench/services/configuration/browser/configurationService',
|
|
1192
|
-
'setting description',
|
|
1193
|
-
"Configure settings to be applied for all profiles."
|
|
1194
|
-
)),
|
|
1201
|
+
description: ( localizeWithPath(_moduleId, 2, "Configure settings to be applied for all profiles.")),
|
|
1195
1202
|
'default': [],
|
|
1196
1203
|
'scope': 1 ,
|
|
1197
1204
|
additionalProperties: true,
|