@codingame/monaco-vscode-configuration-service-override 27.0.0 → 28.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.
Files changed (8) hide show
  1. package/package.json +3 -3
  2. package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js +54 -54
  3. package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js +7 -7
  4. package/vscode/src/vs/workbench/services/configuration/browser/configurationService.d.ts +1 -0
  5. package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +5 -2
  6. package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +43 -43
  7. package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +7 -7
  8. 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": "27.0.0",
3
+ "version": "28.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": "27.0.0",
19
- "@codingame/monaco-vscode-files-service-override": "27.0.0"
18
+ "@codingame/monaco-vscode-api": "28.0.0",
19
+ "@codingame/monaco-vscode-files-service-override": "28.0.0"
20
20
  },
21
21
  "main": "index.js",
22
22
  "module": "index.js",
package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js CHANGED
@@ -27,28 +27,28 @@ const configurationEntrySchema = {
27
27
  properties: {
28
28
  title: {
29
29
  description: ( localize(
30
- 2669,
30
+ 2674,
31
31
  "A title for the current category of settings. This label will be rendered in the Settings editor as a subheading. If the title is the same as the extension display name, then the category will be grouped under the main extension heading."
32
32
  )),
33
33
  type: "string"
34
34
  },
35
35
  order: {
36
36
  description: ( localize(
37
- 2670,
37
+ 2675,
38
38
  "When specified, gives the order of this category of settings relative to other categories."
39
39
  )),
40
40
  type: "integer"
41
41
  },
42
42
  properties: {
43
- description: ( localize(2671, "Description of the configuration properties.")),
43
+ description: ( localize(2676, "Description of the configuration properties.")),
44
44
  type: "object",
45
45
  propertyNames: {
46
46
  pattern: "\\S+",
47
- patternErrorMessage: ( localize(2672, "Property should not be empty."))
47
+ patternErrorMessage: ( localize(2677, "Property should not be empty."))
48
48
  },
49
49
  additionalProperties: {
50
50
  anyOf: [{
51
- title: ( localize(2673, "Schema of the configuration property.")),
51
+ title: ( localize(2678, "Schema of the configuration property.")),
52
52
  $ref: "http://json-schema.org/draft-07/schema#"
53
53
  }, {
54
54
  type: "object",
@@ -64,24 +64,24 @@ const configurationEntrySchema = {
64
64
  "machine-overridable"
65
65
  ],
66
66
  default: "window",
67
- enumDescriptions: [( localize(2674, "Configuration that can be configured only in the user settings.")), ( localize(
68
- 2675,
67
+ enumDescriptions: [( localize(2679, "Configuration that can be configured only in the user settings.")), ( localize(
68
+ 2680,
69
69
  "Configuration that can be configured only in the user settings or only in the remote settings."
70
70
  )), ( localize(
71
- 2676,
71
+ 2681,
72
72
  "Configuration that can be configured in the user, remote or workspace settings."
73
73
  )), ( localize(
74
- 2677,
74
+ 2682,
75
75
  "Configuration that can be configured in the user, remote, workspace or folder settings."
76
76
  )), ( localize(
77
- 2678,
77
+ 2683,
78
78
  "Resource configuration that can be configured in language specific settings."
79
79
  )), ( localize(
80
- 2679,
80
+ 2684,
81
81
  "Machine configuration that can be configured also in workspace or folder settings."
82
82
  ))],
83
83
  markdownDescription: ( localize(
84
- 2680,
84
+ 2685,
85
85
  "Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`."
86
86
  ))
87
87
  },
@@ -90,14 +90,14 @@ const configurationEntrySchema = {
90
90
  items: {
91
91
  type: "string"
92
92
  },
93
- description: ( localize(2681, "Descriptions for enum values"))
93
+ description: ( localize(2686, "Descriptions for enum values"))
94
94
  },
95
95
  markdownEnumDescriptions: {
96
96
  type: "array",
97
97
  items: {
98
98
  type: "string"
99
99
  },
100
- description: ( localize(2682, "Descriptions for enum values in the markdown format."))
100
+ description: ( localize(2687, "Descriptions for enum values in the markdown format."))
101
101
  },
102
102
  enumItemLabels: {
103
103
  type: "array",
@@ -105,50 +105,50 @@ const configurationEntrySchema = {
105
105
  type: "string"
106
106
  },
107
107
  markdownDescription: ( localize(
108
- 2683,
108
+ 2688,
109
109
  "Labels for enum values to be displayed in the Settings editor. When specified, the {0} values still show after the labels, but less prominently.",
110
110
  "`enum`"
111
111
  ))
112
112
  },
113
113
  markdownDescription: {
114
114
  type: "string",
115
- description: ( localize(2684, "The description in the markdown format."))
115
+ description: ( localize(2689, "The description in the markdown format."))
116
116
  },
117
117
  deprecationMessage: {
118
118
  type: "string",
119
119
  description: ( localize(
120
- 2685,
120
+ 2690,
121
121
  "If set, the property is marked as deprecated and the given message is shown as an explanation."
122
122
  ))
123
123
  },
124
124
  markdownDeprecationMessage: {
125
125
  type: "string",
126
126
  description: ( localize(
127
- 2686,
127
+ 2691,
128
128
  "If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format."
129
129
  ))
130
130
  },
131
131
  editPresentation: {
132
132
  type: "string",
133
133
  enum: ["singlelineText", "multilineText"],
134
- enumDescriptions: [( localize(2687, "The value will be shown in an inputbox.")), ( localize(2688, "The value will be shown in a textarea."))],
134
+ enumDescriptions: [( localize(2692, "The value will be shown in an inputbox.")), ( localize(2693, "The value will be shown in a textarea."))],
135
135
  default: "singlelineText",
136
136
  description: ( localize(
137
- 2689,
137
+ 2694,
138
138
  "When specified, controls the presentation format of the string setting."
139
139
  ))
140
140
  },
141
141
  order: {
142
142
  type: "integer",
143
143
  description: ( localize(
144
- 2690,
144
+ 2695,
145
145
  "When specified, gives the order of this setting relative to other settings within the same category. Settings with an order property will be placed before settings without this property set."
146
146
  ))
147
147
  },
148
148
  ignoreSync: {
149
149
  type: "boolean",
150
150
  description: ( localize(
151
- 2691,
151
+ 2696,
152
152
  "When enabled, Settings Sync will not sync the user value of this configuration by default."
153
153
  ))
154
154
  },
@@ -158,7 +158,7 @@ const configurationEntrySchema = {
158
158
  type: "string"
159
159
  },
160
160
  description: ( localize(
161
- 2692,
161
+ 2697,
162
162
  "A list of keywords that help users find this setting in the Settings editor. These are not shown to the user."
163
163
  ))
164
164
  },
@@ -173,20 +173,20 @@ const configurationEntrySchema = {
173
173
  "telemetry",
174
174
  "usesOnlineServices"
175
175
  ],
176
- enumDescriptions: [( localize(2693, "Accessibility settings")), ( localize(
177
- 2694,
176
+ enumDescriptions: [( localize(2698, "Accessibility settings")), ( localize(
177
+ 2699,
178
178
  "Advanced settings are hidden by default in the Settings editor unless the user chooses to show advanced settings."
179
179
  )), ( localize(
180
- 2695,
180
+ 2700,
181
181
  "Experimental settings are subject to change and may be removed in future releases."
182
182
  )), ( localize(
183
- 2696,
183
+ 2701,
184
184
  "Preview settings can be used to try out new features before they are finalized."
185
- )), ( localize(2697, "Telemetry settings")), ( localize(2698, "Settings that use online services"))]
185
+ )), ( localize(2702, "Telemetry settings")), ( localize(2703, "Settings that use online services"))]
186
186
  },
187
187
  additionalItems: true,
188
188
  markdownDescription: ( localize(
189
- 2699,
189
+ 2704,
190
190
  "A list of tags under which to place the setting. The tag can then be searched up in the Settings editor. For example, specifying the `experimental` tag allows one to find the setting by searching `@tag:experimental`."
191
191
  ))
192
192
  }
@@ -245,7 +245,7 @@ defaultConfigurationExtPoint.setHandler((
245
245
  const registeredPropertyScheme = registeredProperties[key];
246
246
  if (registeredPropertyScheme?.disallowConfigurationDefault) {
247
247
  extension.collector.warn(( localize(
248
- 2700,
248
+ 2705,
249
249
  "Cannot register configuration defaults for '{0}'. This setting does not allow contributing configuration defaults.",
250
250
  key
251
251
  )));
@@ -255,7 +255,7 @@ defaultConfigurationExtPoint.setHandler((
255
255
  if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
256
256
  if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
257
257
  extension.collector.warn(( localize(
258
- 2701,
258
+ 2706,
259
259
  "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.",
260
260
  key
261
261
  )));
@@ -279,7 +279,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
279
279
  extensionPoint: "configuration",
280
280
  deps: [defaultConfigurationExtPoint],
281
281
  jsonSchema: {
282
- description: ( localize(2702, "Contributes configuration settings.")),
282
+ description: ( localize(2707, "Contributes configuration settings.")),
283
283
  oneOf: [configurationEntrySchema, {
284
284
  type: "array",
285
285
  items: configurationEntrySchema
@@ -308,7 +308,7 @@ configurationExtPoint.setHandler((
308
308
  function handleConfiguration(node, extension) {
309
309
  const configuration = deepClone(node);
310
310
  if (configuration.title && (typeof configuration.title !== "string")) {
311
- extension.collector.error(( localize(2703, "'configuration.title' must be a string")));
311
+ extension.collector.error(( localize(2708, "'configuration.title' must be a string")));
312
312
  }
313
313
  validateProperties(configuration, extension);
314
314
  configuration.id = node.id || extension.description.identifier.value;
@@ -325,7 +325,7 @@ configurationExtPoint.setHandler((
325
325
  const extensionConfigurationPolicy = product.extensionConfigurationPolicy;
326
326
  if (properties) {
327
327
  if (typeof properties !== "object") {
328
- extension.collector.error(( localize(2704, "'configuration.properties' must be an object")));
328
+ extension.collector.error(( localize(2709, "'configuration.properties' must be an object")));
329
329
  configuration.properties = {};
330
330
  }
331
331
  for (const key in properties) {
@@ -338,12 +338,12 @@ configurationExtPoint.setHandler((
338
338
  }
339
339
  if (( seenProperties.has(key)) && !( EXTENSION_UNIFICATION_EXTENSION_IDS.has(extension.description.identifier.value.toLowerCase()))) {
340
340
  delete properties[key];
341
- extension.collector.warn(( localize(2705, "Cannot register '{0}'. This property is already registered.", key)));
341
+ extension.collector.warn(( localize(2710, "Cannot register '{0}'. This property is already registered.", key)));
342
342
  continue;
343
343
  }
344
344
  if (!isObject(propertyConfiguration)) {
345
345
  delete properties[key];
346
- extension.collector.error(( localize(2706, "configuration.properties property '{0}' must be an object", key)));
346
+ extension.collector.error(( localize(2711, "configuration.properties property '{0}' must be an object", key)));
347
347
  continue;
348
348
  }
349
349
  if (extensionConfigurationPolicy?.[key]) {
@@ -361,7 +361,7 @@ configurationExtPoint.setHandler((
361
361
  const subNodes = configuration.allOf;
362
362
  if (subNodes) {
363
363
  extension.collector.error(( localize(
364
- 2707,
364
+ 2712,
365
365
  "'configuration.allOf' is deprecated and should no longer be used. Instead, pass multiple configuration sections as an array to the 'configuration' contribution point."
366
366
  )));
367
367
  for (const node of subNodes) {
@@ -401,7 +401,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
401
401
  "folders": {
402
402
  minItems: 0,
403
403
  uniqueItems: true,
404
- description: ( localize(2708, "List of folders to be loaded in the workspace.")),
404
+ description: ( localize(2713, "List of folders to be loaded in the workspace.")),
405
405
  items: {
406
406
  type: "object",
407
407
  defaultSnippets: [{
@@ -414,13 +414,13 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
414
414
  path: {
415
415
  type: "string",
416
416
  description: ( localize(
417
- 2709,
417
+ 2714,
418
418
  "A file path. e.g. `/root/folderA` or `./folderA` for a relative path that will be resolved against the location of the workspace file."
419
419
  ))
420
420
  },
421
421
  name: {
422
422
  type: "string",
423
- description: ( localize(2710, "An optional name for the folder. "))
423
+ description: ( localize(2715, "An optional name for the folder. "))
424
424
  }
425
425
  },
426
426
  required: ["path"]
@@ -428,11 +428,11 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
428
428
  properties: {
429
429
  uri: {
430
430
  type: "string",
431
- description: ( localize(2711, "URI of the folder"))
431
+ description: ( localize(2716, "URI of the folder"))
432
432
  },
433
433
  name: {
434
434
  type: "string",
435
- description: ( localize(2710, "An optional name for the folder. "))
435
+ description: ( localize(2715, "An optional name for the folder. "))
436
436
  }
437
437
  },
438
438
  required: ["uri"]
@@ -442,7 +442,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
442
442
  "settings": {
443
443
  type: "object",
444
444
  default: {},
445
- description: ( localize(2712, "Workspace settings")),
445
+ description: ( localize(2717, "Workspace settings")),
446
446
  $ref: workspaceSettingsSchemaId
447
447
  },
448
448
  "launch": {
@@ -451,7 +451,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
451
451
  configurations: [],
452
452
  compounds: []
453
453
  },
454
- description: ( localize(2713, "Workspace launch configurations")),
454
+ description: ( localize(2718, "Workspace launch configurations")),
455
455
  $ref: launchSchemaId
456
456
  },
457
457
  "tasks": {
@@ -460,7 +460,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
460
460
  version: "2.0.0",
461
461
  tasks: []
462
462
  },
463
- description: ( localize(2714, "Workspace task configurations")),
463
+ description: ( localize(2719, "Workspace task configurations")),
464
464
  $ref: tasksSchemaId
465
465
  },
466
466
  "mcp": {
@@ -474,27 +474,27 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
474
474
  }
475
475
  }
476
476
  },
477
- description: ( localize(2715, "Model Context Protocol server configurations")),
477
+ description: ( localize(2720, "Model Context Protocol server configurations")),
478
478
  $ref: mcpSchemaId
479
479
  },
480
480
  "extensions": {
481
481
  type: "object",
482
482
  default: {},
483
- description: ( localize(2716, "Workspace extensions")),
483
+ description: ( localize(2721, "Workspace extensions")),
484
484
  $ref: "vscode://schemas/extensions"
485
485
  },
486
486
  "remoteAuthority": {
487
487
  type: "string",
488
488
  doNotSuggest: true,
489
- description: ( localize(2717, "The remote server where the workspace is located."))
489
+ description: ( localize(2722, "The remote server where the workspace is located."))
490
490
  },
491
491
  "transient": {
492
492
  type: "boolean",
493
493
  doNotSuggest: true,
494
- description: ( localize(2718, "A transient workspace will disappear when restarting or reloading."))
494
+ description: ( localize(2723, "A transient workspace will disappear when restarting or reloading."))
495
495
  }
496
496
  },
497
- errorMessage: ( localize(2719, "Unknown workspace configuration property"))
497
+ errorMessage: ( localize(2724, "Unknown workspace configuration property"))
498
498
  });
499
499
  class SettingsTableRenderer extends Disposable {
500
500
  constructor() {
@@ -508,7 +508,7 @@ class SettingsTableRenderer extends Disposable {
508
508
  const configuration = manifest.contributes?.configuration ? Array.isArray(manifest.contributes.configuration) ? manifest.contributes.configuration : [manifest.contributes.configuration] : [];
509
509
  const properties = getAllConfigurationProperties(configuration);
510
510
  const contrib = properties ? ( Object.keys(properties)) : [];
511
- const headers = [( localize(2720, "ID")), ( localize(2721, "Description")), ( localize(2722, "Default"))];
511
+ const headers = [( localize(2725, "ID")), ( localize(2726, "Description")), ( localize(2727, "Default"))];
512
512
  const rows = ( contrib.sort((a, b) => a.localeCompare(b)).map(key => {
513
513
  return [( new MarkdownString()).appendMarkdown(`\`${key}\``), properties[key].markdownDescription ? ( new MarkdownString(properties[key].markdownDescription, false)) : properties[key].description ?? "", ( new MarkdownString()).appendCodeblock("json", JSON.stringify(
514
514
  isUndefined(properties[key].default) ? getDefaultValue(properties[key].type) : properties[key].default,
@@ -527,7 +527,7 @@ class SettingsTableRenderer extends Disposable {
527
527
  }
528
528
  ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
529
529
  id: "configuration",
530
- label: ( localize(2723, "Settings")),
530
+ label: ( localize(2728, "Settings")),
531
531
  access: {
532
532
  canToggle: false
533
533
  },
@@ -543,7 +543,7 @@ class ConfigurationDefaultsTableRenderer extends Disposable {
543
543
  }
544
544
  render(manifest) {
545
545
  const configurationDefaults = manifest.contributes?.configurationDefaults ?? {};
546
- const headers = [( localize(2724, "Languages")), ( localize(2725, "Setting")), ( localize(2726, "Override Value"))];
546
+ const headers = [( localize(2729, "Languages")), ( localize(2730, "Setting")), ( localize(2731, "Override Value"))];
547
547
  const rows = [];
548
548
  for (const key of ( Object.keys(configurationDefaults)).sort((a, b) => a.localeCompare(b))) {
549
549
  const value = configurationDefaults[key];
@@ -576,7 +576,7 @@ class ConfigurationDefaultsTableRenderer extends Disposable {
576
576
  }
577
577
  ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
578
578
  id: "configurationDefaults",
579
- label: ( localize(2727, "Settings Default Overrides")),
579
+ label: ( localize(2732, "Settings Default Overrides")),
580
580
  access: {
581
581
  canToggle: false
582
582
  },
package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js CHANGED
@@ -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
- 15077,
65
+ 15274,
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(15078, "Open Workspace")),
70
+ label: ( localize(15275, "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
- 15079,
81
+ 15276,
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(15080, "Select Workspace")),
85
+ label: ( localize(15277, "Select Workspace")),
86
86
  run: () => {
87
87
  this.quickInputService.pick(( workspaces.map(workspace => ({
88
88
  label: workspace
89
89
  }))), {
90
- placeHolder: ( localize(15081, "Select a workspace to open"))
90
+ placeHolder: ( localize(15278, "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(15078, "Open Workspace")),
112
+ title: ( localize2(15275, "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(15082, "This workspace is already open.")));
127
+ notificationService.info(( localize(15279, "This workspace is already open.")));
128
128
  return;
129
129
  }
130
130
  }
package/vscode/src/vs/workbench/services/configuration/browser/configurationService.d.ts CHANGED
@@ -69,6 +69,7 @@ export declare class WorkspaceService extends Disposable implements IWorkbenchCo
69
69
  getCompleteWorkspace(): Promise<Workspace>;
70
70
  getWorkspace(): Workspace;
71
71
  getWorkbenchState(): WorkbenchState;
72
+ hasWorkspaceData(): boolean;
72
73
  getWorkspaceFolder(resource: URI): IWorkspaceFolder | null;
73
74
  addFolders(foldersToAdd: IWorkspaceFolderCreationData[], index?: number): Promise<void>;
74
75
  removeFolders(foldersToRemove: URI[]): Promise<void>;
package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js CHANGED
@@ -209,6 +209,9 @@ class WorkspaceService extends Disposable {
209
209
  }
210
210
  return WorkbenchState.EMPTY;
211
211
  }
212
+ hasWorkspaceData() {
213
+ return this.getWorkbenchState() !== WorkbenchState.EMPTY;
214
+ }
212
215
  getWorkspaceFolder(resource) {
213
216
  return this.workspace.getFolder(resource);
214
217
  }
@@ -1321,7 +1324,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
1321
1324
  } : workspaceSettingsSchema;
1322
1325
  const configDefaultsSchema = {
1323
1326
  type: "object",
1324
- description: ( localize(15262, "Contribute defaults for configurations")),
1327
+ description: ( localize(15460, "Contribute defaults for configurations")),
1325
1328
  properties: Object.assign(
1326
1329
  {},
1327
1330
  this.filterDefaultOverridableProperties(machineOverridableSettings.properties),
@@ -1471,7 +1474,7 @@ configurationRegistry.registerConfiguration({
1471
1474
  properties: {
1472
1475
  [APPLY_ALL_PROFILES_SETTING]: {
1473
1476
  "type": "array",
1474
- description: ( localize(15263, "Configure settings to be applied for all profiles.")),
1477
+ description: ( localize(15461, "Configure settings to be applied for all profiles.")),
1475
1478
  "default": [],
1476
1479
  "scope": ConfigurationScope.APPLICATION,
1477
1480
  additionalProperties: true,
package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js CHANGED
@@ -163,7 +163,7 @@ let ConfigurationEditing = class ConfigurationEditing {
163
163
  );
164
164
  }
165
165
  throw ( new ConfigurationEditingError(( localize(
166
- 15264,
166
+ 15462,
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(15265, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15266, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(15267, "Open MCP Configuration")) : null;
247
+ const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(15463, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15464, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(15465, "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(15268, "Open Settings")),
255
+ label: ( localize(15466, "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(15265, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15266, "Open Launch Configuration")) : null;
261
+ const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(15463, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(15464, "Open Launch Configuration")) : null;
262
262
  if (openStandAloneConfigurationActionLabel) {
263
263
  this.notificationService.prompt(Severity.Error, error.message, [{
264
- label: ( localize(15269, "Save and Retry")),
264
+ label: ( localize(15467, "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(15269, "Save and Retry")),
281
+ label: ( localize(15467, "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(15268, "Open Settings")),
290
+ label: ( localize(15466, "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
- 15270,
338
+ 15468,
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
- 15271,
344
+ 15469,
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
- 15272,
351
+ 15470,
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
- 15273,
357
+ 15471,
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
- 15274,
363
+ 15472,
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
- 15275,
369
+ 15473,
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
- 15276,
375
+ 15474,
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
- 15277,
381
+ 15475,
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
- 15278,
386
+ 15476,
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
- 15279,
392
+ 15477,
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
- 15280,
400
+ 15478,
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
- 15281,
406
+ 15479,
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
- 15282,
412
+ 15480,
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
- 15283,
419
+ 15481,
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
- 15284,
424
+ 15482,
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
- 15285,
429
+ 15483,
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
- 15286,
442
+ 15484,
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
- 15287,
455
+ 15485,
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
- 15288,
461
+ 15486,
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
- 15289,
467
+ 15487,
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
- 15290,
474
+ 15488,
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
- 15291,
479
+ 15489,
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
- 15292,
484
+ 15490,
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
- 15293,
497
+ 15491,
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
- 15294,
509
+ 15492,
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
- 15295,
515
+ 15493,
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
- 15296,
521
+ 15494,
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
- 15297,
528
+ 15495,
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
- 15298,
533
+ 15496,
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
- 15299,
538
+ 15497,
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
- 15300,
543
+ 15498,
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
- 15301,
549
+ 15499,
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(15302, "User Settings");
558
+ return localize(15500, "User Settings");
559
559
  case EditableConfigurationTarget.USER_REMOTE:
560
- return localize(15303, "Remote User Settings");
560
+ return localize(15501, "Remote User Settings");
561
561
  case EditableConfigurationTarget.WORKSPACE:
562
- return localize(15304, "Workspace Settings");
562
+ return localize(15502, "Workspace Settings");
563
563
  case EditableConfigurationTarget.WORKSPACE_FOLDER:
564
- return localize(15305, "Folder Settings");
564
+ return localize(15503, "Folder Settings");
565
565
  default:
566
566
  return "";
567
567
  }
package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js CHANGED
@@ -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
- 15307,
153
+ 15505,
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
- 15308,
253
+ 15506,
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
- 15309,
263
+ 15507,
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(15310, "(Default)"));
321
+ item.description = ( localize(15508, "(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
- 15311,
359
+ 15509,
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
- 15312,
368
+ 15510,
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
- 15313,
375
+ 15511,
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(16175, "Save")),
96
- title: ( localize(16176, "Save Workspace")),
95
+ saveLabel: ( localize(16373, "Save")),
96
+ title: ( localize(16374, "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
- 16177,
326
+ 16375,
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(16178, "Open Workspace Configuration")),
333
+ label: ( localize(16376, "Open Workspace Configuration")),
334
334
  run: () => this.commandService.executeCommand("workbench.action.openWorkspaceConfigFile")
335
335
  }]);
336
336
  }