@codingame/monaco-vscode-configuration-service-override 1.83.1 → 1.83.3-next.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 +2 -2
  2. package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js +42 -136
  3. package/vscode/src/vs/workbench/services/configuration/browser/configuration.js +77 -106
  4. package/vscode/src/vs/workbench/services/configuration/browser/configurationService.js +92 -110
  5. package/vscode/src/vs/workbench/services/configuration/common/configurationEditing.js +42 -142
  6. package/vscode/src/vs/workbench/services/label/common/labelService.js +14 -45
  7. package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js +5 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-configuration-service-override",
3
- "version": "1.83.1",
3
+ "version": "1.83.3-next.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -18,7 +18,7 @@
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
20
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@1.83.1",
21
+ "vscode": "npm:@codingame/monaco-vscode-api@1.83.3-next.0",
22
22
  "monaco-editor": "0.44.0"
23
23
  }
24
24
  }
package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.js CHANGED
@@ -15,39 +15,24 @@ const configurationEntrySchema = {
15
15
  defaultSnippets: [{ body: { title: '', properties: {} } }],
16
16
  properties: {
17
17
  title: {
18
- description: ( nls.localize(
19
- 'vscode.extension.contributes.configuration.title',
20
- '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.'
21
- )),
18
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'vscode.extension.contributes.configuration.title', '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.'),
22
19
  type: 'string'
23
20
  },
24
21
  order: {
25
- description: ( nls.localize(
26
- 'vscode.extension.contributes.configuration.order',
27
- 'When specified, gives the order of this category of settings relative to other categories.'
28
- )),
22
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'vscode.extension.contributes.configuration.order', 'When specified, gives the order of this category of settings relative to other categories.'),
29
23
  type: 'integer'
30
24
  },
31
25
  properties: {
32
- description: ( nls.localize(
33
- 'vscode.extension.contributes.configuration.properties',
34
- 'Description of the configuration properties.'
35
- )),
26
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'vscode.extension.contributes.configuration.properties', 'Description of the configuration properties.'),
36
27
  type: 'object',
37
28
  propertyNames: {
38
29
  pattern: '\\S+',
39
- patternErrorMessage: ( nls.localize(
40
- 'vscode.extension.contributes.configuration.property.empty',
41
- 'Property should not be empty.'
42
- )),
30
+ patternErrorMessage: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'vscode.extension.contributes.configuration.property.empty', 'Property should not be empty.'),
43
31
  },
44
32
  additionalProperties: {
45
33
  anyOf: [
46
34
  {
47
- title: ( nls.localize(
48
- 'vscode.extension.contributes.configuration.properties.schema',
49
- 'Schema of the configuration property.'
50
- )),
35
+ title: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'vscode.extension.contributes.configuration.properties.schema', 'Schema of the configuration property.'),
51
36
  $ref: 'http://json-schema.org/draft-07/schema#'
52
37
  },
53
38
  {
@@ -58,114 +43,65 @@ const configurationEntrySchema = {
58
43
  enum: ['application', 'machine', 'window', 'resource', 'language-overridable', 'machine-overridable'],
59
44
  default: 'window',
60
45
  enumDescriptions: [
61
- ( nls.localize(
62
- 'scope.application.description',
63
- "Configuration that can be configured only in the user settings."
64
- )),
65
- ( nls.localize(
66
- 'scope.machine.description',
67
- "Configuration that can be configured only in the user settings or only in the remote settings."
68
- )),
69
- ( nls.localize(
70
- 'scope.window.description',
71
- "Configuration that can be configured in the user, remote or workspace settings."
72
- )),
73
- ( nls.localize(
74
- 'scope.resource.description',
75
- "Configuration that can be configured in the user, remote, workspace or folder settings."
76
- )),
77
- ( nls.localize(
78
- 'scope.language-overridable.description',
79
- "Resource configuration that can be configured in language specific settings."
80
- )),
81
- ( nls.localize(
82
- 'scope.machine-overridable.description',
83
- "Machine configuration that can be configured also in workspace or folder settings."
84
- ))
46
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.application.description', "Configuration that can be configured only in the user settings."),
47
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.machine.description', "Configuration that can be configured only in the user settings or only in the remote settings."),
48
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.window.description', "Configuration that can be configured in the user, remote or workspace settings."),
49
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.resource.description', "Configuration that can be configured in the user, remote, workspace or folder settings."),
50
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.language-overridable.description', "Resource configuration that can be configured in language specific settings."),
51
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.machine-overridable.description', "Machine configuration that can be configured also in workspace or folder settings.")
85
52
  ],
86
- markdownDescription: ( nls.localize(
87
- 'scope.description',
88
- "Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`."
89
- ))
53
+ markdownDescription: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.description', "Scope in which the configuration is applicable. Available scopes are `application`, `machine`, `window`, `resource`, and `machine-overridable`.")
90
54
  },
91
55
  enumDescriptions: {
92
56
  type: 'array',
93
57
  items: {
94
58
  type: 'string',
95
59
  },
96
- description: ( nls.localize('scope.enumDescriptions', 'Descriptions for enum values'))
60
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.enumDescriptions', 'Descriptions for enum values')
97
61
  },
98
62
  markdownEnumDescriptions: {
99
63
  type: 'array',
100
64
  items: {
101
65
  type: 'string',
102
66
  },
103
- description: ( nls.localize(
104
- 'scope.markdownEnumDescriptions',
105
- 'Descriptions for enum values in the markdown format.'
106
- ))
67
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.markdownEnumDescriptions', 'Descriptions for enum values in the markdown format.')
107
68
  },
108
69
  enumItemLabels: {
109
70
  type: 'array',
110
71
  items: {
111
72
  type: 'string'
112
73
  },
113
- markdownDescription: ( nls.localize(
114
- 'scope.enumItemLabels',
115
- 'Labels for enum values to be displayed in the Settings editor. When specified, the {0} values still show after the labels, but less prominently.',
116
- '`enum`'
117
- ))
74
+ markdownDescription: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.enumItemLabels', 'Labels for enum values to be displayed in the Settings editor. When specified, the {0} values still show after the labels, but less prominently.', '`enum`')
118
75
  },
119
76
  markdownDescription: {
120
77
  type: 'string',
121
- description: ( nls.localize('scope.markdownDescription', 'The description in the markdown format.'))
78
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.markdownDescription', 'The description in the markdown format.')
122
79
  },
123
80
  deprecationMessage: {
124
81
  type: 'string',
125
- description: ( nls.localize(
126
- 'scope.deprecationMessage',
127
- 'If set, the property is marked as deprecated and the given message is shown as an explanation.'
128
- ))
82
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.deprecationMessage', 'If set, the property is marked as deprecated and the given message is shown as an explanation.')
129
83
  },
130
84
  markdownDeprecationMessage: {
131
85
  type: 'string',
132
- description: ( nls.localize(
133
- 'scope.markdownDeprecationMessage',
134
- 'If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format.'
135
- ))
86
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.markdownDeprecationMessage', 'If set, the property is marked as deprecated and the given message is shown as an explanation in the markdown format.')
136
87
  },
137
88
  editPresentation: {
138
89
  type: 'string',
139
90
  enum: ['singlelineText', 'multilineText'],
140
91
  enumDescriptions: [
141
- ( nls.localize(
142
- 'scope.singlelineText.description',
143
- 'The value will be shown in an inputbox.'
144
- )),
145
- ( nls.localize(
146
- 'scope.multilineText.description',
147
- 'The value will be shown in a textarea.'
148
- ))
92
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.singlelineText.description', 'The value will be shown in an inputbox.'),
93
+ nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.multilineText.description', 'The value will be shown in a textarea.')
149
94
  ],
150
95
  default: 'singlelineText',
151
- description: ( nls.localize(
152
- 'scope.editPresentation',
153
- 'When specified, controls the presentation format of the string setting.'
154
- ))
96
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.editPresentation', 'When specified, controls the presentation format of the string setting.')
155
97
  },
156
98
  order: {
157
99
  type: 'integer',
158
- description: ( nls.localize(
159
- 'scope.order',
160
- '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.'
161
- ))
100
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.order', '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.')
162
101
  },
163
102
  ignoreSync: {
164
103
  type: 'boolean',
165
- description: ( nls.localize(
166
- 'scope.ignoreSync',
167
- 'When enabled, Settings Sync will not sync the user value of this configuration by default.'
168
- ))
104
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'scope.ignoreSync', 'When enabled, Settings Sync will not sync the user value of this configuration by default.')
169
105
  },
170
106
  }
171
107
  }
@@ -207,11 +143,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
207
143
  if (!OVERRIDE_PROPERTY_REGEX.test(key)) {
208
144
  const registeredPropertyScheme = registeredProperties[key];
209
145
  if (registeredPropertyScheme?.scope && !allowedScopes.includes(registeredPropertyScheme.scope)) {
210
- extension.collector.warn(( nls.localize(
211
- 'config.property.defaultConfiguration.warning',
212
- "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.",
213
- key
214
- )));
146
+ extension.collector.warn(nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'config.property.defaultConfiguration.warning', "Cannot register configuration defaults for '{0}'. Only defaults for machine-overridable, window, resource and language overridable scoped settings are supported.", key));
215
147
  delete overrides[key];
216
148
  }
217
149
  }
@@ -225,10 +157,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
225
157
  extensionPoint: 'configuration',
226
158
  deps: [defaultConfigurationExtPoint],
227
159
  jsonSchema: {
228
- description: ( nls.localize(
229
- 'vscode.extension.contributes.configuration',
230
- 'Contributes configuration settings.'
231
- )),
160
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'vscode.extension.contributes.configuration', 'Contributes configuration settings.'),
232
161
  oneOf: [
233
162
  configurationEntrySchema,
234
163
  {
@@ -254,7 +183,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
254
183
  const configurations = [];
255
184
  const configuration = objects.deepClone(node);
256
185
  if (configuration.title && (typeof configuration.title !== 'string')) {
257
- extension.collector.error(( nls.localize('invalid.title', "'configuration.title' must be a string")));
186
+ extension.collector.error(nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'invalid.title', "'configuration.title' must be a string"));
258
187
  }
259
188
  validateProperties(configuration, extension);
260
189
  configuration.id = node.id || extension.description.identifier.value;
@@ -268,7 +197,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
268
197
  const properties = configuration.properties;
269
198
  if (properties) {
270
199
  if (typeof properties !== 'object') {
271
- extension.collector.error(( nls.localize('invalid.properties', "'configuration.properties' must be an object")));
200
+ extension.collector.error(nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'invalid.properties', "'configuration.properties' must be an object"));
272
201
  configuration.properties = {};
273
202
  }
274
203
  for (const key in properties) {
@@ -281,20 +210,12 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
281
210
  }
282
211
  if (( seenProperties.has(key))) {
283
212
  delete properties[key];
284
- extension.collector.warn(( nls.localize(
285
- 'config.property.duplicate',
286
- "Cannot register '{0}'. This property is already registered.",
287
- key
288
- )));
213
+ extension.collector.warn(nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'config.property.duplicate', "Cannot register '{0}'. This property is already registered.", key));
289
214
  continue;
290
215
  }
291
216
  if (!isObject(propertyConfiguration)) {
292
217
  delete properties[key];
293
- extension.collector.error(( nls.localize(
294
- 'invalid.property',
295
- "configuration.properties property '{0}' must be an object",
296
- key
297
- )));
218
+ extension.collector.error(nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'invalid.property', "configuration.properties property '{0}' must be an object", key));
298
219
  continue;
299
220
  }
300
221
  seenProperties.add(key);
@@ -325,10 +246,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
325
246
  }
326
247
  const subNodes = configuration.allOf;
327
248
  if (subNodes) {
328
- extension.collector.error(( nls.localize(
329
- 'invalid.allOf',
330
- "'configuration.allOf' is deprecated and should no longer be used. Instead, pass multiple configuration sections as an array to the 'configuration' contribution point."
331
- )));
249
+ extension.collector.error(nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'invalid.allOf', "'configuration.allOf' is deprecated and should no longer be used. Instead, pass multiple configuration sections as an array to the 'configuration' contribution point."));
332
250
  for (const node of subNodes) {
333
251
  validateProperties(node, extension);
334
252
  }
@@ -369,10 +287,7 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
369
287
  'folders': {
370
288
  minItems: 0,
371
289
  uniqueItems: true,
372
- description: ( nls.localize(
373
- 'workspaceConfig.folders.description',
374
- "List of folders to be loaded in the workspace."
375
- )),
290
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.folders.description', "List of folders to be loaded in the workspace."),
376
291
  items: {
377
292
  type: 'object',
378
293
  defaultSnippets: [{ body: { path: '$1' } }],
@@ -380,14 +295,11 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
380
295
  properties: {
381
296
  path: {
382
297
  type: 'string',
383
- description: ( nls.localize(
384
- 'workspaceConfig.path.description',
385
- "A file path. e.g. `/root/folderA` or `./folderA` for a relative path that will be resolved against the location of the workspace file."
386
- ))
298
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.path.description', "A file path. e.g. `/root/folderA` or `./folderA` for a relative path that will be resolved against the location of the workspace file.")
387
299
  },
388
300
  name: {
389
301
  type: 'string',
390
- description: ( nls.localize('workspaceConfig.name.description', "An optional name for the folder. "))
302
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.name.description', "An optional name for the folder. ")
391
303
  }
392
304
  },
393
305
  required: ['path']
@@ -395,11 +307,11 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
395
307
  properties: {
396
308
  uri: {
397
309
  type: 'string',
398
- description: ( nls.localize('workspaceConfig.uri.description', "URI of the folder"))
310
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.uri.description', "URI of the folder")
399
311
  },
400
312
  name: {
401
313
  type: 'string',
402
- description: ( nls.localize('workspaceConfig.name.description', "An optional name for the folder. "))
314
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.name.description', "An optional name for the folder. ")
403
315
  }
404
316
  },
405
317
  required: ['uri']
@@ -409,43 +321,37 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
409
321
  'settings': {
410
322
  type: 'object',
411
323
  default: {},
412
- description: ( nls.localize('workspaceConfig.settings.description', "Workspace settings")),
324
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.settings.description', "Workspace settings"),
413
325
  $ref: workspaceSettingsSchemaId
414
326
  },
415
327
  'launch': {
416
328
  type: 'object',
417
329
  default: { configurations: [], compounds: [] },
418
- description: ( nls.localize('workspaceConfig.launch.description', "Workspace launch configurations")),
330
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.launch.description', "Workspace launch configurations"),
419
331
  $ref: launchSchemaId
420
332
  },
421
333
  'tasks': {
422
334
  type: 'object',
423
335
  default: { version: '2.0.0', tasks: [] },
424
- description: ( nls.localize('workspaceConfig.tasks.description', "Workspace task configurations")),
336
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.tasks.description', "Workspace task configurations"),
425
337
  $ref: tasksSchemaId
426
338
  },
427
339
  'extensions': {
428
340
  type: 'object',
429
341
  default: {},
430
- description: ( nls.localize('workspaceConfig.extensions.description', "Workspace extensions")),
342
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.extensions.description', "Workspace extensions"),
431
343
  $ref: 'vscode://schemas/extensions'
432
344
  },
433
345
  'remoteAuthority': {
434
346
  type: 'string',
435
347
  doNotSuggest: true,
436
- description: ( nls.localize(
437
- 'workspaceConfig.remoteAuthority',
438
- "The remote server where the workspace is located."
439
- )),
348
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.remoteAuthority', "The remote server where the workspace is located."),
440
349
  },
441
350
  'transient': {
442
351
  type: 'boolean',
443
352
  doNotSuggest: true,
444
- description: ( nls.localize(
445
- 'workspaceConfig.transient',
446
- "A transient workspace will disappear when restarting or reloading."
447
- )),
353
+ description: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'workspaceConfig.transient', "A transient workspace will disappear when restarting or reloading."),
448
354
  }
449
355
  },
450
- errorMessage: ( nls.localize('unknownWorkspaceProperty', "Unknown workspace configuration property"))
356
+ errorMessage: nls.localizeWithPath('vs/workbench/api/common/configurationExtensionPoint', 'unknownWorkspaceProperty', "Unknown workspace configuration property")
451
357
  });