@codingame/monaco-vscode-configuration-service-override 4.5.1 → 5.0.0
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/package.json +3 -3
- package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js +2 -20
- 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/configuration.js +41 -30
- package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +125 -116
- package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +103 -142
- package/vscode/src/vs/workbench/services/configuration/common/configurationModels.js +11 -11
- package/vscode/src/vs/workbench/services/label/common/labelService.js +39 -63
- package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +39 -48
|
@@ -24,6 +24,7 @@ import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProf
|
|
|
24
24
|
import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
|
|
25
25
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
26
26
|
|
|
27
|
+
const _moduleId = "vs/workbench/services/configuration/common/configurationEditing";
|
|
27
28
|
class ConfigurationEditingError extends ErrorNoTelemetry {
|
|
28
29
|
constructor(message, code) {
|
|
29
30
|
super(message);
|
|
@@ -44,7 +45,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
44
45
|
this.preferencesService = preferencesService;
|
|
45
46
|
this.editorService = editorService;
|
|
46
47
|
this.uriIdentityService = uriIdentityService;
|
|
47
|
-
this.queue = ( new Queue());
|
|
48
|
+
this.queue = ( (new Queue()));
|
|
48
49
|
}
|
|
49
50
|
async writeConfiguration(target, value, options = {}) {
|
|
50
51
|
const operation = this.getConfigurationEditOperation(target, value, options.scopes || {});
|
|
@@ -99,27 +100,33 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
99
100
|
if (error.fileOperationResult === 3 ) {
|
|
100
101
|
throw this.toConfigurationEditingError(10 , operation.target, operation);
|
|
101
102
|
}
|
|
102
|
-
throw new ConfigurationEditingError(localizeWithPath(
|
|
103
|
+
throw ( (new ConfigurationEditingError(localizeWithPath(
|
|
104
|
+
_moduleId,
|
|
105
|
+
0,
|
|
106
|
+
"Error while writing to {0}. {1}",
|
|
107
|
+
this.stringifyTarget(operation.target),
|
|
108
|
+
error.message
|
|
109
|
+
), 13 )));
|
|
103
110
|
}
|
|
104
111
|
}
|
|
105
112
|
applyEditsToBuffer(edit, model) {
|
|
106
113
|
const startPosition = model.getPositionAt(edit.offset);
|
|
107
114
|
const endPosition = model.getPositionAt(edit.offset + edit.length);
|
|
108
|
-
const range = ( new Range(
|
|
115
|
+
const range = ( (new Range(
|
|
109
116
|
startPosition.lineNumber,
|
|
110
117
|
startPosition.column,
|
|
111
118
|
endPosition.lineNumber,
|
|
112
119
|
endPosition.column
|
|
113
|
-
));
|
|
120
|
+
)));
|
|
114
121
|
const currentText = model.getValueInRange(range);
|
|
115
122
|
if (edit.content !== currentText) {
|
|
116
123
|
const editOperation = currentText ? EditOperation.replace(range, edit.content) : EditOperation.insert(startPosition, edit.content);
|
|
117
|
-
model.pushEditOperations([( new Selection(
|
|
124
|
+
model.pushEditOperations([( (new Selection(
|
|
118
125
|
startPosition.lineNumber,
|
|
119
126
|
startPosition.column,
|
|
120
127
|
startPosition.lineNumber,
|
|
121
128
|
startPosition.column
|
|
122
|
-
))], [editOperation], () => []);
|
|
129
|
+
)))], [editOperation], () => []);
|
|
123
130
|
return true;
|
|
124
131
|
}
|
|
125
132
|
return false;
|
|
@@ -155,16 +162,8 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
155
162
|
}
|
|
156
163
|
}
|
|
157
164
|
onInvalidConfigurationError(error, operation) {
|
|
158
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
159
|
-
|
|
160
|
-
'openTasksConfiguration',
|
|
161
|
-
"Open Tasks Configuration"
|
|
162
|
-
))
|
|
163
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
164
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
165
|
-
'openLaunchConfiguration',
|
|
166
|
-
"Open Launch Configuration"
|
|
167
|
-
))
|
|
165
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localizeWithPath(_moduleId, 1, "Open Tasks Configuration"))
|
|
166
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localizeWithPath(_moduleId, 2, "Open Launch Configuration"))
|
|
168
167
|
: null;
|
|
169
168
|
if (openStandAloneConfigurationActionLabel) {
|
|
170
169
|
this.notificationService.prompt(Severity$1.Error, error.message, [{
|
|
@@ -174,34 +173,18 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
174
173
|
}
|
|
175
174
|
else {
|
|
176
175
|
this.notificationService.prompt(Severity$1.Error, error.message, [{
|
|
177
|
-
label: ( localizeWithPath(
|
|
178
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
179
|
-
'open',
|
|
180
|
-
"Open Settings"
|
|
181
|
-
)),
|
|
176
|
+
label: ( localizeWithPath(_moduleId, 3, "Open Settings")),
|
|
182
177
|
run: () => this.openSettings(operation)
|
|
183
178
|
}]);
|
|
184
179
|
}
|
|
185
180
|
}
|
|
186
181
|
onConfigurationFileDirtyError(error, operation, scopes) {
|
|
187
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
188
|
-
|
|
189
|
-
'openTasksConfiguration',
|
|
190
|
-
"Open Tasks Configuration"
|
|
191
|
-
))
|
|
192
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localizeWithPath(
|
|
193
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
194
|
-
'openLaunchConfiguration',
|
|
195
|
-
"Open Launch Configuration"
|
|
196
|
-
))
|
|
182
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localizeWithPath(_moduleId, 1, "Open Tasks Configuration"))
|
|
183
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localizeWithPath(_moduleId, 2, "Open Launch Configuration"))
|
|
197
184
|
: null;
|
|
198
185
|
if (openStandAloneConfigurationActionLabel) {
|
|
199
186
|
this.notificationService.prompt(Severity$1.Error, error.message, [{
|
|
200
|
-
label: ( localizeWithPath(
|
|
201
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
202
|
-
'saveAndRetry',
|
|
203
|
-
"Save and Retry"
|
|
204
|
-
)),
|
|
187
|
+
label: ( localizeWithPath(_moduleId, 4, "Save and Retry")),
|
|
205
188
|
run: () => {
|
|
206
189
|
const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
|
|
207
190
|
this.writeConfiguration(operation.target, { key, value: operation.value }, { handleDirtyFile: 'save', scopes });
|
|
@@ -214,19 +197,11 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
214
197
|
}
|
|
215
198
|
else {
|
|
216
199
|
this.notificationService.prompt(Severity$1.Error, error.message, [{
|
|
217
|
-
label: ( localizeWithPath(
|
|
218
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
219
|
-
'saveAndRetry',
|
|
220
|
-
"Save and Retry"
|
|
221
|
-
)),
|
|
200
|
+
label: ( localizeWithPath(_moduleId, 4, "Save and Retry")),
|
|
222
201
|
run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, { handleDirtyFile: 'save', scopes })
|
|
223
202
|
},
|
|
224
203
|
{
|
|
225
|
-
label: ( localizeWithPath(
|
|
226
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
227
|
-
'open',
|
|
228
|
-
"Open Settings"
|
|
229
|
-
)),
|
|
204
|
+
label: ( localizeWithPath(_moduleId, 3, "Open Settings")),
|
|
230
205
|
run: () => this.openSettings(operation)
|
|
231
206
|
}]);
|
|
232
207
|
}
|
|
@@ -258,102 +233,104 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
258
233
|
}
|
|
259
234
|
toConfigurationEditingError(code, target, operation) {
|
|
260
235
|
const message = this.toErrorMessage(code, target, operation);
|
|
261
|
-
return (
|
|
236
|
+
return (
|
|
237
|
+
(new ConfigurationEditingError(message, code))
|
|
238
|
+
);
|
|
262
239
|
}
|
|
263
240
|
toErrorMessage(error, target, operation) {
|
|
264
241
|
switch (error) {
|
|
265
242
|
case 12 : return ( localizeWithPath(
|
|
266
|
-
|
|
267
|
-
|
|
243
|
+
_moduleId,
|
|
244
|
+
5,
|
|
268
245
|
"Unable to write {0} because it is configured in system policy.",
|
|
269
246
|
operation.key
|
|
270
247
|
));
|
|
271
248
|
case 0 : return ( localizeWithPath(
|
|
272
|
-
|
|
273
|
-
|
|
249
|
+
_moduleId,
|
|
250
|
+
6,
|
|
274
251
|
"Unable to write to {0} because {1} is not a registered configuration.",
|
|
275
252
|
this.stringifyTarget(target),
|
|
276
253
|
operation.key
|
|
277
254
|
));
|
|
278
255
|
case 1 : return ( localizeWithPath(
|
|
279
|
-
|
|
280
|
-
|
|
256
|
+
_moduleId,
|
|
257
|
+
7,
|
|
281
258
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
282
259
|
operation.key
|
|
283
260
|
));
|
|
284
261
|
case 2 : return ( localizeWithPath(
|
|
285
|
-
|
|
286
|
-
|
|
262
|
+
_moduleId,
|
|
263
|
+
8,
|
|
287
264
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
288
265
|
operation.key
|
|
289
266
|
));
|
|
290
267
|
case 3 : return ( localizeWithPath(
|
|
291
|
-
|
|
292
|
-
|
|
268
|
+
_moduleId,
|
|
269
|
+
9,
|
|
293
270
|
"Unable to write to Folder Settings because {0} does not support the folder resource scope.",
|
|
294
271
|
operation.key
|
|
295
272
|
));
|
|
296
273
|
case 4 : return ( localizeWithPath(
|
|
297
|
-
|
|
298
|
-
|
|
274
|
+
_moduleId,
|
|
275
|
+
10,
|
|
299
276
|
"Unable to write to User Settings because {0} does not support for global scope.",
|
|
300
277
|
operation.key
|
|
301
278
|
));
|
|
302
279
|
case 5 : return ( localizeWithPath(
|
|
303
|
-
|
|
304
|
-
|
|
280
|
+
_moduleId,
|
|
281
|
+
11,
|
|
305
282
|
"Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.",
|
|
306
283
|
operation.key
|
|
307
284
|
));
|
|
308
285
|
case 6 : return ( localizeWithPath(
|
|
309
|
-
|
|
310
|
-
|
|
286
|
+
_moduleId,
|
|
287
|
+
12,
|
|
311
288
|
"Unable to write to Folder Settings because no resource is provided."
|
|
312
289
|
));
|
|
313
290
|
case 7 : return ( localizeWithPath(
|
|
314
|
-
|
|
315
|
-
|
|
291
|
+
_moduleId,
|
|
292
|
+
13,
|
|
316
293
|
"Unable to write to Language Settings because {0} is not a resource language setting.",
|
|
317
294
|
operation.key
|
|
318
295
|
));
|
|
319
296
|
case 8 : return ( localizeWithPath(
|
|
320
|
-
|
|
321
|
-
|
|
297
|
+
_moduleId,
|
|
298
|
+
14,
|
|
322
299
|
"Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
|
|
323
300
|
this.stringifyTarget(target)
|
|
324
301
|
));
|
|
325
302
|
case 11 : {
|
|
326
303
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
327
304
|
return ( localizeWithPath(
|
|
328
|
-
|
|
329
|
-
|
|
305
|
+
_moduleId,
|
|
306
|
+
15,
|
|
330
307
|
"Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again."
|
|
331
308
|
));
|
|
332
309
|
}
|
|
333
310
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
334
311
|
return ( localizeWithPath(
|
|
335
|
-
|
|
336
|
-
|
|
312
|
+
_moduleId,
|
|
313
|
+
16,
|
|
337
314
|
"Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
|
|
338
315
|
));
|
|
339
316
|
}
|
|
340
317
|
switch (target) {
|
|
341
318
|
case 1 :
|
|
342
319
|
return ( localizeWithPath(
|
|
343
|
-
|
|
344
|
-
|
|
320
|
+
_moduleId,
|
|
321
|
+
17,
|
|
345
322
|
"Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again."
|
|
346
323
|
));
|
|
347
324
|
case 2 :
|
|
348
325
|
return ( localizeWithPath(
|
|
349
|
-
|
|
350
|
-
|
|
326
|
+
_moduleId,
|
|
327
|
+
18,
|
|
351
328
|
"Unable to write into remote user settings. Please open the remote user settings to correct errors/warnings in it and try again."
|
|
352
329
|
));
|
|
353
330
|
case 3 :
|
|
354
331
|
return ( localizeWithPath(
|
|
355
|
-
|
|
356
|
-
|
|
332
|
+
_moduleId,
|
|
333
|
+
19,
|
|
357
334
|
"Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again."
|
|
358
335
|
));
|
|
359
336
|
case 4 : {
|
|
@@ -365,8 +342,8 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
365
342
|
}
|
|
366
343
|
}
|
|
367
344
|
return ( localizeWithPath(
|
|
368
|
-
|
|
369
|
-
|
|
345
|
+
_moduleId,
|
|
346
|
+
20,
|
|
370
347
|
"Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
|
|
371
348
|
workspaceFolderName
|
|
372
349
|
));
|
|
@@ -378,35 +355,35 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
378
355
|
case 9 : {
|
|
379
356
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
380
357
|
return ( localizeWithPath(
|
|
381
|
-
|
|
382
|
-
|
|
358
|
+
_moduleId,
|
|
359
|
+
21,
|
|
383
360
|
"Unable to write into tasks configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
384
361
|
));
|
|
385
362
|
}
|
|
386
363
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
387
364
|
return ( localizeWithPath(
|
|
388
|
-
|
|
389
|
-
|
|
365
|
+
_moduleId,
|
|
366
|
+
22,
|
|
390
367
|
"Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
391
368
|
));
|
|
392
369
|
}
|
|
393
370
|
switch (target) {
|
|
394
371
|
case 1 :
|
|
395
372
|
return ( localizeWithPath(
|
|
396
|
-
|
|
397
|
-
|
|
373
|
+
_moduleId,
|
|
374
|
+
23,
|
|
398
375
|
"Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again."
|
|
399
376
|
));
|
|
400
377
|
case 2 :
|
|
401
378
|
return ( localizeWithPath(
|
|
402
|
-
|
|
403
|
-
|
|
379
|
+
_moduleId,
|
|
380
|
+
24,
|
|
404
381
|
"Unable to write into remote user settings because the file has unsaved changes. Please save the remote user settings file first and then try again."
|
|
405
382
|
));
|
|
406
383
|
case 3 :
|
|
407
384
|
return ( localizeWithPath(
|
|
408
|
-
|
|
409
|
-
|
|
385
|
+
_moduleId,
|
|
386
|
+
25,
|
|
410
387
|
"Unable to write into workspace settings because the file has unsaved changes. Please save the workspace settings file first and then try again."
|
|
411
388
|
));
|
|
412
389
|
case 4 : {
|
|
@@ -418,8 +395,8 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
418
395
|
}
|
|
419
396
|
}
|
|
420
397
|
return ( localizeWithPath(
|
|
421
|
-
|
|
422
|
-
|
|
398
|
+
_moduleId,
|
|
399
|
+
26,
|
|
423
400
|
"Unable to write into folder settings because the file has unsaved changes. Please save the '{0}' folder settings file first and then try again.",
|
|
424
401
|
workspaceFolderName
|
|
425
402
|
));
|
|
@@ -431,47 +408,47 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
431
408
|
case 10 :
|
|
432
409
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
433
410
|
return ( localizeWithPath(
|
|
434
|
-
|
|
435
|
-
|
|
411
|
+
_moduleId,
|
|
412
|
+
27,
|
|
436
413
|
"Unable to write into tasks configuration file because the content of the file is newer."
|
|
437
414
|
));
|
|
438
415
|
}
|
|
439
416
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
440
417
|
return ( localizeWithPath(
|
|
441
|
-
|
|
442
|
-
|
|
418
|
+
_moduleId,
|
|
419
|
+
28,
|
|
443
420
|
"Unable to write into launch configuration file because the content of the file is newer."
|
|
444
421
|
));
|
|
445
422
|
}
|
|
446
423
|
switch (target) {
|
|
447
424
|
case 1 :
|
|
448
425
|
return ( localizeWithPath(
|
|
449
|
-
|
|
450
|
-
|
|
426
|
+
_moduleId,
|
|
427
|
+
29,
|
|
451
428
|
"Unable to write into user settings because the content of the file is newer."
|
|
452
429
|
));
|
|
453
430
|
case 2 :
|
|
454
431
|
return ( localizeWithPath(
|
|
455
|
-
|
|
456
|
-
|
|
432
|
+
_moduleId,
|
|
433
|
+
30,
|
|
457
434
|
"Unable to write into remote user settings because the content of the file is newer."
|
|
458
435
|
));
|
|
459
436
|
case 3 :
|
|
460
437
|
return ( localizeWithPath(
|
|
461
|
-
|
|
462
|
-
|
|
438
|
+
_moduleId,
|
|
439
|
+
31,
|
|
463
440
|
"Unable to write into workspace settings because the content of the file is newer."
|
|
464
441
|
));
|
|
465
442
|
case 4 :
|
|
466
443
|
return ( localizeWithPath(
|
|
467
|
-
|
|
468
|
-
|
|
444
|
+
_moduleId,
|
|
445
|
+
32,
|
|
469
446
|
"Unable to write into folder settings because the content of the file is newer."
|
|
470
447
|
));
|
|
471
448
|
}
|
|
472
449
|
case 13 : return ( localizeWithPath(
|
|
473
|
-
|
|
474
|
-
|
|
450
|
+
_moduleId,
|
|
451
|
+
33,
|
|
475
452
|
"Unable to write to {0} because of an internal error.",
|
|
476
453
|
this.stringifyTarget(target)
|
|
477
454
|
));
|
|
@@ -480,29 +457,13 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
480
457
|
stringifyTarget(target) {
|
|
481
458
|
switch (target) {
|
|
482
459
|
case 1 :
|
|
483
|
-
return ( localizeWithPath(
|
|
484
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
485
|
-
'userTarget',
|
|
486
|
-
"User Settings"
|
|
487
|
-
));
|
|
460
|
+
return ( localizeWithPath(_moduleId, 34, "User Settings"));
|
|
488
461
|
case 2 :
|
|
489
|
-
return ( localizeWithPath(
|
|
490
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
491
|
-
'remoteUserTarget',
|
|
492
|
-
"Remote User Settings"
|
|
493
|
-
));
|
|
462
|
+
return ( localizeWithPath(_moduleId, 35, "Remote User Settings"));
|
|
494
463
|
case 3 :
|
|
495
|
-
return ( localizeWithPath(
|
|
496
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
497
|
-
'workspaceTarget',
|
|
498
|
-
"Workspace Settings"
|
|
499
|
-
));
|
|
464
|
+
return ( localizeWithPath(_moduleId, 36, "Workspace Settings"));
|
|
500
465
|
case 4 :
|
|
501
|
-
return ( localizeWithPath(
|
|
502
|
-
'vs/workbench/services/configuration/common/configurationEditing',
|
|
503
|
-
'folderTarget',
|
|
504
|
-
"Folder Settings"
|
|
505
|
-
));
|
|
466
|
+
return ( localizeWithPath(_moduleId, 37, "Folder Settings"));
|
|
506
467
|
default:
|
|
507
468
|
return '';
|
|
508
469
|
}
|
|
@@ -534,10 +495,10 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
534
495
|
if (this.configurationService.inspect(operation.key).policyValue !== undefined) {
|
|
535
496
|
throw this.toConfigurationEditingError(12 , target, operation);
|
|
536
497
|
}
|
|
537
|
-
const configurationProperties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
|
|
498
|
+
const configurationProperties = ( (Registry.as(Extensions.Configuration))).getConfigurationProperties();
|
|
538
499
|
const configurationScope = configurationProperties[operation.key]?.scope;
|
|
539
500
|
if (!operation.workspaceStandAloneConfigurationKey) {
|
|
540
|
-
const validKeys = ( this.configurationService.keys()).default;
|
|
501
|
+
const validKeys = ( (this.configurationService.keys())).default;
|
|
541
502
|
if (validKeys.indexOf(operation.key) < 0 && !OVERRIDE_PROPERTY_REGEX.test(operation.key) && operation.value !== undefined) {
|
|
542
503
|
throw this.toConfigurationEditingError(0 , target, operation);
|
|
543
504
|
}
|
|
@@ -585,7 +546,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
585
546
|
getConfigurationEditOperation(target, config, overrides) {
|
|
586
547
|
if (config.key) {
|
|
587
548
|
const standaloneConfigurationMap = target === 1 ? USER_STANDALONE_CONFIGURATIONS : WORKSPACE_STANDALONE_CONFIGURATIONS;
|
|
588
|
-
const standaloneConfigurationKeys = ( Object.keys(standaloneConfigurationMap));
|
|
549
|
+
const standaloneConfigurationKeys = ( (Object.keys(standaloneConfigurationMap)));
|
|
589
550
|
for (const key of standaloneConfigurationKeys) {
|
|
590
551
|
const resource = this.getConfigurationFileResource(target, key, standaloneConfigurationMap[key], overrides.resource, undefined);
|
|
591
552
|
if (config.key === key) {
|
|
@@ -600,7 +561,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
600
561
|
}
|
|
601
562
|
}
|
|
602
563
|
const key = config.key;
|
|
603
|
-
const configurationProperties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
|
|
564
|
+
const configurationProperties = ( (Registry.as(Extensions.Configuration))).getConfigurationProperties();
|
|
604
565
|
const configurationScope = configurationProperties[key]?.scope;
|
|
605
566
|
let jsonPath = overrides.overrideIdentifiers?.length ? [keyFromOverrideIdentifiers(overrides.overrideIdentifiers), key] : [key];
|
|
606
567
|
if (target === 1 || target === 2 ) {
|
|
@@ -654,18 +615,18 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
654
615
|
return null;
|
|
655
616
|
}
|
|
656
617
|
};
|
|
657
|
-
ConfigurationEditing = ( __decorate([
|
|
658
|
-
( __param(1, IWorkbenchConfigurationService)),
|
|
659
|
-
( __param(2, IWorkspaceContextService)),
|
|
660
|
-
( __param(3, IUserDataProfileService)),
|
|
661
|
-
( __param(4, IUserDataProfilesService)),
|
|
662
|
-
( __param(5, IFileService)),
|
|
663
|
-
( __param(6, ITextModelService)),
|
|
664
|
-
( __param(7, ITextFileService)),
|
|
665
|
-
( __param(8, INotificationService)),
|
|
666
|
-
( __param(9, IPreferencesService)),
|
|
667
|
-
( __param(10, IEditorService)),
|
|
668
|
-
( __param(11, IUriIdentityService))
|
|
669
|
-
], ConfigurationEditing));
|
|
618
|
+
ConfigurationEditing = ( (__decorate([
|
|
619
|
+
( (__param(1, IWorkbenchConfigurationService))),
|
|
620
|
+
( (__param(2, IWorkspaceContextService))),
|
|
621
|
+
( (__param(3, IUserDataProfileService))),
|
|
622
|
+
( (__param(4, IUserDataProfilesService))),
|
|
623
|
+
( (__param(5, IFileService))),
|
|
624
|
+
( (__param(6, ITextModelService))),
|
|
625
|
+
( (__param(7, ITextFileService))),
|
|
626
|
+
( (__param(8, INotificationService))),
|
|
627
|
+
( (__param(9, IPreferencesService))),
|
|
628
|
+
( (__param(10, IEditorService))),
|
|
629
|
+
( (__param(11, IUriIdentityService)))
|
|
630
|
+
], ConfigurationEditing)));
|
|
670
631
|
|
|
671
632
|
export { ConfigurationEditing, ConfigurationEditingError };
|
|
@@ -5,13 +5,13 @@ import { isBoolean } from 'vscode/vscode/vs/base/common/types';
|
|
|
5
5
|
import { distinct } from 'vscode/vscode/vs/base/common/arrays';
|
|
6
6
|
|
|
7
7
|
class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
|
|
8
|
-
constructor(name) {
|
|
9
|
-
super(name);
|
|
8
|
+
constructor(name, logService) {
|
|
9
|
+
super(name, logService);
|
|
10
10
|
this._folders = [];
|
|
11
11
|
this._transient = false;
|
|
12
|
-
this._settingsModelParser = ( new ConfigurationModelParser(name));
|
|
13
|
-
this._launchModel =
|
|
14
|
-
this._tasksModel =
|
|
12
|
+
this._settingsModelParser = ( new ConfigurationModelParser(name, logService));
|
|
13
|
+
this._launchModel = ConfigurationModel.createEmptyModel(logService);
|
|
14
|
+
this._tasksModel = ConfigurationModel.createEmptyModel(logService);
|
|
15
15
|
}
|
|
16
16
|
get folders() {
|
|
17
17
|
return this._folders;
|
|
@@ -49,14 +49,14 @@ class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
|
|
|
49
49
|
const scopedContents = Object.create(null);
|
|
50
50
|
scopedContents[key] = contents;
|
|
51
51
|
const keys = ( ( Object.keys(data)).map(k => `${key}.${k}`));
|
|
52
|
-
return ( new ConfigurationModel(scopedContents, keys, []));
|
|
52
|
+
return ( new ConfigurationModel(scopedContents, keys, [], undefined, this.logService));
|
|
53
53
|
}
|
|
54
|
-
return
|
|
54
|
+
return ConfigurationModel.createEmptyModel(this.logService);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
class StandaloneConfigurationModelParser extends ConfigurationModelParser {
|
|
58
|
-
constructor(name, scope) {
|
|
59
|
-
super(name);
|
|
58
|
+
constructor(name, scope, logService) {
|
|
59
|
+
super(name, logService);
|
|
60
60
|
this.scope = scope;
|
|
61
61
|
}
|
|
62
62
|
doParseRaw(raw, configurationParseOptions) {
|
|
@@ -68,8 +68,8 @@ class StandaloneConfigurationModelParser extends ConfigurationModelParser {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
class Configuration extends Configuration$1 {
|
|
71
|
-
constructor(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, _workspace) {
|
|
72
|
-
super(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource);
|
|
71
|
+
constructor(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, _workspace, logService) {
|
|
72
|
+
super(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, logService);
|
|
73
73
|
this._workspace = _workspace;
|
|
74
74
|
}
|
|
75
75
|
getValue(key, overrides = {}) {
|