@codingame/monaco-vscode-configuration-service-override 25.0.1 → 25.1.1
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 +46 -46
- 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": "25.
|
|
3
|
+
"version": "25.1.1",
|
|
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": "25.
|
|
19
|
-
"@codingame/monaco-vscode-files-service-override": "25.
|
|
18
|
+
"@codingame/monaco-vscode-api": "25.1.1",
|
|
19
|
+
"@codingame/monaco-vscode-files-service-override": "25.1.1"
|
|
20
20
|
},
|
|
21
21
|
"main": "index.js",
|
|
22
22
|
"module": "index.js",
|
|
@@ -51,12 +51,12 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
|
|
|
51
51
|
if (workspaces.length === 1) {
|
|
52
52
|
const workspaceFile = workspaces[0];
|
|
53
53
|
this.notificationService.prompt(Severity.Info, ( localize(
|
|
54
|
-
|
|
54
|
+
13579,
|
|
55
55
|
"This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.",
|
|
56
56
|
workspaceFile,
|
|
57
57
|
'https://go.microsoft.com/fwlink/?linkid=2025315'
|
|
58
58
|
)), [{
|
|
59
|
-
label: ( localize(
|
|
59
|
+
label: ( localize(13580, "Open Workspace")),
|
|
60
60
|
run: () => this.hostService.openWindow([{ workspaceUri: joinPath(folder, workspaceFile) }])
|
|
61
61
|
}], {
|
|
62
62
|
neverShowAgain,
|
|
@@ -65,13 +65,13 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
|
|
|
65
65
|
}
|
|
66
66
|
else if (workspaces.length > 1) {
|
|
67
67
|
this.notificationService.prompt(Severity.Info, ( localize(
|
|
68
|
-
|
|
68
|
+
13581,
|
|
69
69
|
"This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.",
|
|
70
70
|
'https://go.microsoft.com/fwlink/?linkid=2025315'
|
|
71
71
|
)), [{
|
|
72
|
-
label: ( localize(
|
|
72
|
+
label: ( localize(13582, "Select Workspace")),
|
|
73
73
|
run: () => {
|
|
74
|
-
this.quickInputService.pick(( workspaces.map(workspace => ({ label: workspace }))), { placeHolder: ( localize(
|
|
74
|
+
this.quickInputService.pick(( workspaces.map(workspace => ({ label: workspace }))), { placeHolder: ( localize(13583, "Select a workspace to open")) }).then(pick => {
|
|
75
75
|
if (pick) {
|
|
76
76
|
this.hostService.openWindow([{ workspaceUri: joinPath(folder, pick.label) }]);
|
|
77
77
|
}
|
|
@@ -97,7 +97,7 @@ registerAction2(class extends Action2 {
|
|
|
97
97
|
constructor() {
|
|
98
98
|
super({
|
|
99
99
|
id: 'workbench.action.openWorkspaceFromEditor',
|
|
100
|
-
title: ( localize2(
|
|
100
|
+
title: ( localize2(13580, "Open Workspace")),
|
|
101
101
|
f1: false,
|
|
102
102
|
menu: {
|
|
103
103
|
id: MenuId.EditorContent,
|
|
@@ -112,7 +112,7 @@ registerAction2(class extends Action2 {
|
|
|
112
112
|
if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
|
|
113
113
|
const workspaceConfiguration = contextService.getWorkspace().configuration;
|
|
114
114
|
if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
|
|
115
|
-
notificationService.info(( localize(
|
|
115
|
+
notificationService.info(( localize(13584, "This workspace is already open.")));
|
|
116
116
|
return;
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -1096,7 +1096,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1096
1096
|
} : workspaceSettingsSchema;
|
|
1097
1097
|
const configDefaultsSchema = {
|
|
1098
1098
|
type: 'object',
|
|
1099
|
-
description: ( localize(
|
|
1099
|
+
description: ( localize(13756, 'Contribute defaults for configurations')),
|
|
1100
1100
|
properties: Object.assign({}, this.filterDefaultOverridableProperties(machineOverridableSettings.properties), this.filterDefaultOverridableProperties(windowSettings.properties), this.filterDefaultOverridableProperties(resourceSettings.properties)),
|
|
1101
1101
|
patternProperties: {
|
|
1102
1102
|
[OVERRIDE_PROPERTY_PATTERN]: {
|
|
@@ -1226,7 +1226,7 @@ configurationRegistry.registerConfiguration({
|
|
|
1226
1226
|
properties: {
|
|
1227
1227
|
[APPLY_ALL_PROFILES_SETTING]: {
|
|
1228
1228
|
'type': 'array',
|
|
1229
|
-
description: ( localize(
|
|
1229
|
+
description: ( localize(13757, "Configure settings to be applied for all profiles.")),
|
|
1230
1230
|
'default': [],
|
|
1231
1231
|
'scope': ConfigurationScope.APPLICATION,
|
|
1232
1232
|
additionalProperties: true,
|
|
@@ -138,7 +138,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
138
138
|
throw this.toConfigurationEditingError(ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE, operation.target, operation);
|
|
139
139
|
}
|
|
140
140
|
throw ( new ConfigurationEditingError(( localize(
|
|
141
|
-
|
|
141
|
+
13758,
|
|
142
142
|
"Error while writing to {0}. {1}",
|
|
143
143
|
this.stringifyTarget(operation.target),
|
|
144
144
|
error.message
|
|
@@ -198,9 +198,9 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
198
198
|
}
|
|
199
199
|
}
|
|
200
200
|
onInvalidConfigurationError(error, operation) {
|
|
201
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(
|
|
202
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(
|
|
203
|
-
: operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(
|
|
201
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(13759, "Open Tasks Configuration"))
|
|
202
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(13760, "Open Launch Configuration"))
|
|
203
|
+
: operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(13761, "Open MCP Configuration"))
|
|
204
204
|
: null;
|
|
205
205
|
if (openStandAloneConfigurationActionLabel) {
|
|
206
206
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
@@ -210,18 +210,18 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
210
210
|
}
|
|
211
211
|
else {
|
|
212
212
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
213
|
-
label: ( localize(
|
|
213
|
+
label: ( localize(13762, "Open Settings")),
|
|
214
214
|
run: () => this.openSettings(operation)
|
|
215
215
|
}]);
|
|
216
216
|
}
|
|
217
217
|
}
|
|
218
218
|
onConfigurationFileDirtyError(error, operation, scopes) {
|
|
219
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(
|
|
220
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(
|
|
219
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(13759, "Open Tasks Configuration"))
|
|
220
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(13760, "Open Launch Configuration"))
|
|
221
221
|
: null;
|
|
222
222
|
if (openStandAloneConfigurationActionLabel) {
|
|
223
223
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
224
|
-
label: ( localize(
|
|
224
|
+
label: ( localize(13763, "Save and Retry")),
|
|
225
225
|
run: () => {
|
|
226
226
|
const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
|
|
227
227
|
this.writeConfiguration(operation.target, { key, value: operation.value }, { handleDirtyFile: 'save', scopes });
|
|
@@ -234,11 +234,11 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
234
234
|
}
|
|
235
235
|
else {
|
|
236
236
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
237
|
-
label: ( localize(
|
|
237
|
+
label: ( localize(13763, "Save and Retry")),
|
|
238
238
|
run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, { handleDirtyFile: 'save', scopes })
|
|
239
239
|
},
|
|
240
240
|
{
|
|
241
|
-
label: ( localize(
|
|
241
|
+
label: ( localize(13762, "Open Settings")),
|
|
242
242
|
run: () => this.openSettings(operation)
|
|
243
243
|
}]);
|
|
244
244
|
}
|
|
@@ -275,88 +275,88 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
275
275
|
toErrorMessage(error, target, operation) {
|
|
276
276
|
switch (error) {
|
|
277
277
|
case ConfigurationEditingErrorCode.ERROR_POLICY_CONFIGURATION: return localize(
|
|
278
|
-
|
|
278
|
+
13764,
|
|
279
279
|
"Unable to write {0} because it is configured in system policy.",
|
|
280
280
|
operation.key
|
|
281
281
|
);
|
|
282
282
|
case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY: return localize(
|
|
283
|
-
|
|
283
|
+
13765,
|
|
284
284
|
"Unable to write to {0} because {1} is not a registered configuration.",
|
|
285
285
|
this.stringifyTarget(target),
|
|
286
286
|
operation.key
|
|
287
287
|
);
|
|
288
288
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION: return localize(
|
|
289
|
-
|
|
289
|
+
13766,
|
|
290
290
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
291
291
|
operation.key
|
|
292
292
|
);
|
|
293
293
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE: return localize(
|
|
294
|
-
|
|
294
|
+
13767,
|
|
295
295
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
296
296
|
operation.key
|
|
297
297
|
);
|
|
298
298
|
case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_CONFIGURATION: return localize(
|
|
299
|
-
|
|
299
|
+
13768,
|
|
300
300
|
"Unable to write to Folder Settings because {0} does not support the folder resource scope.",
|
|
301
301
|
operation.key
|
|
302
302
|
);
|
|
303
303
|
case ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET: return localize(
|
|
304
|
-
|
|
304
|
+
13769,
|
|
305
305
|
"Unable to write to User Settings because {0} does not support for global scope.",
|
|
306
306
|
operation.key
|
|
307
307
|
);
|
|
308
308
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET: return localize(
|
|
309
|
-
|
|
309
|
+
13770,
|
|
310
310
|
"Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.",
|
|
311
311
|
operation.key
|
|
312
312
|
);
|
|
313
313
|
case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_TARGET: return localize(
|
|
314
|
-
|
|
314
|
+
13771,
|
|
315
315
|
"Unable to write to Folder Settings because no resource is provided."
|
|
316
316
|
);
|
|
317
317
|
case ConfigurationEditingErrorCode.ERROR_INVALID_RESOURCE_LANGUAGE_CONFIGURATION: return localize(
|
|
318
|
-
|
|
318
|
+
13772,
|
|
319
319
|
"Unable to write to Language Settings because {0} is not a resource language setting.",
|
|
320
320
|
operation.key
|
|
321
321
|
);
|
|
322
322
|
case ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED: return localize(
|
|
323
|
-
|
|
323
|
+
13773,
|
|
324
324
|
"Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
|
|
325
325
|
this.stringifyTarget(target)
|
|
326
326
|
);
|
|
327
327
|
case ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION: {
|
|
328
328
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
329
329
|
return localize(
|
|
330
|
-
|
|
330
|
+
13774,
|
|
331
331
|
"Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again."
|
|
332
332
|
);
|
|
333
333
|
}
|
|
334
334
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
335
335
|
return localize(
|
|
336
|
-
|
|
336
|
+
13775,
|
|
337
337
|
"Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
|
|
338
338
|
);
|
|
339
339
|
}
|
|
340
340
|
if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
|
|
341
341
|
return localize(
|
|
342
|
-
|
|
342
|
+
13776,
|
|
343
343
|
"Unable to write into the MCP configuration file. Please open it to correct errors/warnings in it and try again."
|
|
344
344
|
);
|
|
345
345
|
}
|
|
346
346
|
switch (target) {
|
|
347
347
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
348
348
|
return localize(
|
|
349
|
-
|
|
349
|
+
13777,
|
|
350
350
|
"Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again."
|
|
351
351
|
);
|
|
352
352
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
353
353
|
return localize(
|
|
354
|
-
|
|
354
|
+
13778,
|
|
355
355
|
"Unable to write into remote user settings. Please open the remote user settings to correct errors/warnings in it and try again."
|
|
356
356
|
);
|
|
357
357
|
case EditableConfigurationTarget.WORKSPACE:
|
|
358
358
|
return localize(
|
|
359
|
-
|
|
359
|
+
13779,
|
|
360
360
|
"Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again."
|
|
361
361
|
);
|
|
362
362
|
case EditableConfigurationTarget.WORKSPACE_FOLDER: {
|
|
@@ -368,7 +368,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
368
368
|
}
|
|
369
369
|
}
|
|
370
370
|
return localize(
|
|
371
|
-
|
|
371
|
+
13780,
|
|
372
372
|
"Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
|
|
373
373
|
workspaceFolderName
|
|
374
374
|
);
|
|
@@ -380,36 +380,36 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
380
380
|
case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY: {
|
|
381
381
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
382
382
|
return localize(
|
|
383
|
-
|
|
383
|
+
13781,
|
|
384
384
|
"Unable to write into tasks configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
385
385
|
);
|
|
386
386
|
}
|
|
387
387
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
388
388
|
return localize(
|
|
389
|
-
|
|
389
|
+
13782,
|
|
390
390
|
"Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
391
391
|
);
|
|
392
392
|
}
|
|
393
393
|
if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
|
|
394
394
|
return localize(
|
|
395
|
-
|
|
395
|
+
13783,
|
|
396
396
|
"Unable to write into MCP configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
397
397
|
);
|
|
398
398
|
}
|
|
399
399
|
switch (target) {
|
|
400
400
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
401
401
|
return localize(
|
|
402
|
-
|
|
402
|
+
13784,
|
|
403
403
|
"Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again."
|
|
404
404
|
);
|
|
405
405
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
406
406
|
return localize(
|
|
407
|
-
|
|
407
|
+
13785,
|
|
408
408
|
"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."
|
|
409
409
|
);
|
|
410
410
|
case EditableConfigurationTarget.WORKSPACE:
|
|
411
411
|
return localize(
|
|
412
|
-
|
|
412
|
+
13786,
|
|
413
413
|
"Unable to write into workspace settings because the file has unsaved changes. Please save the workspace settings file first and then try again."
|
|
414
414
|
);
|
|
415
415
|
case EditableConfigurationTarget.WORKSPACE_FOLDER: {
|
|
@@ -421,7 +421,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
421
421
|
}
|
|
422
422
|
}
|
|
423
423
|
return localize(
|
|
424
|
-
|
|
424
|
+
13787,
|
|
425
425
|
"Unable to write into folder settings because the file has unsaved changes. Please save the '{0}' folder settings file first and then try again.",
|
|
426
426
|
workspaceFolderName
|
|
427
427
|
);
|
|
@@ -433,46 +433,46 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
433
433
|
case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE:
|
|
434
434
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
435
435
|
return localize(
|
|
436
|
-
|
|
436
|
+
13788,
|
|
437
437
|
"Unable to write into tasks configuration file because the content of the file is newer."
|
|
438
438
|
);
|
|
439
439
|
}
|
|
440
440
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
441
441
|
return localize(
|
|
442
|
-
|
|
442
|
+
13789,
|
|
443
443
|
"Unable to write into launch configuration file because the content of the file is newer."
|
|
444
444
|
);
|
|
445
445
|
}
|
|
446
446
|
if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
|
|
447
447
|
return localize(
|
|
448
|
-
|
|
448
|
+
13790,
|
|
449
449
|
"Unable to write into MCP configuration file because the content of the file is newer."
|
|
450
450
|
);
|
|
451
451
|
}
|
|
452
452
|
switch (target) {
|
|
453
453
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
454
454
|
return localize(
|
|
455
|
-
|
|
455
|
+
13791,
|
|
456
456
|
"Unable to write into user settings because the content of the file is newer."
|
|
457
457
|
);
|
|
458
458
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
459
459
|
return localize(
|
|
460
|
-
|
|
460
|
+
13792,
|
|
461
461
|
"Unable to write into remote user settings because the content of the file is newer."
|
|
462
462
|
);
|
|
463
463
|
case EditableConfigurationTarget.WORKSPACE:
|
|
464
464
|
return localize(
|
|
465
|
-
|
|
465
|
+
13793,
|
|
466
466
|
"Unable to write into workspace settings because the content of the file is newer."
|
|
467
467
|
);
|
|
468
468
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
469
469
|
return localize(
|
|
470
|
-
|
|
470
|
+
13794,
|
|
471
471
|
"Unable to write into folder settings because the content of the file is newer."
|
|
472
472
|
);
|
|
473
473
|
}
|
|
474
474
|
case ConfigurationEditingErrorCode.ERROR_INTERNAL: return localize(
|
|
475
|
-
|
|
475
|
+
13795,
|
|
476
476
|
"Unable to write to {0} because of an internal error.",
|
|
477
477
|
this.stringifyTarget(target)
|
|
478
478
|
);
|
|
@@ -481,13 +481,13 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
481
481
|
stringifyTarget(target) {
|
|
482
482
|
switch (target) {
|
|
483
483
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
484
|
-
return localize(
|
|
484
|
+
return localize(13796, "User Settings");
|
|
485
485
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
486
|
-
return localize(
|
|
486
|
+
return localize(13797, "Remote User Settings");
|
|
487
487
|
case EditableConfigurationTarget.WORKSPACE:
|
|
488
|
-
return localize(
|
|
488
|
+
return localize(13798, "Workspace Settings");
|
|
489
489
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
490
|
-
return localize(
|
|
490
|
+
return localize(13799, "Folder Settings");
|
|
491
491
|
default:
|
|
492
492
|
return '';
|
|
493
493
|
}
|
|
@@ -128,7 +128,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
128
128
|
if (!isUndefinedOrNull(value)) {
|
|
129
129
|
if (typeof value !== 'string') {
|
|
130
130
|
throw ( new VariableError(VariableKind.Command, ( localize(
|
|
131
|
-
|
|
131
|
+
13801,
|
|
132
132
|
"Cannot substitute command variable '{0}' because command did not return a result of type string.",
|
|
133
133
|
commandId
|
|
134
134
|
))));
|
|
@@ -213,7 +213,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
213
213
|
async showUserInput(section, variable, inputInfos, variableToCommandMap) {
|
|
214
214
|
if (!inputInfos) {
|
|
215
215
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
216
|
-
|
|
216
|
+
13802,
|
|
217
217
|
"Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
|
|
218
218
|
variable,
|
|
219
219
|
'inputs'
|
|
@@ -223,7 +223,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
223
223
|
if (info) {
|
|
224
224
|
const missingAttribute = (attrName) => {
|
|
225
225
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
226
|
-
|
|
226
|
+
13803,
|
|
227
227
|
"Input variable '{0}' is of type '{1}' and must include '{2}'.",
|
|
228
228
|
variable,
|
|
229
229
|
info.type,
|
|
@@ -273,7 +273,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
273
273
|
};
|
|
274
274
|
const topValue = variableToCommandMap?.[`input:${variable}`] ?? previousPickedValue ?? info.default;
|
|
275
275
|
if (value === info.default) {
|
|
276
|
-
item.description = ( localize(
|
|
276
|
+
item.description = ( localize(13804, "(Default)"));
|
|
277
277
|
picks.unshift(item);
|
|
278
278
|
}
|
|
279
279
|
else if (value === topValue) {
|
|
@@ -302,7 +302,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
302
302
|
return { value: result, input: info };
|
|
303
303
|
}
|
|
304
304
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
305
|
-
|
|
305
|
+
13805,
|
|
306
306
|
"Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
|
|
307
307
|
variable,
|
|
308
308
|
info.command
|
|
@@ -311,14 +311,14 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
311
311
|
}
|
|
312
312
|
default:
|
|
313
313
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
314
|
-
|
|
314
|
+
13806,
|
|
315
315
|
"Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
|
|
316
316
|
variable
|
|
317
317
|
))));
|
|
318
318
|
}
|
|
319
319
|
}
|
|
320
320
|
throw ( new VariableError(VariableKind.Input, ( localize(
|
|
321
|
-
|
|
321
|
+
13807,
|
|
322
322
|
"Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
|
|
323
323
|
variable
|
|
324
324
|
))));
|
package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js
CHANGED
|
@@ -55,8 +55,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
|
|
|
55
55
|
availableFileSystems.unshift(Schemas.vscodeRemote);
|
|
56
56
|
}
|
|
57
57
|
let workspacePath = await this.fileDialogService.showSaveDialog({
|
|
58
|
-
saveLabel: ( localize(
|
|
59
|
-
title: ( localize(
|
|
58
|
+
saveLabel: ( localize(14660, "Save")),
|
|
59
|
+
title: ( localize(14661, "Save Workspace")),
|
|
60
60
|
filters: WORKSPACE_FILTER,
|
|
61
61
|
defaultUri: joinPath(await this.fileDialogService.defaultWorkspacePath(), this.getNewWorkspaceName()),
|
|
62
62
|
availableFileSystems
|
|
@@ -255,14 +255,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
|
|
|
255
255
|
}
|
|
256
256
|
onInvalidWorkspaceConfigurationFileError() {
|
|
257
257
|
const message = ( localize(
|
|
258
|
-
|
|
258
|
+
14662,
|
|
259
259
|
"Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again."
|
|
260
260
|
));
|
|
261
261
|
this.askToOpenWorkspaceConfigurationFile(message);
|
|
262
262
|
}
|
|
263
263
|
askToOpenWorkspaceConfigurationFile(message) {
|
|
264
264
|
this.notificationService.prompt(Severity.Error, message, [{
|
|
265
|
-
label: ( localize(
|
|
265
|
+
label: ( localize(14663, "Open Workspace Configuration")),
|
|
266
266
|
run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
|
|
267
267
|
}]);
|
|
268
268
|
}
|