@codingame/monaco-vscode-configuration-service-override 34.1.3 → 35.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 (7) hide show
  1. package/package.json +3 -3
  2. package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js +68 -61
  3. package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js +7 -7
  4. package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +2 -2
  5. package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +43 -43
  6. package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +7 -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": "34.1.3",
3
+ "version": "35.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": "34.1.3",
19
- "@codingame/monaco-vscode-files-service-override": "34.1.3"
18
+ "@codingame/monaco-vscode-api": "35.0.0",
19
+ "@codingame/monaco-vscode-files-service-override": "35.0.0"
20
20
  },
21
21
  "main": "index.js",
22
22
  "module": "index.js",
package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js CHANGED
@@ -6,7 +6,7 @@ import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workb
6
6
  import { Extensions as Extensions$1, configurationDefaultsSchemaId, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, validateProperty, EXTENSION_UNIFICATION_EXTENSION_IDS, parseScope, getAllConfigurationProperties, getDefaultValue, overrideIdentifiersFromKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
7
7
  import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
8
8
  import { mcpSchemaId, tasksSchemaId, launchSchemaId, workspaceSettingsSchemaId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/configuration';
9
- import { isObject, isUndefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
9
+ import { isObject, hasKey, isUndefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
10
10
  import { ExtensionIdentifierMap } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
11
11
  import { Extensions as Extensions$2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
12
12
  import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -28,28 +28,28 @@ const configurationEntrySchema = {
28
28
  properties: {
29
29
  title: {
30
30
  description: ( localize(
31
- 2796,
31
+ 2872,
32
32
  "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."
33
33
  )),
34
34
  type: "string"
35
35
  },
36
36
  order: {
37
37
  description: ( localize(
38
- 2797,
38
+ 2873,
39
39
  "When specified, gives the order of this category of settings relative to other categories."
40
40
  )),
41
41
  type: "integer"
42
42
  },
43
43
  properties: {
44
- description: ( localize(2798, "Description of the configuration properties.")),
44
+ description: ( localize(2874, "Description of the configuration properties.")),
45
45
  type: "object",
46
46
  propertyNames: {
47
47
  pattern: "\\S+",
48
- patternErrorMessage: ( localize(2799, "Property should not be empty."))
48
+ patternErrorMessage: ( localize(2875, "Property should not be empty."))
49
49
  },
50
50
  additionalProperties: {
51
51
  anyOf: [{
52
- title: ( localize(2800, "Schema of the configuration property.")),
52
+ title: ( localize(2876, "Schema of the configuration property.")),
53
53
  $ref: "http://json-schema.org/draft-07/schema#"
54
54
  }, {
55
55
  type: "object",
@@ -65,24 +65,24 @@ const configurationEntrySchema = {
65
65
  "machine-overridable"
66
66
  ],
67
67
  default: "window",
68
- enumDescriptions: [( localize(2801, "Configuration that can be configured only in the user settings.")), ( localize(
69
- 2802,
68
+ enumDescriptions: [( localize(2877, "Configuration that can be configured only in the user settings.")), ( localize(
69
+ 2878,
70
70
  "Configuration that can be configured only in the user settings or only in the remote settings."
71
71
  )), ( localize(
72
- 2803,
72
+ 2879,
73
73
  "Configuration that can be configured in the user, remote or workspace settings."
74
74
  )), ( localize(
75
- 2804,
75
+ 2880,
76
76
  "Configuration that can be configured in the user, remote, workspace or folder settings."
77
77
  )), ( localize(
78
- 2805,
78
+ 2881,
79
79
  "Resource configuration that can be configured in language specific settings."
80
80
  )), ( localize(
81
- 2806,
81
+ 2882,
82
82
  "Machine configuration that can be configured also in workspace or folder settings."
83
83
  ))],
84
84
  markdownDescription: ( localize(
85
- 2807,
85
+ 2883,
86
86
  "Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`."
87
87
  ))
88
88
  },
@@ -91,14 +91,14 @@ const configurationEntrySchema = {
91
91
  items: {
92
92
  type: "string"
93
93
  },
94
- description: ( localize(2808, "Descriptions for enum values"))
94
+ description: ( localize(2884, "Descriptions for enum values"))
95
95
  },
96
96
  markdownEnumDescriptions: {
97
97
  type: "array",
98
98
  items: {
99
99
  type: "string"
100
100
  },
101
- description: ( localize(2809, "Descriptions for enum values in the markdown format."))
101
+ description: ( localize(2885, "Descriptions for enum values in the markdown format."))
102
102
  },
103
103
  enumItemLabels: {
104
104
  type: "array",
@@ -106,50 +106,50 @@ const configurationEntrySchema = {
106
106
  type: "string"
107
107
  },
108
108
  markdownDescription: ( localize(
109
- 2810,
109
+ 2886,
110
110
  "Labels for enum values to be displayed in the Settings editor. When specified, the {0} values still show after the labels, but less prominently.",
111
111
  "`enum`"
112
112
  ))
113
113
  },
114
114
  markdownDescription: {
115
115
  type: "string",
116
- description: ( localize(2811, "The description in the markdown format."))
116
+ description: ( localize(2887, "The description in the markdown format."))
117
117
  },
118
118
  deprecationMessage: {
119
119
  type: "string",
120
120
  description: ( localize(
121
- 2812,
121
+ 2888,
122
122
  "If set, the property is marked as deprecated and the given message is shown as an explanation."
123
123
  ))
124
124
  },
125
125
  markdownDeprecationMessage: {
126
126
  type: "string",
127
127
  description: ( localize(
128
- 2813,
128
+ 2889,
129
129
  "If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format."
130
130
  ))
131
131
  },
132
132
  editPresentation: {
133
133
  type: "string",
134
134
  enum: ["singlelineText", "multilineText"],
135
- enumDescriptions: [( localize(2814, "The value will be shown in an inputbox.")), ( localize(2815, "The value will be shown in a textarea."))],
135
+ enumDescriptions: [( localize(2890, "The value will be shown in an inputbox.")), ( localize(2891, "The value will be shown in a textarea."))],
136
136
  default: "singlelineText",
137
137
  description: ( localize(
138
- 2816,
138
+ 2892,
139
139
  "When specified, controls the presentation format of the string setting."
140
140
  ))
141
141
  },
142
142
  order: {
143
143
  type: "integer",
144
144
  description: ( localize(
145
- 2817,
145
+ 2893,
146
146
  "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."
147
147
  ))
148
148
  },
149
149
  ignoreSync: {
150
150
  type: "boolean",
151
151
  description: ( localize(
152
- 2818,
152
+ 2894,
153
153
  "When enabled, Settings Sync will not sync the user value of this configuration by default."
154
154
  ))
155
155
  },
@@ -159,7 +159,7 @@ const configurationEntrySchema = {
159
159
  type: "string"
160
160
  },
161
161
  description: ( localize(
162
- 2819,
162
+ 2895,
163
163
  "A list of keywords that help users find this setting in the Settings editor. These are not shown to the user."
164
164
  ))
165
165
  },
@@ -174,37 +174,37 @@ const configurationEntrySchema = {
174
174
  "telemetry",
175
175
  "usesOnlineServices"
176
176
  ],
177
- enumDescriptions: [( localize(2820, "Accessibility settings")), ( localize(
178
- 2821,
177
+ enumDescriptions: [( localize(2896, "Accessibility settings")), ( localize(
178
+ 2897,
179
179
  "Advanced settings are hidden by default in the Settings editor unless the user chooses to show advanced settings."
180
180
  )), ( localize(
181
- 2822,
181
+ 2898,
182
182
  "Experimental settings are subject to change and may be removed in future releases."
183
183
  )), ( localize(
184
- 2823,
184
+ 2899,
185
185
  "Preview settings can be used to try out new features before they are finalized."
186
- )), ( localize(2824, "Telemetry settings")), ( localize(2825, "Settings that use online services"))]
186
+ )), ( localize(2900, "Telemetry settings")), ( localize(2901, "Settings that use online services"))]
187
187
  },
188
188
  additionalItems: true,
189
189
  markdownDescription: ( localize(
190
- 2826,
190
+ 2902,
191
191
  "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`."
192
192
  ))
193
193
  },
194
194
  agentsWindow: {
195
195
  type: "object",
196
196
  markdownDescription: ( localize(
197
- 2827,
197
+ 2903,
198
198
  "Configuration overrides for the Agents window. Allows specifying a different default value and read-only behavior for this setting when running in the Agents window.\n\n**Note**: This is a proposed API. To use it, extensions must include `agentsWindowConfiguration` in their `enabledApiProposals`."
199
199
  )),
200
200
  properties: {
201
201
  "default": {
202
- description: ( localize(2828, "The default value for this setting in the Agents window."))
202
+ description: ( localize(2904, "The default value for this setting in the Agents window."))
203
203
  },
204
204
  readOnly: {
205
205
  type: "boolean",
206
206
  description: ( localize(
207
- 2829,
207
+ 2905,
208
208
  "When true, this setting cannot be changed by the user in the Agents window."
209
209
  )),
210
210
  default: false
@@ -267,7 +267,7 @@ defaultConfigurationExtPoint.setHandler((
267
267
  const registeredPropertyScheme = registeredProperties[key];
268
268
  if (registeredPropertyScheme?.disallowConfigurationDefault) {
269
269
  extension.collector.warn(( localize(
270
- 2830,
270
+ 2906,
271
271
  "Cannot register configuration defaults for '{0}'. This setting does not allow contributing configuration defaults.",
272
272
  key
273
273
  )));
@@ -277,7 +277,7 @@ defaultConfigurationExtPoint.setHandler((
277
277
  if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
278
278
  if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
279
279
  extension.collector.warn(( localize(
280
- 2831,
280
+ 2907,
281
281
  "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.",
282
282
  key
283
283
  )));
@@ -301,7 +301,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
301
301
  extensionPoint: "configuration",
302
302
  deps: [defaultConfigurationExtPoint],
303
303
  jsonSchema: {
304
- description: ( localize(2832, "Contributes configuration settings.")),
304
+ description: ( localize(2908, "Contributes configuration settings.")),
305
305
  oneOf: [configurationEntrySchema, {
306
306
  type: "array",
307
307
  items: configurationEntrySchema
@@ -330,7 +330,7 @@ configurationExtPoint.setHandler((
330
330
  function handleConfiguration(node, extension) {
331
331
  const configuration = deepClone(node);
332
332
  if (configuration.title && (typeof configuration.title !== "string")) {
333
- extension.collector.error(( localize(2833, "'configuration.title' must be a string")));
333
+ extension.collector.error(( localize(2909, "'configuration.title' must be a string")));
334
334
  }
335
335
  validateProperties(configuration, extension);
336
336
  configuration.id = node.id || extension.description.identifier.value;
@@ -347,7 +347,7 @@ configurationExtPoint.setHandler((
347
347
  const extensionConfigurationPolicy = product.extensionConfigurationPolicy;
348
348
  if (properties) {
349
349
  if (typeof properties !== "object") {
350
- extension.collector.error(( localize(2834, "'configuration.properties' must be an object")));
350
+ extension.collector.error(( localize(2910, "'configuration.properties' must be an object")));
351
351
  configuration.properties = {};
352
352
  }
353
353
  for (const key in properties) {
@@ -360,16 +360,23 @@ configurationExtPoint.setHandler((
360
360
  }
361
361
  if (( seenProperties.has(key)) && !( EXTENSION_UNIFICATION_EXTENSION_IDS.has(extension.description.identifier.value.toLowerCase()))) {
362
362
  delete properties[key];
363
- extension.collector.warn(( localize(2835, "Cannot register '{0}'. This property is already registered.", key)));
363
+ extension.collector.warn(( localize(2911, "Cannot register '{0}'. This property is already registered.", key)));
364
364
  continue;
365
365
  }
366
366
  if (!isObject(propertyConfiguration)) {
367
367
  delete properties[key];
368
- extension.collector.error(( localize(2836, "configuration.properties property '{0}' must be an object", key)));
368
+ extension.collector.error(( localize(2912, "configuration.properties property '{0}' must be an object", key)));
369
369
  continue;
370
370
  }
371
- if (extensionConfigurationPolicy?.[key]) {
372
- propertyConfiguration.policy = extensionConfigurationPolicy?.[key];
371
+ const policyEntry = extensionConfigurationPolicy?.[key];
372
+ if (policyEntry) {
373
+ if (hasKey(policyEntry, {
374
+ policyReference: true
375
+ })) {
376
+ propertyConfiguration.policyReference = policyEntry.policyReference;
377
+ } else {
378
+ propertyConfiguration.policy = policyEntry;
379
+ }
373
380
  }
374
381
  if (propertyConfiguration.tags?.some(tag => tag.toLowerCase() === "onexp")) {
375
382
  propertyConfiguration.experiment = {
@@ -378,7 +385,7 @@ configurationExtPoint.setHandler((
378
385
  }
379
386
  if (propertyConfiguration.agentsWindow && !isProposedApiEnabled(extension.description)) {
380
387
  extension.collector.error(( localize(
381
- 2837,
388
+ 2913,
382
389
  "Extension '{0}' CANNOT use 'agentsWindow' property on configuration '{1}' without enabling the 'agentsWindowConfiguration' API proposal.",
383
390
  extension.description.identifier.value,
384
391
  key
@@ -392,7 +399,7 @@ configurationExtPoint.setHandler((
392
399
  const subNodes = configuration.allOf;
393
400
  if (subNodes) {
394
401
  extension.collector.error(( localize(
395
- 2838,
402
+ 2914,
396
403
  "'configuration.allOf' is deprecated and should no longer be used. Instead, pass multiple configuration sections as an array to the 'configuration' contribution point."
397
404
  )));
398
405
  for (const node of subNodes) {
@@ -432,7 +439,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
432
439
  "folders": {
433
440
  minItems: 0,
434
441
  uniqueItems: true,
435
- description: ( localize(2839, "List of folders to be loaded in the workspace.")),
442
+ description: ( localize(2915, "List of folders to be loaded in the workspace.")),
436
443
  items: {
437
444
  type: "object",
438
445
  defaultSnippets: [{
@@ -445,13 +452,13 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
445
452
  path: {
446
453
  type: "string",
447
454
  description: ( localize(
448
- 2840,
455
+ 2916,
449
456
  "A file path. e.g. `/root/folderA` or `./folderA` for a relative path that will be resolved against the location of the workspace file."
450
457
  ))
451
458
  },
452
459
  name: {
453
460
  type: "string",
454
- description: ( localize(2841, "An optional name for the folder. "))
461
+ description: ( localize(2917, "An optional name for the folder. "))
455
462
  }
456
463
  },
457
464
  required: ["path"]
@@ -459,11 +466,11 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
459
466
  properties: {
460
467
  uri: {
461
468
  type: "string",
462
- description: ( localize(2842, "URI of the folder"))
469
+ description: ( localize(2918, "URI of the folder"))
463
470
  },
464
471
  name: {
465
472
  type: "string",
466
- description: ( localize(2841, "An optional name for the folder. "))
473
+ description: ( localize(2917, "An optional name for the folder. "))
467
474
  }
468
475
  },
469
476
  required: ["uri"]
@@ -473,7 +480,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
473
480
  "settings": {
474
481
  type: "object",
475
482
  default: {},
476
- description: ( localize(2843, "Workspace settings")),
483
+ description: ( localize(2919, "Workspace settings")),
477
484
  $ref: workspaceSettingsSchemaId
478
485
  },
479
486
  "launch": {
@@ -482,7 +489,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
482
489
  configurations: [],
483
490
  compounds: []
484
491
  },
485
- description: ( localize(2844, "Workspace launch configurations")),
492
+ description: ( localize(2920, "Workspace launch configurations")),
486
493
  $ref: launchSchemaId
487
494
  },
488
495
  "tasks": {
@@ -491,7 +498,7 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
491
498
  version: "2.0.0",
492
499
  tasks: []
493
500
  },
494
- description: ( localize(2845, "Workspace task configurations")),
501
+ description: ( localize(2921, "Workspace task configurations")),
495
502
  $ref: tasksSchemaId
496
503
  },
497
504
  "mcp": {
@@ -505,27 +512,27 @@ jsonRegistry.registerSchema("vscode://schemas/workspaceConfig", {
505
512
  }
506
513
  }
507
514
  },
508
- description: ( localize(2846, "Model Context Protocol server configurations")),
515
+ description: ( localize(2922, "Model Context Protocol server configurations")),
509
516
  $ref: mcpSchemaId
510
517
  },
511
518
  "extensions": {
512
519
  type: "object",
513
520
  default: {},
514
- description: ( localize(2847, "Workspace extensions")),
521
+ description: ( localize(2923, "Workspace extensions")),
515
522
  $ref: "vscode://schemas/extensions"
516
523
  },
517
524
  "remoteAuthority": {
518
525
  type: "string",
519
526
  doNotSuggest: true,
520
- description: ( localize(2848, "The remote server where the workspace is located."))
527
+ description: ( localize(2924, "The remote server where the workspace is located."))
521
528
  },
522
529
  "transient": {
523
530
  type: "boolean",
524
531
  doNotSuggest: true,
525
- description: ( localize(2849, "A transient workspace will disappear when restarting or reloading."))
532
+ description: ( localize(2925, "A transient workspace will disappear when restarting or reloading."))
526
533
  }
527
534
  },
528
- errorMessage: ( localize(2850, "Unknown workspace configuration property"))
535
+ errorMessage: ( localize(2926, "Unknown workspace configuration property"))
529
536
  });
530
537
  class SettingsTableRenderer extends Disposable {
531
538
  constructor() {
@@ -539,7 +546,7 @@ class SettingsTableRenderer extends Disposable {
539
546
  const configuration = manifest.contributes?.configuration ? Array.isArray(manifest.contributes.configuration) ? manifest.contributes.configuration : [manifest.contributes.configuration] : [];
540
547
  const properties = getAllConfigurationProperties(configuration);
541
548
  const contrib = properties ? ( Object.keys(properties)) : [];
542
- const headers = [( localize(2851, "ID")), ( localize(2852, "Description")), ( localize(2853, "Default"))];
549
+ const headers = [( localize(2927, "ID")), ( localize(2928, "Description")), ( localize(2929, "Default"))];
543
550
  const rows = ( contrib.sort((a, b) => a.localeCompare(b)).map(key => {
544
551
  return [( new MarkdownString()).appendMarkdown(`\`${key}\``), properties[key].markdownDescription ? ( new MarkdownString(properties[key].markdownDescription, false)) : properties[key].description ?? "", ( new MarkdownString()).appendCodeblock("json", JSON.stringify(
545
552
  isUndefined(properties[key].default) ? getDefaultValue(properties[key].type) : properties[key].default,
@@ -558,7 +565,7 @@ class SettingsTableRenderer extends Disposable {
558
565
  }
559
566
  ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
560
567
  id: "configuration",
561
- label: ( localize(2854, "Settings")),
568
+ label: ( localize(2930, "Settings")),
562
569
  access: {
563
570
  canToggle: false
564
571
  },
@@ -574,7 +581,7 @@ class ConfigurationDefaultsTableRenderer extends Disposable {
574
581
  }
575
582
  render(manifest) {
576
583
  const configurationDefaults = manifest.contributes?.configurationDefaults ?? {};
577
- const headers = [( localize(2855, "Languages")), ( localize(2856, "Setting")), ( localize(2857, "Override Value"))];
584
+ const headers = [( localize(2931, "Languages")), ( localize(2932, "Setting")), ( localize(2933, "Override Value"))];
578
585
  const rows = [];
579
586
  for (const key of ( Object.keys(configurationDefaults)).sort((a, b) => a.localeCompare(b))) {
580
587
  const value = configurationDefaults[key];
@@ -607,7 +614,7 @@ class ConfigurationDefaultsTableRenderer extends Disposable {
607
614
  }
608
615
  ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
609
616
  id: "configurationDefaults",
610
- label: ( localize(2858, "Settings Default Overrides")),
617
+ label: ( localize(2934, "Settings Default Overrides")),
611
618
  access: {
612
619
  canToggle: false
613
620
  },
package/vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js CHANGED
@@ -63,12 +63,12 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
63
63
  if (workspaces.length === 1) {
64
64
  const workspaceFile = workspaces[0];
65
65
  this.notificationService.prompt(Severity.Info, ( localize(
66
- 16540,
66
+ 17203,
67
67
  "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.",
68
68
  workspaceFile,
69
69
  "https://go.microsoft.com/fwlink/?linkid=2025315"
70
70
  )), [{
71
- label: ( localize(16541, "Open Workspace")),
71
+ label: ( localize(17204, "Open Workspace")),
72
72
  run: () => this.hostService.openWindow([{
73
73
  workspaceUri: joinPath(folder, workspaceFile)
74
74
  }])
@@ -79,16 +79,16 @@ let WorkspacesFinderContribution = class WorkspacesFinderContribution extends Di
79
79
  }
80
80
  else if (workspaces.length > 1) {
81
81
  this.notificationService.prompt(Severity.Info, ( localize(
82
- 16542,
82
+ 17205,
83
83
  "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.",
84
84
  "https://go.microsoft.com/fwlink/?linkid=2025315"
85
85
  )), [{
86
- label: ( localize(16543, "Select Workspace")),
86
+ label: ( localize(17206, "Select Workspace")),
87
87
  run: () => {
88
88
  this.quickInputService.pick(( workspaces.map(workspace => ({
89
89
  label: workspace
90
90
  }))), {
91
- placeHolder: ( localize(16544, "Select a workspace to open"))
91
+ placeHolder: ( localize(17207, "Select a workspace to open"))
92
92
  }).then(pick => {
93
93
  if (pick) {
94
94
  this.hostService.openWindow([{
@@ -110,7 +110,7 @@ registerAction2(class extends Action2 {
110
110
  constructor() {
111
111
  super({
112
112
  id: "workbench.action.openWorkspaceFromEditor",
113
- title: ( localize2(16541, "Open Workspace")),
113
+ title: ( localize2(17204, "Open Workspace")),
114
114
  f1: false,
115
115
  menu: {
116
116
  id: MenuId.EditorContent,
@@ -125,7 +125,7 @@ registerAction2(class extends Action2 {
125
125
  if (contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
126
126
  const workspaceConfiguration = contextService.getWorkspace().configuration;
127
127
  if (workspaceConfiguration && isEqual(workspaceConfiguration, uri)) {
128
- notificationService.info(( localize(16545, "This workspace is already open.")));
128
+ notificationService.info(( localize(17208, "This workspace is already open.")));
129
129
  return;
130
130
  }
131
131
  }
package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js CHANGED
@@ -1334,7 +1334,7 @@ let RegisterConfigurationSchemasContribution = class RegisterConfigurationSchema
1334
1334
  } : workspaceSettingsSchema;
1335
1335
  const configDefaultsSchema = {
1336
1336
  type: "object",
1337
- description: ( localize(16736, "Contribute defaults for configurations")),
1337
+ description: ( localize(17399, "Contribute defaults for configurations")),
1338
1338
  properties: Object.assign(
1339
1339
  {},
1340
1340
  this.filterDefaultOverridableProperties(machineOverridableSettings.properties),
@@ -1484,7 +1484,7 @@ configurationRegistry.registerConfiguration({
1484
1484
  properties: {
1485
1485
  [APPLY_ALL_PROFILES_SETTING]: {
1486
1486
  "type": "array",
1487
- description: ( localize(16737, "Configure settings to be applied for all profiles.")),
1487
+ description: ( localize(17400, "Configure settings to be applied for all profiles.")),
1488
1488
  "default": [],
1489
1489
  "scope": ConfigurationScope.APPLICATION,
1490
1490
  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
- 16738,
166
+ 17401,
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(16739, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(16740, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(16741, "Open MCP Configuration")) : null;
247
+ const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(17402, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(17403, "Open Launch Configuration")) : operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? ( localize(17404, "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(16742, "Open Settings")),
255
+ label: ( localize(17405, "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(16739, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(16740, "Open Launch Configuration")) : null;
261
+ const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? ( localize(17402, "Open Tasks Configuration")) : operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? ( localize(17403, "Open Launch Configuration")) : null;
262
262
  if (openStandAloneConfigurationActionLabel) {
263
263
  this.notificationService.prompt(Severity.Error, error.message, [{
264
- label: ( localize(16743, "Save and Retry")),
264
+ label: ( localize(17406, "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(16743, "Save and Retry")),
281
+ label: ( localize(17406, "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(16742, "Open Settings")),
290
+ label: ( localize(17405, "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
- 16744,
338
+ 17407,
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
- 16745,
344
+ 17408,
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
- 16746,
351
+ 17409,
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
- 16747,
357
+ 17410,
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
- 16748,
363
+ 17411,
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
- 16749,
369
+ 17412,
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
- 16750,
375
+ 17413,
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
- 16751,
381
+ 17414,
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
- 16752,
386
+ 17415,
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
- 16753,
392
+ 17416,
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
- 16754,
400
+ 17417,
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
- 16755,
406
+ 17418,
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
- 16756,
412
+ 17419,
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
- 16757,
419
+ 17420,
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
- 16758,
424
+ 17421,
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
- 16759,
429
+ 17422,
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
- 16760,
442
+ 17423,
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
- 16761,
455
+ 17424,
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
- 16762,
461
+ 17425,
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
- 16763,
467
+ 17426,
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
- 16764,
474
+ 17427,
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
- 16765,
479
+ 17428,
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
- 16766,
484
+ 17429,
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
- 16767,
497
+ 17430,
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
- 16768,
509
+ 17431,
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
- 16769,
515
+ 17432,
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
- 16770,
521
+ 17433,
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
- 16771,
528
+ 17434,
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
- 16772,
533
+ 17435,
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
- 16773,
538
+ 17436,
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
- 16774,
543
+ 17437,
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
- 16775,
549
+ 17438,
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(16776, "User Settings");
558
+ return localize(17439, "User Settings");
559
559
  case EditableConfigurationTarget.USER_REMOTE:
560
- return localize(16777, "Remote User Settings");
560
+ return localize(17440, "Remote User Settings");
561
561
  case EditableConfigurationTarget.WORKSPACE:
562
- return localize(16778, "Workspace Settings");
562
+ return localize(17441, "Workspace Settings");
563
563
  case EditableConfigurationTarget.WORKSPACE_FOLDER:
564
- return localize(16779, "Folder Settings");
564
+ return localize(17442, "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
- 16781,
153
+ 17444,
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
- 16782,
253
+ 17445,
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
- 16783,
263
+ 17446,
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(16784, "(Default)"));
321
+ item.description = ( localize(17447, "(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
- 16785,
359
+ 17448,
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
- 16786,
368
+ 17449,
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
- 16787,
375
+ 17450,
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(17656, "Save")),
96
- title: ( localize(17657, "Save Workspace")),
95
+ saveLabel: ( localize(18321, "Save")),
96
+ title: ( localize(18322, "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
- 17658,
326
+ 18323,
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(17659, "Open Workspace Configuration")),
333
+ label: ( localize(18324, "Open Workspace Configuration")),
334
334
  run: () => this.commandService.executeCommand("workbench.action.openWorkspaceConfigFile")
335
335
  }]);
336
336
  }