@codingame/monaco-vscode-debug-service-override 13.1.7 → 14.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/package.json +16 -17
  2. package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +17 -17
  3. package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +121 -114
  4. package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +6 -6
  5. package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +13 -13
  6. package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.d.ts +1 -1
  7. package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +42 -30
  8. package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.d.ts +1 -1
  9. package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +2 -2
  10. package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +24 -24
  11. package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +3 -3
  12. package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +4 -4
  13. package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.d.ts +1 -1
  14. package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +9 -9
  15. package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +23 -23
  16. package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +43 -43
  17. package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +3 -3
  18. package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +18 -18
  19. package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.d.ts +1 -1
  20. package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +5 -5
  21. package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.d.ts +3 -2
  22. package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +11 -9
  23. package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.d.ts +1 -1
  24. package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +8 -8
  25. package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +4 -4
  26. package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.d.ts +11 -11
  27. package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +41 -36
  28. package/vscode/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css.js +1 -1
  29. package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +5 -5
  30. package/vscode/src/vs/workbench/contrib/debug/browser/repl.d.ts +1 -2
  31. package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +65 -41
  32. package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.d.ts +2 -2
  33. package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.js +8 -8
  34. package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibleView.d.ts +2 -2
  35. package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.d.ts +1 -1
  36. package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +6 -6
  37. package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.d.ts +2 -2
  38. package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.js +16 -16
  39. package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +4 -4
  40. package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.d.ts +4 -3
  41. package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +38 -13
  42. package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.d.ts +4 -3
  43. package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +14 -11
  44. package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +7 -7
  45. package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.d.ts +2 -1
  46. package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +8 -5
  47. package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +3 -3
  48. package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +46 -46
  49. package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +12 -12
  50. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.js +2 -2
  51. package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.d.ts +0 -79
  52. package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +0 -162
@@ -60,7 +60,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
60
60
  -1,
61
61
  contextViewService,
62
62
  defaultSelectBoxStyles,
63
- { ariaLabel: ( localize(5193, 'Debug Launch Configurations')) }
63
+ { ariaLabel: ( localize(5335, 'Debug Launch Configurations')) }
64
64
  ));
65
65
  this.selectBox.setFocusable(false);
66
66
  this.toDispose.push(this.selectBox);
@@ -218,7 +218,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
218
218
  });
219
219
  });
220
220
  if (this.debugOptions.length === 0) {
221
- this.debugOptions.push({ label: ( localize(5194, "No Configurations")), handler: async () => false });
221
+ this.debugOptions.push({ label: ( localize(5336, "No Configurations")), handler: async () => false });
222
222
  }
223
223
  this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
224
224
  disabledIdxs.push(this.debugOptions.length - 1);
@@ -236,7 +236,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
236
236
  });
237
237
  });
238
238
  manager.getLaunches().filter(l => !l.hidden).forEach(l => {
239
- const label = inWorkspace ? ( localize(5195, "Add Config ({0})...", l.name)) : ( localize(5196, "Add Configuration..."));
239
+ const label = inWorkspace ? ( localize(5337, "Add Config ({0})...", l.name)) : ( localize(5338, "Add Configuration..."));
240
240
  this.debugOptions.push({
241
241
  label, handler: async () => {
242
242
  await this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( l.uri.toString()));
@@ -256,11 +256,11 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
256
256
  keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this.contextKeyService)?.getLabel() ?? undefined;
257
257
  }
258
258
  if (keybinding) {
259
- ariaLabel = ( localize(5197, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
259
+ ariaLabel = ( localize(5339, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
260
260
  }
261
261
  else {
262
262
  ariaLabel = ( localize(
263
- 5198,
263
+ 5340,
264
264
  "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
265
265
  ariaLabel
266
266
  ));
@@ -280,7 +280,7 @@ StartDebugActionViewItem = StartDebugActionViewItem_1 = ( __decorate([
280
280
  ], StartDebugActionViewItem));
281
281
  let FocusSessionActionViewItem = class FocusSessionActionViewItem extends SelectActionViewItem {
282
282
  constructor(action, session, debugService, contextViewService, configurationService) {
283
- super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(5199, 'Debug Session')) });
283
+ super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(5341, 'Debug Session')) });
284
284
  this.debugService = debugService;
285
285
  this.configurationService = configurationService;
286
286
  this._register(this.debugService.getViewModel().onDidFocusSession(() => {
@@ -24,7 +24,7 @@ import { Debugger } from '../common/debugger.js';
24
24
  import { debuggersExtPoint, breakpointsExtPoint, launchSchema, presentationSchema } from '../common/debugSchemas.js';
25
25
  import { TaskDefinitionRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
26
26
  import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
27
- import { launchSchemaId } from '@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration';
27
+ import { launchSchemaId } from '@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration';
28
28
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
29
29
  import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
30
30
  import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -87,7 +87,7 @@ let AdapterManager = class AdapterManager extends Disposable {
87
87
  delta.added.forEach(added => {
88
88
  added.value.forEach(rawAdapter => {
89
89
  if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
90
- added.collector.error(( localize(5200, "Debugger 'type' can not be omitted and must be of type 'string'.")));
90
+ added.collector.error(( localize(5342, "Debugger 'type' can not be omitted and must be of type 'string'.")));
91
91
  }
92
92
  if (rawAdapter.type !== '*') {
93
93
  const existing = this.getDebugger(rawAdapter.type);
@@ -137,7 +137,7 @@ let AdapterManager = class AdapterManager extends Disposable {
137
137
  'name': {
138
138
  type: 'string',
139
139
  description: ( localize(
140
- 5201,
140
+ 5343,
141
141
  "Name of configuration; appears in the launch configuration dropdown menu."
142
142
  )),
143
143
  default: 'Launch'
@@ -145,7 +145,7 @@ let AdapterManager = class AdapterManager extends Disposable {
145
145
  'debugServer': {
146
146
  type: 'number',
147
147
  description: ( localize(
148
- 5202,
148
+ 5344,
149
149
  "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"
150
150
  )),
151
151
  default: 4711
@@ -156,7 +156,7 @@ let AdapterManager = class AdapterManager extends Disposable {
156
156
  }],
157
157
  default: '',
158
158
  defaultSnippets: [{ body: { task: '', type: '' } }],
159
- description: ( localize(5203, "Task to run before debug session starts.")),
159
+ description: ( localize(5345, "Task to run before debug session starts.")),
160
160
  examples: this.taskLabels,
161
161
  },
162
162
  'postDebugTask': {
@@ -165,7 +165,7 @@ let AdapterManager = class AdapterManager extends Disposable {
165
165
  }],
166
166
  default: '',
167
167
  defaultSnippets: [{ body: { task: '', type: '' } }],
168
- description: ( localize(5204, "Task to run after debug session ends.")),
168
+ description: ( localize(5346, "Task to run after debug session ends.")),
169
169
  examples: this.taskLabels,
170
170
  },
171
171
  'presentation': presentationSchema,
@@ -173,7 +173,7 @@ let AdapterManager = class AdapterManager extends Disposable {
173
173
  'suppressMultipleSessionWarning': {
174
174
  type: 'boolean',
175
175
  description: ( localize(
176
- 5205,
176
+ 5347,
177
177
  "Disable the warning when trying to start the same debug configuration more than once."
178
178
  )),
179
179
  default: true
@@ -327,11 +327,11 @@ let AdapterManager = class AdapterManager extends Disposable {
327
327
  const { confirmed } = await this.dialogService.confirm({
328
328
  type: Severity.Warning,
329
329
  message: ( localize(
330
- 5206,
330
+ 5348,
331
331
  "You don't have an extension for debugging {0}. Should we find a {0} extension in the Marketplace?",
332
332
  languageLabel
333
333
  )),
334
- primaryButton: ( localize(5207, "&&Find {0} extension", languageLabel))
334
+ primaryButton: ( localize(5349, "&&Find {0} extension", languageLabel))
335
335
  });
336
336
  if (confirmed) {
337
337
  await this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
@@ -358,7 +358,7 @@ let AdapterManager = class AdapterManager extends Disposable {
358
358
  const picks = [];
359
359
  const dynamic = await this.delegate.configurationManager().getDynamicProviders();
360
360
  if (suggestedCandidates.length > 0) {
361
- picks.push({ type: 'separator', label: ( localize(5208, "Suggested")) }, ...( suggestedCandidates.map(c => ({ label: c.label, pick: () => ({ debugger: c }) }))));
361
+ picks.push({ type: 'separator', label: ( localize(5350, "Suggested")) }, ...( suggestedCandidates.map(c => ({ label: c.label, pick: () => ({ debugger: c }) }))));
362
362
  }
363
363
  if (otherCandidates.length > 0) {
364
364
  if (picks.length > 0) {
@@ -372,7 +372,7 @@ let AdapterManager = class AdapterManager extends Disposable {
372
372
  }
373
373
  for (const d of dynamic) {
374
374
  picks.push({
375
- label: ( localize(5209, "More {0} options...", d.label)),
375
+ label: ( localize(5351, "More {0} options...", d.label)),
376
376
  pick: async () => {
377
377
  const cfg = await d.pick();
378
378
  if (!cfg) {
@@ -383,14 +383,14 @@ let AdapterManager = class AdapterManager extends Disposable {
383
383
  });
384
384
  }
385
385
  }
386
- picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5210, "Install an extension for {0}...", languageLabel)) : ( localize(5211, "Install extension...")) });
386
+ picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5352, "Install an extension for {0}...", languageLabel)) : ( localize(5353, "Install extension...")) });
387
387
  const contributed = this.menuService.getMenuActions(MenuId.DebugCreateConfiguration, this.contextKeyService);
388
388
  for (const [, action] of contributed) {
389
389
  for (const item of action) {
390
390
  picks.push(item);
391
391
  }
392
392
  }
393
- const placeHolder = ( localize(5212, "Select debugger"));
393
+ const placeHolder = ( localize(5354, "Select debugger"));
394
394
  return this.quickInputService.pick(picks, { activeItem: picks[0], placeHolder }).then(async (picked) => {
395
395
  if (picked && 'pick' in picked && typeof picked.pick === 'function') {
396
396
  return await picked.pick();
@@ -10,9 +10,9 @@ import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platf
10
10
  import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
11
11
  import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
12
12
  import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
13
- import { DebugConfigurationProviderTriggerKind, IAdapterManager, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, ILaunch } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug";
14
13
  import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
15
14
  import { IHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service";
15
+ import { DebugConfigurationProviderTriggerKind, IAdapterManager, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, ILaunch } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug";
16
16
  interface IDynamicPickItem {
17
17
  label: string;
18
18
  launch: ILaunch;
@@ -6,7 +6,6 @@ import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vs
6
6
  import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
7
7
  import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
8
8
  import { DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
9
- import { deepClone } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
10
9
  import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
11
10
  import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
12
11
  import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -25,17 +24,17 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
25
24
  import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
26
25
  import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
27
26
  import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
28
- import { debugConfigure } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
29
- import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
30
- import { launchSchema } from '../common/debugSchemas.js';
31
- import { getVisibleAndSorted } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debugUtils';
32
- import { launchSchemaId } from '@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common/vscode/vs/workbench/services/configuration/common/configuration';
27
+ import { launchSchemaId } from '@codingame/monaco-vscode-b1249c5b-1339-5278-b002-746f08105c6d-common/vscode/vs/workbench/services/configuration/common/configuration';
33
28
  import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
34
29
  import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
35
30
  import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
36
31
  import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
37
32
  import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
38
33
  import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
34
+ import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
35
+ import { launchSchema } from '../common/debugSchemas.js';
36
+ import { getVisibleAndSorted } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debugUtils';
37
+ import { debugConfigure } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
39
38
 
40
39
  const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
41
40
  jsonRegistry.registerSchema(launchSchemaId, launchSchema);
@@ -187,7 +186,7 @@ let ConfigurationManager = class ConfigurationManager {
187
186
  disposables.add(token);
188
187
  const input = disposables.add(this.quickInputService.createQuickPick());
189
188
  input.busy = true;
190
- input.placeholder = ( localize(5259, "Select Launch Configuration"));
189
+ input.placeholder = ( localize(5401, "Select Launch Configuration"));
191
190
  const chosenPromise = ( new Promise(resolve => {
192
191
  disposables.add(input.onDidAccept(() => resolve(input.activeItems[0])));
193
192
  disposables.add(input.onDidTriggerItemButton(async (context) => {
@@ -231,7 +230,7 @@ let ConfigurationManager = class ConfigurationManager {
231
230
  config,
232
231
  buttons: [{
233
232
  iconClass: ThemeIcon.asClassName(debugConfigure),
234
- tooltip: ( localize(5260, "Edit Debug Configuration in launch.json"))
233
+ tooltip: ( localize(5402, "Edit Debug Configuration in launch.json"))
235
234
  }],
236
235
  launch
237
236
  })))));
@@ -432,14 +431,14 @@ class AbstractLaunch {
432
431
  this.adapterManager = adapterManager;
433
432
  }
434
433
  getCompound(name) {
435
- const config = this.getConfig();
434
+ const config = this.getDeduplicatedConfig();
436
435
  if (!config || !config.compounds) {
437
436
  return undefined;
438
437
  }
439
438
  return config.compounds.find(compound => compound.name === name);
440
439
  }
441
440
  getConfigurationNames(ignoreCompoundsAndPresentation = false) {
442
- const config = this.getConfig();
441
+ const config = this.getDeduplicatedConfig();
443
442
  if (!config || (!Array.isArray(config.configurations) && !Array.isArray(config.compounds))) {
444
443
  return [];
445
444
  }
@@ -458,23 +457,23 @@ class AbstractLaunch {
458
457
  }
459
458
  }
460
459
  getConfiguration(name) {
461
- const config = deepClone(this.getConfig());
460
+ const config = this.getDeduplicatedConfig();
462
461
  if (!config || !config.configurations) {
463
462
  return undefined;
464
463
  }
465
464
  const configuration = config.configurations.find(config => config && config.name === name);
466
- if (configuration) {
467
- if (this instanceof UserLaunch) {
468
- configuration.__configurationTarget = ConfigurationTarget.USER;
469
- }
470
- else if (this instanceof WorkspaceLaunch) {
471
- configuration.__configurationTarget = ConfigurationTarget.WORKSPACE;
472
- }
473
- else {
474
- configuration.__configurationTarget = ConfigurationTarget.WORKSPACE_FOLDER;
475
- }
465
+ if (!configuration) {
466
+ return;
467
+ }
468
+ if (this instanceof UserLaunch) {
469
+ return { ...configuration, __configurationTarget: ConfigurationTarget.USER };
470
+ }
471
+ else if (this instanceof WorkspaceLaunch) {
472
+ return { ...configuration, __configurationTarget: ConfigurationTarget.WORKSPACE };
473
+ }
474
+ else {
475
+ return { ...configuration, __configurationTarget: ConfigurationTarget.WORKSPACE_FOLDER };
476
476
  }
477
- return configuration;
478
477
  }
479
478
  async getInitialConfigurationContent(folderUri, type, useInitialConfigs, token) {
480
479
  let content = '';
@@ -495,6 +494,22 @@ class AbstractLaunch {
495
494
  get hidden() {
496
495
  return false;
497
496
  }
497
+ getDeduplicatedConfig() {
498
+ const original = this.getConfig();
499
+ return original && {
500
+ version: original.version,
501
+ compounds: original.compounds && distinguishConfigsByName(original.compounds),
502
+ configurations: original.configurations && distinguishConfigsByName(original.configurations),
503
+ };
504
+ }
505
+ }
506
+ function distinguishConfigsByName(things) {
507
+ const seen = ( new Map());
508
+ return ( things.map(thing => {
509
+ const no = seen.get(thing.name) || 0;
510
+ seen.set(thing.name, no + 1);
511
+ return no === 0 ? thing : { ...thing, name: `${thing.name} (${no})` };
512
+ }));
498
513
  }
499
514
  let Launch = class Launch extends AbstractLaunch {
500
515
  constructor(configurationManager, adapterManager, workspace, fileService, textFileService, editorService, configurationService) {
@@ -533,7 +548,7 @@ let Launch = class Launch extends AbstractLaunch {
533
548
  }
534
549
  catch (error) {
535
550
  throw ( new Error(( localize(
536
- 5261,
551
+ 5403,
537
552
  "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).",
538
553
  error.message
539
554
  ))));
@@ -562,11 +577,8 @@ let Launch = class Launch extends AbstractLaunch {
562
577
  });
563
578
  }
564
579
  async writeConfiguration(configuration) {
565
- const fullConfig = deepClone(this.getConfig());
566
- if (!fullConfig.configurations) {
567
- fullConfig.configurations = [];
568
- }
569
- fullConfig.configurations.push(configuration);
580
+ const fullConfig = this.getConfig() || {};
581
+ fullConfig.configurations = [...(fullConfig.configurations || []), configuration];
570
582
  await this.configurationService.updateValue('launch', fullConfig, { resource: this.workspace.uri }, ConfigurationTarget.WORKSPACE_FOLDER);
571
583
  }
572
584
  };
@@ -590,7 +602,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
590
602
  return this.contextService.getWorkspace().configuration;
591
603
  }
592
604
  get name() {
593
- return localize(5262, "workspace");
605
+ return localize(5404, "workspace");
594
606
  }
595
607
  getConfig() {
596
608
  return this.configurationService.inspect('launch').workspaceValue;
@@ -634,7 +646,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
634
646
  return this.preferencesService.userSettingsResource;
635
647
  }
636
648
  get name() {
637
- return localize(5263, "user settings");
649
+ return localize(5405, "user settings");
638
650
  }
639
651
  get hidden() {
640
652
  return true;
@@ -1,7 +1,7 @@
1
1
  import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
2
2
  import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
3
3
  import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
4
- import { FastAndSlowPicks, IPickerQuickAccessItem, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
4
+ import { FastAndSlowPicks, IPickerQuickAccessItem, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
5
5
  import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
6
6
  import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
7
7
  export declare class DebugConsoleQuickAccess extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
3
3
  import { matchesFuzzy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
4
4
  import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
5
5
  import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
6
- import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
6
+ import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
7
7
  import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
8
8
  import { DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
9
9
  import { REPL_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
@@ -27,7 +27,7 @@ let DebugConsoleQuickAccess = class DebugConsoleQuickAccess extends PickerQuickA
27
27
  if (debugConsolePicks.length > 0) {
28
28
  debugConsolePicks.push({ type: 'separator' });
29
29
  }
30
- const createTerminalLabel = ( localize(5264, "Start a New Debug Session"));
30
+ const createTerminalLabel = ( localize(5406, "Start a New Debug Session"));
31
31
  debugConsolePicks.push({
32
32
  label: `$(plus) ${createTerminalLabel}`,
33
33
  ariaLabel: createTerminalLabel,
@@ -31,8 +31,8 @@ class ToggleBreakpointAction extends Action2 {
31
31
  super({
32
32
  id: 'editor.debug.action.toggleBreakpoint',
33
33
  title: {
34
- ...( localize2(5265, "Debug: Toggle Breakpoint")),
35
- mnemonicTitle: ( localize(5266, "Toggle &&Breakpoint")),
34
+ ...( localize2(5407, "Debug: Toggle Breakpoint")),
35
+ mnemonicTitle: ( localize(5408, "Toggle &&Breakpoint")),
36
36
  },
37
37
  f1: true,
38
38
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -89,11 +89,11 @@ class ConditionalBreakpointAction extends EditorAction {
89
89
  constructor() {
90
90
  super({
91
91
  id: 'editor.debug.action.conditionalBreakpoint',
92
- label: ( localize2(5267, "Debug: Add Conditional Breakpoint...")),
92
+ label: ( localize2(5409, "Debug: Add Conditional Breakpoint...")),
93
93
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
94
94
  menuOpts: {
95
95
  menuId: MenuId.MenubarNewBreakpointMenu,
96
- title: ( localize(5268, "&&Conditional Breakpoint...")),
96
+ title: ( localize(5410, "&&Conditional Breakpoint...")),
97
97
  group: '1_breakpoints',
98
98
  order: 1,
99
99
  when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -112,12 +112,12 @@ class LogPointAction extends EditorAction {
112
112
  constructor() {
113
113
  super({
114
114
  id: 'editor.debug.action.addLogPoint',
115
- label: ( localize2(5269, "Debug: Add Logpoint...")),
115
+ label: ( localize2(5411, "Debug: Add Logpoint...")),
116
116
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
117
117
  menuOpts: [
118
118
  {
119
119
  menuId: MenuId.MenubarNewBreakpointMenu,
120
- title: ( localize(5270, "&&Logpoint...")),
120
+ title: ( localize(5412, "&&Logpoint...")),
121
121
  group: '1_breakpoints',
122
122
  order: 4,
123
123
  when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -137,13 +137,13 @@ class TriggerByBreakpointAction extends EditorAction {
137
137
  constructor() {
138
138
  super({
139
139
  id: 'editor.debug.action.triggerByBreakpoint',
140
- label: ( localize(5271, "Debug: Add Triggered Breakpoint...")),
140
+ label: ( localize(5413, "Debug: Add Triggered Breakpoint...")),
141
141
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
142
142
  alias: 'Debug: Triggered Breakpoint...',
143
143
  menuOpts: [
144
144
  {
145
145
  menuId: MenuId.MenubarNewBreakpointMenu,
146
- title: ( localize(5272, "&&Triggered Breakpoint...")),
146
+ title: ( localize(5414, "&&Triggered Breakpoint...")),
147
147
  group: '1_breakpoints',
148
148
  order: 4,
149
149
  when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -163,12 +163,12 @@ class EditBreakpointAction extends EditorAction {
163
163
  constructor() {
164
164
  super({
165
165
  id: 'editor.debug.action.editBreakpoint',
166
- label: ( localize(5273, "Debug: Edit Breakpoint")),
166
+ label: ( localize(5415, "Debug: Edit Breakpoint")),
167
167
  alias: 'Debug: Edit Existing Breakpoint',
168
168
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
169
169
  menuOpts: {
170
170
  menuId: MenuId.MenubarNewBreakpointMenu,
171
- title: ( localize(5274, "&&Edit Breakpoint")),
171
+ title: ( localize(5416, "&&Edit Breakpoint")),
172
172
  group: '1_breakpoints',
173
173
  order: 1,
174
174
  when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -203,8 +203,8 @@ class OpenDisassemblyViewAction extends Action2 {
203
203
  super({
204
204
  id: OpenDisassemblyViewAction.ID,
205
205
  title: {
206
- ...( localize2(5275, "Open Disassembly View")),
207
- mnemonicTitle: ( localize(5276, "&&DisassemblyView")),
206
+ ...( localize2(5417, "Open Disassembly View")),
207
+ mnemonicTitle: ( localize(5418, "&&DisassemblyView")),
208
208
  },
209
209
  precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
210
210
  menu: [
@@ -239,11 +239,11 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
239
239
  super({
240
240
  id: ToggleDisassemblyViewSourceCodeAction.ID,
241
241
  title: {
242
- ...( localize2(5277, "Toggle Source Code in Disassembly View")),
243
- mnemonicTitle: ( localize(5278, "&&ToggleSource")),
242
+ ...( localize2(5419, "Toggle Source Code in Disassembly View")),
243
+ mnemonicTitle: ( localize(5420, "&&ToggleSource")),
244
244
  },
245
245
  metadata: {
246
- description: ( localize2(5279, 'Shows or hides source code in disassembly'))
246
+ description: ( localize2(5421, 'Shows or hides source code in disassembly'))
247
247
  },
248
248
  f1: true,
249
249
  });
@@ -258,7 +258,7 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
258
258
  }
259
259
  class RunToCursorAction extends EditorAction {
260
260
  static { this.ID = 'editor.debug.action.runToCursor'; }
261
- static { this.LABEL = ( localize2(5280, "Run to Cursor")); }
261
+ static { this.LABEL = ( localize2(5422, "Run to Cursor")); }
262
262
  constructor() {
263
263
  super({
264
264
  id: RunToCursorAction.ID,
@@ -291,7 +291,7 @@ class RunToCursorAction extends EditorAction {
291
291
  }
292
292
  class SelectionToReplAction extends EditorAction {
293
293
  static { this.ID = 'editor.debug.action.selectionToRepl'; }
294
- static { this.LABEL = ( localize2(5281, "Evaluate in Debug Console")); }
294
+ static { this.LABEL = ( localize2(5423, "Evaluate in Debug Console")); }
295
295
  constructor() {
296
296
  super({
297
297
  id: SelectionToReplAction.ID,
@@ -326,7 +326,7 @@ class SelectionToReplAction extends EditorAction {
326
326
  }
327
327
  class SelectionToWatchExpressionsAction extends EditorAction {
328
328
  static { this.ID = 'editor.debug.action.selectionToWatch'; }
329
- static { this.LABEL = ( localize2(5282, "Add to Watch")); }
329
+ static { this.LABEL = ( localize2(5424, "Add to Watch")); }
330
330
  constructor() {
331
331
  super({
332
332
  id: SelectionToWatchExpressionsAction.ID,
@@ -371,7 +371,7 @@ class ShowDebugHoverAction extends EditorAction {
371
371
  constructor() {
372
372
  super({
373
373
  id: 'editor.debug.action.showDebugHover',
374
- label: ( localize2(5283, "Debug: Show Hover")),
374
+ label: ( localize2(5425, "Debug: Show Hover")),
375
375
  precondition: CONTEXT_IN_DEBUG_MODE,
376
376
  kbOpts: {
377
377
  kbExpr: EditorContextKeys.editorTextFocus,
@@ -388,10 +388,10 @@ class ShowDebugHoverAction extends EditorAction {
388
388
  return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
389
389
  }
390
390
  }
391
- const NO_TARGETS_MESSAGE = ( localize(5284, "Step targets are not available here"));
391
+ const NO_TARGETS_MESSAGE = ( localize(5426, "Step targets are not available here"));
392
392
  class StepIntoTargetsAction extends EditorAction {
393
393
  static { this.ID = 'editor.debug.action.stepIntoTargets'; }
394
- static { this.LABEL = ( localize(5285, "Step Into Target")); }
394
+ static { this.LABEL = ( localize(5427, "Step Into Target")); }
395
395
  constructor() {
396
396
  super({
397
397
  id: StepIntoTargetsAction.ID,
@@ -496,7 +496,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
496
496
  constructor() {
497
497
  super(true, {
498
498
  id: 'editor.debug.action.goToNextBreakpoint',
499
- label: ( localize2(5286, "Debug: Go to Next Breakpoint")),
499
+ label: ( localize2(5428, "Debug: Go to Next Breakpoint")),
500
500
  precondition: CONTEXT_DEBUGGERS_AVAILABLE
501
501
  });
502
502
  }
@@ -505,7 +505,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
505
505
  constructor() {
506
506
  super(false, {
507
507
  id: 'editor.debug.action.goToPreviousBreakpoint',
508
- label: ( localize2(5287, "Debug: Go to Previous Breakpoint")),
508
+ label: ( localize2(5429, "Debug: Go to Previous Breakpoint")),
509
509
  precondition: CONTEXT_DEBUGGERS_AVAILABLE
510
510
  });
511
511
  }
@@ -514,7 +514,7 @@ class CloseExceptionWidgetAction extends EditorAction {
514
514
  constructor() {
515
515
  super({
516
516
  id: 'editor.debug.action.closeExceptionWidget',
517
- label: ( localize2(5288, "Close Exception Widget")),
517
+ label: ( localize2(5430, "Close Exception Widget")),
518
518
  precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
519
519
  kbOpts: {
520
520
  primary: KeyCode.Escape,
@@ -9,7 +9,7 @@ import { memoize } from '@codingame/monaco-vscode-api/vscode/vs/base/common/deco
9
9
  import { onUnexpectedExternalError, illegalArgument } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
10
10
  import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
11
11
  import { visit } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
12
- import { setProperty } from '@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonEdit';
12
+ import { setProperty } from '@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common/vscode/vs/base/common/jsonEdit';
13
13
  import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
14
14
  import { MutableDisposable, DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
15
15
  import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
@@ -68,8 +68,8 @@ registerColor('editor.inlineValuesForeground', {
68
68
  light: '#00000080',
69
69
  hcDark: '#ffffff80',
70
70
  hcLight: '#00000080'
71
- }, ( localize(5289, "Color for the debug inline value text.")));
72
- registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5290, "Color for the debug inline value background.")));
71
+ }, ( localize(5431, "Color for the debug inline value text.")));
72
+ registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5432, "Color for the debug inline value background.")));
73
73
  class InlineSegment {
74
74
  constructor(column, text) {
75
75
  this.column = column;
@@ -36,7 +36,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
36
36
  import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
37
37
  import { Variable, Expression, VisualizedExpression } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
38
38
  import { getEvaluatableExpressionAtPosition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debugUtils';
39
- import { AbstractExpressionDataSource } from './baseDebugView.js';
39
+ import { AbstractExpressionDataSource } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
40
40
  import { DebugExpressionRenderer } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
41
41
  import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
42
42
 
@@ -100,7 +100,7 @@ let DebugHoverWidget = class DebugHoverWidget {
100
100
  this.treeContainer.setAttribute('role', 'tree');
101
101
  const tip = append(this.complexValueContainer, $('.tip'));
102
102
  tip.textContent = ( localize(
103
- 5291,
103
+ 5433,
104
104
  'Hold {0} key to switch to editor language hover',
105
105
  isMacintosh ? 'Option' : 'Alt'
106
106
  ));
@@ -338,10 +338,10 @@ DebugHoverWidget = DebugHoverWidget_1 = ( __decorate([
338
338
  ], DebugHoverWidget));
339
339
  class DebugHoverAccessibilityProvider {
340
340
  getWidgetAriaLabel() {
341
- return localize(5292, "Debug Hover");
341
+ return localize(5434, "Debug Hover");
342
342
  }
343
343
  getAriaLabel(element) {
344
- return localize(5293, "{0}, value {1}, variables, debug", element.name, element.value);
344
+ return localize(5435, "{0}, value {1}, variables, debug", element.name, element.value);
345
345
  }
346
346
  }
347
347
  class DebugHoverDataSource extends AbstractExpressionDataSource {
@@ -1,5 +1,5 @@
1
1
  import { IQuickPickSeparator } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
2
- import { PickerQuickAccessProvider, IPickerQuickAccessItem } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
2
+ import { PickerQuickAccessProvider, IPickerQuickAccessItem } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
3
3
  import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
4
4
  import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
5
5
  import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";