@codingame/monaco-vscode-configuration-service-override 29.1.1 → 30.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/workbench/contrib/workspaces/browser/workspaces.contribution.js +7 -7
- package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +2 -2
- package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +43 -43
- package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +7 -7
- package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +4 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-configuration-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "30.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - configuration service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "
|
|
19
|
-
"@codingame/monaco-vscode-files-service-override": "
|
|
18
|
+
"@codingame/monaco-vscode-api": "30.0.0",
|
|
19
|
+
"@codingame/monaco-vscode-files-service-override": "30.0.0"
|
|
20
20
|
},
|
|
21
21
|
"main": "index.js",
|
|
22
22
|
"module": "index.js",
|
|
@@ -62,12 +62,12 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
|
|
|
62
62
|
if (workspaces.length === 1) {
|
|
63
63
|
const workspaceFile = workspaces[0];
|
|
64
64
|
this.notificationService.prompt(Severity.Info, ( localize(
|
|
65
|
-
|
|
65
|
+
15651,
|
|
66
66
|
"This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.",
|
|
67
67
|
workspaceFile,
|
|
68
68
|
"https://go.microsoft.com/fwlink/?linkid=2025315"
|
|
69
69
|
)), [{
|
|
70
|
-
label: ( localize(
|
|
70
|
+
label: ( localize(15652, "Open Workspace")),
|
|
71
71
|
run: () => this.hostService.openWindow([{
|
|
72
72
|
workspaceUri: joinPath(folder, workspaceFile)
|
|
73
73
|
}])
|
|
@@ -78,16 +78,16 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
|
|
|
78
78
|
}
|
|
79
79
|
else if (workspaces.length > 1) {
|
|
80
80
|
this.notificationService.prompt(Severity.Info, ( localize(
|
|
81
|
-
|
|
81
|
+
15653,
|
|
82
82
|
"This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.",
|
|
83
83
|
"https://go.microsoft.com/fwlink/?linkid=2025315"
|
|
84
84
|
)), [{
|
|
85
|
-
label: ( localize(
|
|
85
|
+
label: ( localize(15654, "Select Workspace")),
|
|
86
86
|
run: () => {
|
|
87
87
|
this.quickInputService.pick(( workspaces.map(workspace => ({
|
|
88
88
|
label: workspace
|
|
89
89
|
}))), {
|
|
90
|
-
placeHolder: ( localize(
|
|
90
|
+
placeHolder: ( localize(15655, "Select a workspace to open"))
|
|
91
91
|
}).then(pick => {
|
|
92
92
|
if (pick) {
|
|
93
93
|
this.hostService.openWindow([{
|
|
@@ -109,7 +109,7 @@ registerAction2(class extends Action2 {
|
|
|
109
109
|
constructor() {
|
|
110
110
|
super({
|
|
111
111
|
id: "workbench.action.openWorkspaceFromEditor",
|
|
112
|
-
title: ( localize2(
|
|
112
|
+
title: ( localize2(15652, "Open Workspace")),
|
|
113
113
|
f1: false,
|
|
114
114
|
menu: {
|
|
115
115
|
id: MenuId.EditorContent,
|
|
@@ -124,7 +124,7 @@ registerAction2(class extends Action2 {
|
|
|
124
124
|
if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
|
|
125
125
|
const workspaceConfiguration = contextService.getWorkspace().configuration;
|
|
126
126
|
if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
|
|
127
|
-
notificationService.info(( localize(
|
|
127
|
+
notificationService.info(( localize(15656, "This workspace is already open.")));
|
|
128
128
|
return;
|
|
129
129
|
}
|
|
130
130
|
}
|
|
@@ -1334,7 +1334,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1334
1334
|
} : workspaceSettingsSchema;
|
|
1335
1335
|
const configDefaultsSchema = {
|
|
1336
1336
|
type: "object",
|
|
1337
|
-
description: ( localize(
|
|
1337
|
+
description: ( localize(15842, "Contribute defaults for configurations")),
|
|
1338
1338
|
properties: Object.assign(
|
|
1339
1339
|
{},
|
|
1340
1340
|
this.filterDefaultOverridableProperties(machineOverridableSettings.properties),
|
|
@@ -1484,7 +1484,7 @@ configurationRegistry.registerConfiguration({
|
|
|
1484
1484
|
properties: {
|
|
1485
1485
|
[APPLY_ALL_PROFILES_SETTING]: {
|
|
1486
1486
|
"type": "array",
|
|
1487
|
-
description: ( localize(
|
|
1487
|
+
description: ( localize(15843, "Configure settings to be applied for all profiles.")),
|
|
1488
1488
|
"default": [],
|
|
1489
1489
|
"scope": ConfigurationScope.APPLICATION,
|
|
1490
1490
|
additionalProperties: true,
|
|
@@ -163,7 +163,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
163
163
|
);
|
|
164
164
|
}
|
|
165
165
|
throw ( new ConfigurationEditingError(( localize(
|
|
166
|
-
|
|
166
|
+
15844,
|
|
167
167
|
"Error while writing to {0}. {1}",
|
|
168
168
|
this.stringifyTarget(operation.target),
|
|
169
169
|
error.message
|
|
@@ -244,7 +244,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
244
244
|
}
|
|
245
245
|
}
|
|
246
246
|
onInvalidConfigurationError(error, operation) {
|
|
247
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(
|
|
247
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(15845, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15846, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(15847, "Open MCP Configuration")) : null;
|
|
248
248
|
if (openStandAloneConfigurationActionLabel) {
|
|
249
249
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
250
250
|
label: openStandAloneConfigurationActionLabel,
|
|
@@ -252,16 +252,16 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
252
252
|
}]);
|
|
253
253
|
} else {
|
|
254
254
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
255
|
-
label: ( localize(
|
|
255
|
+
label: ( localize(15848, "Open Settings")),
|
|
256
256
|
run: () => this.openSettings(operation)
|
|
257
257
|
}]);
|
|
258
258
|
}
|
|
259
259
|
}
|
|
260
260
|
onConfigurationFileDirtyError(error, operation, scopes) {
|
|
261
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(
|
|
261
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(15845, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15846, "Open Launch Configuration")) : null;
|
|
262
262
|
if (openStandAloneConfigurationActionLabel) {
|
|
263
263
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
264
|
-
label: ( localize(
|
|
264
|
+
label: ( localize(15849, "Save and Retry")),
|
|
265
265
|
run: () => {
|
|
266
266
|
const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
|
|
267
267
|
this.writeConfiguration(operation.target, {
|
|
@@ -278,7 +278,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
278
278
|
}]);
|
|
279
279
|
} else {
|
|
280
280
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
281
|
-
label: ( localize(
|
|
281
|
+
label: ( localize(15849, "Save and Retry")),
|
|
282
282
|
run: () => this.writeConfiguration(operation.target, {
|
|
283
283
|
key: operation.key,
|
|
284
284
|
value: operation.value
|
|
@@ -287,7 +287,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
287
287
|
scopes
|
|
288
288
|
})
|
|
289
289
|
}, {
|
|
290
|
-
label: ( localize(
|
|
290
|
+
label: ( localize(15848, "Open Settings")),
|
|
291
291
|
run: () => this.openSettings(operation)
|
|
292
292
|
}]);
|
|
293
293
|
}
|
|
@@ -335,61 +335,61 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
335
335
|
switch (error) {
|
|
336
336
|
case ConfigurationEditingErrorCode.ERROR_POLICY_CONFIGURATION:
|
|
337
337
|
return localize(
|
|
338
|
-
|
|
338
|
+
15850,
|
|
339
339
|
"Unable to write {0} because it is configured in system policy.",
|
|
340
340
|
operation.key
|
|
341
341
|
);
|
|
342
342
|
case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY:
|
|
343
343
|
return localize(
|
|
344
|
-
|
|
344
|
+
15851,
|
|
345
345
|
"Unable to write to {0} because {1} is not a registered configuration.",
|
|
346
346
|
this.stringifyTarget(target),
|
|
347
347
|
operation.key
|
|
348
348
|
);
|
|
349
349
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION:
|
|
350
350
|
return localize(
|
|
351
|
-
|
|
351
|
+
15852,
|
|
352
352
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
353
353
|
operation.key
|
|
354
354
|
);
|
|
355
355
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE:
|
|
356
356
|
return localize(
|
|
357
|
-
|
|
357
|
+
15853,
|
|
358
358
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
359
359
|
operation.key
|
|
360
360
|
);
|
|
361
361
|
case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_CONFIGURATION:
|
|
362
362
|
return localize(
|
|
363
|
-
|
|
363
|
+
15854,
|
|
364
364
|
"Unable to write to Folder Settings because {0} does not support the folder resource scope.",
|
|
365
365
|
operation.key
|
|
366
366
|
);
|
|
367
367
|
case ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET:
|
|
368
368
|
return localize(
|
|
369
|
-
|
|
369
|
+
15855,
|
|
370
370
|
"Unable to write to User Settings because {0} does not support for global scope.",
|
|
371
371
|
operation.key
|
|
372
372
|
);
|
|
373
373
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET:
|
|
374
374
|
return localize(
|
|
375
|
-
|
|
375
|
+
15856,
|
|
376
376
|
"Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.",
|
|
377
377
|
operation.key
|
|
378
378
|
);
|
|
379
379
|
case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_TARGET:
|
|
380
380
|
return localize(
|
|
381
|
-
|
|
381
|
+
15857,
|
|
382
382
|
"Unable to write to Folder Settings because no resource is provided."
|
|
383
383
|
);
|
|
384
384
|
case ConfigurationEditingErrorCode.ERROR_INVALID_RESOURCE_LANGUAGE_CONFIGURATION:
|
|
385
385
|
return localize(
|
|
386
|
-
|
|
386
|
+
15858,
|
|
387
387
|
"Unable to write to Language Settings because {0} is not a resource language setting.",
|
|
388
388
|
operation.key
|
|
389
389
|
);
|
|
390
390
|
case ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED:
|
|
391
391
|
return localize(
|
|
392
|
-
|
|
392
|
+
15859,
|
|
393
393
|
"Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
|
|
394
394
|
this.stringifyTarget(target)
|
|
395
395
|
);
|
|
@@ -397,36 +397,36 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
397
397
|
{
|
|
398
398
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
399
399
|
return localize(
|
|
400
|
-
|
|
400
|
+
15860,
|
|
401
401
|
"Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again."
|
|
402
402
|
);
|
|
403
403
|
}
|
|
404
404
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
405
405
|
return localize(
|
|
406
|
-
|
|
406
|
+
15861,
|
|
407
407
|
"Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
|
|
408
408
|
);
|
|
409
409
|
}
|
|
410
410
|
if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
|
|
411
411
|
return localize(
|
|
412
|
-
|
|
412
|
+
15862,
|
|
413
413
|
"Unable to write into the MCP configuration file. Please open it to correct errors/warnings in it and try again."
|
|
414
414
|
);
|
|
415
415
|
}
|
|
416
416
|
switch (target) {
|
|
417
417
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
418
418
|
return localize(
|
|
419
|
-
|
|
419
|
+
15863,
|
|
420
420
|
"Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again."
|
|
421
421
|
);
|
|
422
422
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
423
423
|
return localize(
|
|
424
|
-
|
|
424
|
+
15864,
|
|
425
425
|
"Unable to write into remote user settings. Please open the remote user settings to correct errors/warnings in it and try again."
|
|
426
426
|
);
|
|
427
427
|
case EditableConfigurationTarget.WORKSPACE:
|
|
428
428
|
return localize(
|
|
429
|
-
|
|
429
|
+
15865,
|
|
430
430
|
"Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again."
|
|
431
431
|
);
|
|
432
432
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
@@ -439,7 +439,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
439
439
|
}
|
|
440
440
|
}
|
|
441
441
|
return localize(
|
|
442
|
-
|
|
442
|
+
15866,
|
|
443
443
|
"Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
|
|
444
444
|
workspaceFolderName
|
|
445
445
|
);
|
|
@@ -452,36 +452,36 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
452
452
|
{
|
|
453
453
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
454
454
|
return localize(
|
|
455
|
-
|
|
455
|
+
15867,
|
|
456
456
|
"Unable to write into tasks configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
457
457
|
);
|
|
458
458
|
}
|
|
459
459
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
460
460
|
return localize(
|
|
461
|
-
|
|
461
|
+
15868,
|
|
462
462
|
"Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
463
463
|
);
|
|
464
464
|
}
|
|
465
465
|
if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
|
|
466
466
|
return localize(
|
|
467
|
-
|
|
467
|
+
15869,
|
|
468
468
|
"Unable to write into MCP configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
469
469
|
);
|
|
470
470
|
}
|
|
471
471
|
switch (target) {
|
|
472
472
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
473
473
|
return localize(
|
|
474
|
-
|
|
474
|
+
15870,
|
|
475
475
|
"Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again."
|
|
476
476
|
);
|
|
477
477
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
478
478
|
return localize(
|
|
479
|
-
|
|
479
|
+
15871,
|
|
480
480
|
"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."
|
|
481
481
|
);
|
|
482
482
|
case EditableConfigurationTarget.WORKSPACE:
|
|
483
483
|
return localize(
|
|
484
|
-
|
|
484
|
+
15872,
|
|
485
485
|
"Unable to write into workspace settings because the file has unsaved changes. Please save the workspace settings file first and then try again."
|
|
486
486
|
);
|
|
487
487
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
@@ -494,7 +494,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
494
494
|
}
|
|
495
495
|
}
|
|
496
496
|
return localize(
|
|
497
|
-
|
|
497
|
+
15873,
|
|
498
498
|
"Unable to write into folder settings because the file has unsaved changes. Please save the '{0}' folder settings file first and then try again.",
|
|
499
499
|
workspaceFolderName
|
|
500
500
|
);
|
|
@@ -506,47 +506,47 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
506
506
|
case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE:
|
|
507
507
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
508
508
|
return localize(
|
|
509
|
-
|
|
509
|
+
15874,
|
|
510
510
|
"Unable to write into tasks configuration file because the content of the file is newer."
|
|
511
511
|
);
|
|
512
512
|
}
|
|
513
513
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
514
514
|
return localize(
|
|
515
|
-
|
|
515
|
+
15875,
|
|
516
516
|
"Unable to write into launch configuration file because the content of the file is newer."
|
|
517
517
|
);
|
|
518
518
|
}
|
|
519
519
|
if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
|
|
520
520
|
return localize(
|
|
521
|
-
|
|
521
|
+
15876,
|
|
522
522
|
"Unable to write into MCP configuration file because the content of the file is newer."
|
|
523
523
|
);
|
|
524
524
|
}
|
|
525
525
|
switch (target) {
|
|
526
526
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
527
527
|
return localize(
|
|
528
|
-
|
|
528
|
+
15877,
|
|
529
529
|
"Unable to write into user settings because the content of the file is newer."
|
|
530
530
|
);
|
|
531
531
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
532
532
|
return localize(
|
|
533
|
-
|
|
533
|
+
15878,
|
|
534
534
|
"Unable to write into remote user settings because the content of the file is newer."
|
|
535
535
|
);
|
|
536
536
|
case EditableConfigurationTarget.WORKSPACE:
|
|
537
537
|
return localize(
|
|
538
|
-
|
|
538
|
+
15879,
|
|
539
539
|
"Unable to write into workspace settings because the content of the file is newer."
|
|
540
540
|
);
|
|
541
541
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
542
542
|
return localize(
|
|
543
|
-
|
|
543
|
+
15880,
|
|
544
544
|
"Unable to write into folder settings because the content of the file is newer."
|
|
545
545
|
);
|
|
546
546
|
}
|
|
547
547
|
case ConfigurationEditingErrorCode.ERROR_INTERNAL:
|
|
548
548
|
return localize(
|
|
549
|
-
|
|
549
|
+
15881,
|
|
550
550
|
"Unable to write to {0} because of an internal error.",
|
|
551
551
|
this.stringifyTarget(target)
|
|
552
552
|
);
|
|
@@ -555,13 +555,13 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
555
555
|
stringifyTarget(target) {
|
|
556
556
|
switch (target) {
|
|
557
557
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
558
|
-
return localize(
|
|
558
|
+
return localize(15882, "User Settings");
|
|
559
559
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
560
|
-
return localize(
|
|
560
|
+
return localize(15883, "Remote User Settings");
|
|
561
561
|
case EditableConfigurationTarget.WORKSPACE:
|
|
562
|
-
return localize(
|
|
562
|
+
return localize(15884, "Workspace Settings");
|
|
563
563
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
564
|
-
return localize(
|
|
564
|
+
return localize(15885, "Folder Settings");
|
|
565
565
|
default:
|
|
566
566
|
return "";
|
|
567
567
|
}
|
|
@@ -150,7 +150,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
150
150
|
if (!isUndefinedOrNull(value)) {
|
|
151
151
|
if (typeof value !== "string") {
|
|
152
152
|
throw ( new VariableError(VariableKind.Command, ( localize(
|
|
153
|
-
|
|
153
|
+
15887,
|
|
154
154
|
"Cannot substitute command variable '{0}' because command did not return a result of type string.",
|
|
155
155
|
commandId
|
|
156
156
|
))));
|
|
@@ -250,7 +250,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
250
250
|
async showUserInput(section, variable, inputInfos, variableToCommandMap) {
|
|
251
251
|
if (!inputInfos) {
|
|
252
252
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
253
|
-
|
|
253
|
+
15888,
|
|
254
254
|
"Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
|
|
255
255
|
variable,
|
|
256
256
|
"inputs"
|
|
@@ -260,7 +260,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
260
260
|
if (info) {
|
|
261
261
|
const missingAttribute = attrName => {
|
|
262
262
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
263
|
-
|
|
263
|
+
15889,
|
|
264
264
|
"Input variable '{0}' is of type '{1}' and must include '{2}'.",
|
|
265
265
|
variable,
|
|
266
266
|
info.type,
|
|
@@ -318,7 +318,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
318
318
|
};
|
|
319
319
|
const topValue = variableToCommandMap?.[`input:${variable}`] ?? previousPickedValue ?? info.default;
|
|
320
320
|
if (value === info.default) {
|
|
321
|
-
item.description = ( localize(
|
|
321
|
+
item.description = ( localize(15890, "(Default)"));
|
|
322
322
|
picks.unshift(item);
|
|
323
323
|
} else if (value === topValue) {
|
|
324
324
|
picks.unshift(item);
|
|
@@ -356,7 +356,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
356
356
|
};
|
|
357
357
|
}
|
|
358
358
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
359
|
-
|
|
359
|
+
15891,
|
|
360
360
|
"Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
|
|
361
361
|
variable,
|
|
362
362
|
info.command
|
|
@@ -365,14 +365,14 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
365
365
|
}
|
|
366
366
|
default:
|
|
367
367
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
368
|
-
|
|
368
|
+
15892,
|
|
369
369
|
"Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
|
|
370
370
|
variable
|
|
371
371
|
))));
|
|
372
372
|
}
|
|
373
373
|
}
|
|
374
374
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
375
|
-
|
|
375
|
+
15893,
|
|
376
376
|
"Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
|
|
377
377
|
variable
|
|
378
378
|
))));
|
package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js
CHANGED
|
@@ -92,8 +92,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
|
|
|
92
92
|
availableFileSystems.unshift(Schemas.vscodeRemote);
|
|
93
93
|
}
|
|
94
94
|
let workspacePath = await this.fileDialogService.showSaveDialog({
|
|
95
|
-
saveLabel: ( localize(
|
|
96
|
-
title: ( localize(
|
|
95
|
+
saveLabel: ( localize(16758, "Save")),
|
|
96
|
+
title: ( localize(16759, "Save Workspace")),
|
|
97
97
|
filters: WORKSPACE_FILTER,
|
|
98
98
|
defaultUri: joinPath(
|
|
99
99
|
await this.fileDialogService.defaultWorkspacePath(),
|
|
@@ -323,14 +323,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
|
|
|
323
323
|
}
|
|
324
324
|
onInvalidWorkspaceConfigurationFileError() {
|
|
325
325
|
const message = ( localize(
|
|
326
|
-
|
|
326
|
+
16760,
|
|
327
327
|
"Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again."
|
|
328
328
|
));
|
|
329
329
|
this.askToOpenWorkspaceConfigurationFile(message);
|
|
330
330
|
}
|
|
331
331
|
askToOpenWorkspaceConfigurationFile(message) {
|
|
332
332
|
this.notificationService.prompt(Severity.Error, message, [{
|
|
333
|
-
label: ( localize(
|
|
333
|
+
label: ( localize(16761, "Open Workspace Configuration")),
|
|
334
334
|
run: () => this.commandService.executeCommand("workbench.action.openWorkspaceConfigFile")
|
|
335
335
|
}]);
|
|
336
336
|
}
|