@codingame/monaco-vscode-configuration-service-override 14.0.3 → 14.0.4
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 +9 -9
- 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 +42 -42
- package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +7 -7
- package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +4 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-configuration-service-override",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - configuration service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,14 +15,14 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.
|
|
19
|
-
"@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "14.0.
|
|
20
|
-
"@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common": "14.0.
|
|
21
|
-
"@codingame/monaco-vscode-api": "14.0.
|
|
22
|
-
"@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common": "14.0.
|
|
23
|
-
"@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "14.0.
|
|
24
|
-
"@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.
|
|
25
|
-
"@codingame/monaco-vscode-files-service-override": "14.0.
|
|
18
|
+
"@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.4",
|
|
19
|
+
"@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "14.0.4",
|
|
20
|
+
"@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common": "14.0.4",
|
|
21
|
+
"@codingame/monaco-vscode-api": "14.0.4",
|
|
22
|
+
"@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common": "14.0.4",
|
|
23
|
+
"@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "14.0.4",
|
|
24
|
+
"@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.4",
|
|
25
|
+
"@codingame/monaco-vscode-files-service-override": "14.0.4"
|
|
26
26
|
},
|
|
27
27
|
"main": "index.js",
|
|
28
28
|
"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
|
+
11331,
|
|
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(11332, "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
|
+
11333,
|
|
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(11334, "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(11335, "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(11332, "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(11336, "This workspace is already open.")));
|
|
116
116
|
return;
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -1094,7 +1094,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
|
|
|
1094
1094
|
} : workspaceSettingsSchema;
|
|
1095
1095
|
const configDefaultsSchema = {
|
|
1096
1096
|
type: 'object',
|
|
1097
|
-
description: ( localize(
|
|
1097
|
+
description: ( localize(11477, 'Contribute defaults for configurations')),
|
|
1098
1098
|
properties: Object.assign({}, this.filterDefaultOverridableProperties(machineOverridableSettings.properties), this.filterDefaultOverridableProperties(windowSettings.properties), this.filterDefaultOverridableProperties(resourceSettings.properties)),
|
|
1099
1099
|
patternProperties: {
|
|
1100
1100
|
[OVERRIDE_PROPERTY_PATTERN]: {
|
|
@@ -1215,7 +1215,7 @@ configurationRegistry.registerConfiguration({
|
|
|
1215
1215
|
properties: {
|
|
1216
1216
|
[APPLY_ALL_PROFILES_SETTING]: {
|
|
1217
1217
|
'type': 'array',
|
|
1218
|
-
description: ( localize(
|
|
1218
|
+
description: ( localize(11478, "Configure settings to be applied for all profiles.")),
|
|
1219
1219
|
'default': [],
|
|
1220
1220
|
'scope': ConfigurationScope.APPLICATION,
|
|
1221
1221
|
additionalProperties: true,
|
|
@@ -127,7 +127,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
127
127
|
throw this.toConfigurationEditingError(ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE, operation.target, operation);
|
|
128
128
|
}
|
|
129
129
|
throw ( new ConfigurationEditingError(( localize(
|
|
130
|
-
|
|
130
|
+
11479,
|
|
131
131
|
"Error while writing to {0}. {1}",
|
|
132
132
|
this.stringifyTarget(operation.target),
|
|
133
133
|
error.message
|
|
@@ -187,8 +187,8 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
onInvalidConfigurationError(error, operation) {
|
|
190
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(
|
|
191
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(
|
|
190
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(11480, "Open Tasks Configuration"))
|
|
191
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(11481, "Open Launch Configuration"))
|
|
192
192
|
: null;
|
|
193
193
|
if (openStandAloneConfigurationActionLabel) {
|
|
194
194
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
@@ -198,18 +198,18 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
198
198
|
}
|
|
199
199
|
else {
|
|
200
200
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
201
|
-
label: ( localize(
|
|
201
|
+
label: ( localize(11482, "Open Settings")),
|
|
202
202
|
run: () => this.openSettings(operation)
|
|
203
203
|
}]);
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
206
|
onConfigurationFileDirtyError(error, operation, scopes) {
|
|
207
|
-
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(
|
|
208
|
-
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(
|
|
207
|
+
const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(11480, "Open Tasks Configuration"))
|
|
208
|
+
: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(11481, "Open Launch Configuration"))
|
|
209
209
|
: null;
|
|
210
210
|
if (openStandAloneConfigurationActionLabel) {
|
|
211
211
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
212
|
-
label: ( localize(
|
|
212
|
+
label: ( localize(11483, "Save and Retry")),
|
|
213
213
|
run: () => {
|
|
214
214
|
const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
|
|
215
215
|
this.writeConfiguration(operation.target, { key, value: operation.value }, { handleDirtyFile: 'save', scopes });
|
|
@@ -222,11 +222,11 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
222
222
|
}
|
|
223
223
|
else {
|
|
224
224
|
this.notificationService.prompt(Severity.Error, error.message, [{
|
|
225
|
-
label: ( localize(
|
|
225
|
+
label: ( localize(11483, "Save and Retry")),
|
|
226
226
|
run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, { handleDirtyFile: 'save', scopes })
|
|
227
227
|
},
|
|
228
228
|
{
|
|
229
|
-
label: ( localize(
|
|
229
|
+
label: ( localize(11482, "Open Settings")),
|
|
230
230
|
run: () => this.openSettings(operation)
|
|
231
231
|
}]);
|
|
232
232
|
}
|
|
@@ -263,82 +263,82 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
263
263
|
toErrorMessage(error, target, operation) {
|
|
264
264
|
switch (error) {
|
|
265
265
|
case ConfigurationEditingErrorCode.ERROR_POLICY_CONFIGURATION: return localize(
|
|
266
|
-
|
|
266
|
+
11484,
|
|
267
267
|
"Unable to write {0} because it is configured in system policy.",
|
|
268
268
|
operation.key
|
|
269
269
|
);
|
|
270
270
|
case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY: return localize(
|
|
271
|
-
|
|
271
|
+
11485,
|
|
272
272
|
"Unable to write to {0} because {1} is not a registered configuration.",
|
|
273
273
|
this.stringifyTarget(target),
|
|
274
274
|
operation.key
|
|
275
275
|
);
|
|
276
276
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION: return localize(
|
|
277
|
-
|
|
277
|
+
11486,
|
|
278
278
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
279
279
|
operation.key
|
|
280
280
|
);
|
|
281
281
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE: return localize(
|
|
282
|
-
|
|
282
|
+
11487,
|
|
283
283
|
"Unable to write {0} to Workspace Settings. This setting can be written only into User settings.",
|
|
284
284
|
operation.key
|
|
285
285
|
);
|
|
286
286
|
case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_CONFIGURATION: return localize(
|
|
287
|
-
|
|
287
|
+
11488,
|
|
288
288
|
"Unable to write to Folder Settings because {0} does not support the folder resource scope.",
|
|
289
289
|
operation.key
|
|
290
290
|
);
|
|
291
291
|
case ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET: return localize(
|
|
292
|
-
|
|
292
|
+
11489,
|
|
293
293
|
"Unable to write to User Settings because {0} does not support for global scope.",
|
|
294
294
|
operation.key
|
|
295
295
|
);
|
|
296
296
|
case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET: return localize(
|
|
297
|
-
|
|
297
|
+
11490,
|
|
298
298
|
"Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.",
|
|
299
299
|
operation.key
|
|
300
300
|
);
|
|
301
301
|
case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_TARGET: return localize(
|
|
302
|
-
|
|
302
|
+
11491,
|
|
303
303
|
"Unable to write to Folder Settings because no resource is provided."
|
|
304
304
|
);
|
|
305
305
|
case ConfigurationEditingErrorCode.ERROR_INVALID_RESOURCE_LANGUAGE_CONFIGURATION: return localize(
|
|
306
|
-
|
|
306
|
+
11492,
|
|
307
307
|
"Unable to write to Language Settings because {0} is not a resource language setting.",
|
|
308
308
|
operation.key
|
|
309
309
|
);
|
|
310
310
|
case ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED: return localize(
|
|
311
|
-
|
|
311
|
+
11493,
|
|
312
312
|
"Unable to write to {0} because no workspace is opened. Please open a workspace first and try again.",
|
|
313
313
|
this.stringifyTarget(target)
|
|
314
314
|
);
|
|
315
315
|
case ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION: {
|
|
316
316
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
317
317
|
return localize(
|
|
318
|
-
|
|
318
|
+
11494,
|
|
319
319
|
"Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again."
|
|
320
320
|
);
|
|
321
321
|
}
|
|
322
322
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
323
323
|
return localize(
|
|
324
|
-
|
|
324
|
+
11495,
|
|
325
325
|
"Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again."
|
|
326
326
|
);
|
|
327
327
|
}
|
|
328
328
|
switch (target) {
|
|
329
329
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
330
330
|
return localize(
|
|
331
|
-
|
|
331
|
+
11496,
|
|
332
332
|
"Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again."
|
|
333
333
|
);
|
|
334
334
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
335
335
|
return localize(
|
|
336
|
-
|
|
336
|
+
11497,
|
|
337
337
|
"Unable to write into remote user settings. Please open the remote user settings to correct errors/warnings in it and try again."
|
|
338
338
|
);
|
|
339
339
|
case EditableConfigurationTarget.WORKSPACE:
|
|
340
340
|
return localize(
|
|
341
|
-
|
|
341
|
+
11498,
|
|
342
342
|
"Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again."
|
|
343
343
|
);
|
|
344
344
|
case EditableConfigurationTarget.WORKSPACE_FOLDER: {
|
|
@@ -350,7 +350,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
350
350
|
}
|
|
351
351
|
}
|
|
352
352
|
return localize(
|
|
353
|
-
|
|
353
|
+
11499,
|
|
354
354
|
"Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.",
|
|
355
355
|
workspaceFolderName
|
|
356
356
|
);
|
|
@@ -362,30 +362,30 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
362
362
|
case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY: {
|
|
363
363
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
364
364
|
return localize(
|
|
365
|
-
|
|
365
|
+
11500,
|
|
366
366
|
"Unable to write into tasks configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
367
367
|
);
|
|
368
368
|
}
|
|
369
369
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
370
370
|
return localize(
|
|
371
|
-
|
|
371
|
+
11501,
|
|
372
372
|
"Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again."
|
|
373
373
|
);
|
|
374
374
|
}
|
|
375
375
|
switch (target) {
|
|
376
376
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
377
377
|
return localize(
|
|
378
|
-
|
|
378
|
+
11502,
|
|
379
379
|
"Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again."
|
|
380
380
|
);
|
|
381
381
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
382
382
|
return localize(
|
|
383
|
-
|
|
383
|
+
11503,
|
|
384
384
|
"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."
|
|
385
385
|
);
|
|
386
386
|
case EditableConfigurationTarget.WORKSPACE:
|
|
387
387
|
return localize(
|
|
388
|
-
|
|
388
|
+
11504,
|
|
389
389
|
"Unable to write into workspace settings because the file has unsaved changes. Please save the workspace settings file first and then try again."
|
|
390
390
|
);
|
|
391
391
|
case EditableConfigurationTarget.WORKSPACE_FOLDER: {
|
|
@@ -397,7 +397,7 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
397
397
|
}
|
|
398
398
|
}
|
|
399
399
|
return localize(
|
|
400
|
-
|
|
400
|
+
11505,
|
|
401
401
|
"Unable to write into folder settings because the file has unsaved changes. Please save the '{0}' folder settings file first and then try again.",
|
|
402
402
|
workspaceFolderName
|
|
403
403
|
);
|
|
@@ -409,40 +409,40 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
409
409
|
case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_MODIFIED_SINCE:
|
|
410
410
|
if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
|
|
411
411
|
return localize(
|
|
412
|
-
|
|
412
|
+
11506,
|
|
413
413
|
"Unable to write into tasks configuration file because the content of the file is newer."
|
|
414
414
|
);
|
|
415
415
|
}
|
|
416
416
|
if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
|
|
417
417
|
return localize(
|
|
418
|
-
|
|
418
|
+
11507,
|
|
419
419
|
"Unable to write into launch configuration file because the content of the file is newer."
|
|
420
420
|
);
|
|
421
421
|
}
|
|
422
422
|
switch (target) {
|
|
423
423
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
424
424
|
return localize(
|
|
425
|
-
|
|
425
|
+
11508,
|
|
426
426
|
"Unable to write into user settings because the content of the file is newer."
|
|
427
427
|
);
|
|
428
428
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
429
429
|
return localize(
|
|
430
|
-
|
|
430
|
+
11509,
|
|
431
431
|
"Unable to write into remote user settings because the content of the file is newer."
|
|
432
432
|
);
|
|
433
433
|
case EditableConfigurationTarget.WORKSPACE:
|
|
434
434
|
return localize(
|
|
435
|
-
|
|
435
|
+
11510,
|
|
436
436
|
"Unable to write into workspace settings because the content of the file is newer."
|
|
437
437
|
);
|
|
438
438
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
439
439
|
return localize(
|
|
440
|
-
|
|
440
|
+
11511,
|
|
441
441
|
"Unable to write into folder settings because the content of the file is newer."
|
|
442
442
|
);
|
|
443
443
|
}
|
|
444
444
|
case ConfigurationEditingErrorCode.ERROR_INTERNAL: return localize(
|
|
445
|
-
|
|
445
|
+
11512,
|
|
446
446
|
"Unable to write to {0} because of an internal error.",
|
|
447
447
|
this.stringifyTarget(target)
|
|
448
448
|
);
|
|
@@ -451,13 +451,13 @@ let ConfigurationEditing = class ConfigurationEditing {
|
|
|
451
451
|
stringifyTarget(target) {
|
|
452
452
|
switch (target) {
|
|
453
453
|
case EditableConfigurationTarget.USER_LOCAL:
|
|
454
|
-
return localize(
|
|
454
|
+
return localize(11513, "User Settings");
|
|
455
455
|
case EditableConfigurationTarget.USER_REMOTE:
|
|
456
|
-
return localize(
|
|
456
|
+
return localize(11514, "Remote User Settings");
|
|
457
457
|
case EditableConfigurationTarget.WORKSPACE:
|
|
458
|
-
return localize(
|
|
458
|
+
return localize(11515, "Workspace Settings");
|
|
459
459
|
case EditableConfigurationTarget.WORKSPACE_FOLDER:
|
|
460
|
-
return localize(
|
|
460
|
+
return localize(11516, "Folder Settings");
|
|
461
461
|
default:
|
|
462
462
|
return '';
|
|
463
463
|
}
|
|
@@ -185,7 +185,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
185
185
|
result = await this.commandService.executeCommand(commandId, configuration);
|
|
186
186
|
if (typeof result !== 'string' && !isUndefinedOrNull(result)) {
|
|
187
187
|
throw ( new Error(( localize(
|
|
188
|
-
|
|
188
|
+
11518,
|
|
189
189
|
"Cannot substitute command variable '{0}' because command did not return a result of type string.",
|
|
190
190
|
commandId
|
|
191
191
|
))));
|
|
@@ -237,7 +237,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
237
237
|
showUserInput(section, variable, inputInfos) {
|
|
238
238
|
if (!inputInfos) {
|
|
239
239
|
return Promise.reject(( new Error(( localize(
|
|
240
|
-
|
|
240
|
+
11519,
|
|
241
241
|
"Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
|
|
242
242
|
variable,
|
|
243
243
|
'inputs'
|
|
@@ -247,7 +247,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
247
247
|
if (info) {
|
|
248
248
|
const missingAttribute = (attrName) => {
|
|
249
249
|
throw ( new Error(( localize(
|
|
250
|
-
|
|
250
|
+
11520,
|
|
251
251
|
"Input variable '{0}' is of type '{1}' and must include '{2}'.",
|
|
252
252
|
variable,
|
|
253
253
|
info.type,
|
|
@@ -299,7 +299,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
299
299
|
value: value
|
|
300
300
|
};
|
|
301
301
|
if (value === info.default) {
|
|
302
|
-
item.description = ( localize(
|
|
302
|
+
item.description = ( localize(11521, "(Default)"));
|
|
303
303
|
picks.unshift(item);
|
|
304
304
|
}
|
|
305
305
|
else if (!info.default && value === previousPickedValue) {
|
|
@@ -328,7 +328,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
328
328
|
return result;
|
|
329
329
|
}
|
|
330
330
|
throw ( new Error(( localize(
|
|
331
|
-
|
|
331
|
+
11522,
|
|
332
332
|
"Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
|
|
333
333
|
variable,
|
|
334
334
|
info.command
|
|
@@ -337,14 +337,14 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
|
|
|
337
337
|
}
|
|
338
338
|
default:
|
|
339
339
|
throw ( new Error(( localize(
|
|
340
|
-
|
|
340
|
+
11523,
|
|
341
341
|
"Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
|
|
342
342
|
variable
|
|
343
343
|
))));
|
|
344
344
|
}
|
|
345
345
|
}
|
|
346
346
|
return Promise.reject(( new Error(( localize(
|
|
347
|
-
|
|
347
|
+
11524,
|
|
348
348
|
"Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
|
|
349
349
|
variable
|
|
350
350
|
)))));
|
package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js
CHANGED
|
@@ -17,7 +17,6 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
|
|
|
17
17
|
import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
|
|
18
18
|
import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
19
19
|
import { IFileDialogService, IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
|
|
20
|
-
import { mnemonicButtonLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
|
|
21
20
|
import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
|
|
22
21
|
import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
|
|
23
22
|
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
@@ -56,8 +55,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
|
|
|
56
55
|
availableFileSystems.unshift(Schemas.vscodeRemote);
|
|
57
56
|
}
|
|
58
57
|
let workspacePath = await this.fileDialogService.showSaveDialog({
|
|
59
|
-
saveLabel:
|
|
60
|
-
title: ( localize(
|
|
58
|
+
saveLabel: ( localize(12354, "Save")),
|
|
59
|
+
title: ( localize(12355, "Save Workspace")),
|
|
61
60
|
filters: WORKSPACE_FILTER,
|
|
62
61
|
defaultUri: joinPath(await this.fileDialogService.defaultWorkspacePath(), this.getNewWorkspaceName()),
|
|
63
62
|
availableFileSystems
|
|
@@ -256,14 +255,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
|
|
|
256
255
|
}
|
|
257
256
|
onInvalidWorkspaceConfigurationFileError() {
|
|
258
257
|
const message = ( localize(
|
|
259
|
-
|
|
258
|
+
12356,
|
|
260
259
|
"Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again."
|
|
261
260
|
));
|
|
262
261
|
this.askToOpenWorkspaceConfigurationFile(message);
|
|
263
262
|
}
|
|
264
263
|
askToOpenWorkspaceConfigurationFile(message) {
|
|
265
264
|
this.notificationService.prompt(Severity.Error, message, [{
|
|
266
|
-
label: ( localize(
|
|
265
|
+
label: ( localize(12357, "Open Workspace Configuration")),
|
|
267
266
|
run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
|
|
268
267
|
}]);
|
|
269
268
|
}
|