@codingame/monaco-vscode-debug-service-override 8.0.4 → 9.0.2

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 (37) hide show
  1. package/package.json +2 -2
  2. package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +16 -16
  3. package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +107 -107
  4. package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +6 -6
  5. package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +49 -16
  6. package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +19 -8
  7. package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +1 -1
  8. package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +37 -27
  9. package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +5 -5
  10. package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +15 -13
  11. package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +8 -8
  12. package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +21 -21
  13. package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +53 -42
  14. package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +3 -3
  15. package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +109 -82
  16. package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +3 -3
  17. package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +5 -5
  18. package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +9 -9
  19. package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +6 -6
  20. package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +7 -7
  21. package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +8 -5
  22. package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +80 -30
  23. package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.js +12 -29
  24. package/vscode/src/vs/workbench/contrib/debug/browser/replAccessibleView.js +7 -12
  25. package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +19 -13
  26. package/vscode/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.js +29 -18
  27. package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +4 -4
  28. package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +11 -12
  29. package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +21 -20
  30. package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +7 -7
  31. package/vscode/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.js +2 -1
  32. package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +3 -3
  33. package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +3 -3
  34. package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +44 -44
  35. package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +11 -11
  36. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.js +2 -2
  37. package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +0 -233
@@ -59,7 +59,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
59
59
  -1,
60
60
  contextViewService,
61
61
  defaultSelectBoxStyles,
62
- { ariaLabel: ( localize(10246, 'Debug Launch Configurations')) }
62
+ { ariaLabel: ( localize(10290, 'Debug Launch Configurations')) }
63
63
  )));
64
64
  this.selectBox.setFocusable(false);
65
65
  this.toDispose.push(this.selectBox);
@@ -217,7 +217,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
217
217
  });
218
218
  });
219
219
  if (this.debugOptions.length === 0) {
220
- this.debugOptions.push({ label: ( localize(10247, "No Configurations")), handler: async () => false });
220
+ this.debugOptions.push({ label: ( localize(10291, "No Configurations")), handler: async () => false });
221
221
  }
222
222
  this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
223
223
  disabledIdxs.push(this.debugOptions.length - 1);
@@ -235,7 +235,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
235
235
  });
236
236
  });
237
237
  manager.getLaunches().filter(l => !l.hidden).forEach(l => {
238
- const label = inWorkspace ? ( localize(10248, "Add Config ({0})...", l.name)) : ( localize(10249, "Add Configuration..."));
238
+ const label = inWorkspace ? ( localize(10292, "Add Config ({0})...", l.name)) : ( localize(10293, "Add Configuration..."));
239
239
  this.debugOptions.push({
240
240
  label, handler: async () => {
241
241
  await this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( (l.uri.toString())));
@@ -255,11 +255,11 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
255
255
  keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this.contextKeyService)?.getLabel() ?? undefined;
256
256
  }
257
257
  if (keybinding) {
258
- ariaLabel = ( localize(10250, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
258
+ ariaLabel = ( localize(10294, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
259
259
  }
260
260
  else {
261
261
  ariaLabel = ( localize(
262
- 10251,
262
+ 10295,
263
263
  "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
264
264
  ariaLabel
265
265
  ));
@@ -279,7 +279,7 @@ StartDebugActionViewItem = StartDebugActionViewItem_1 = ( (__decorate([
279
279
  ], StartDebugActionViewItem)));
280
280
  let FocusSessionActionViewItem = class FocusSessionActionViewItem extends SelectActionViewItem {
281
281
  constructor(action, session, debugService, contextViewService, configurationService) {
282
- super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(10252, 'Debug Session')) });
282
+ super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(10296, 'Debug Session')) });
283
283
  this.debugService = debugService;
284
284
  this.configurationService = configurationService;
285
285
  this._register(this.debugService.getViewModel().onDidFocusSession(() => {
@@ -1,11 +1,14 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { Emitter } from 'vscode/vscode/vs/base/common/event';
2
+ import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
3
+ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
3
4
  import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
4
5
  import Severity$1 from 'vscode/vscode/vs/base/common/severity';
5
6
  import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
6
7
  import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
7
8
  import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
8
9
  import { localize } from 'vscode/vscode/vs/nls';
10
+ import { MenuId, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
11
+ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
9
12
  import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
10
13
  import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
11
14
  import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -19,6 +22,7 @@ import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, INTERNA
19
22
  import { Debugger } from '../common/debugger.js';
20
23
  import { debuggersExtPoint, breakpointsExtPoint, launchSchema, presentationSchema } from '../common/debugSchemas.js';
21
24
  import { TaskDefinitionRegistry } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
25
+ import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
22
26
  import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
23
27
  import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
24
28
  import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -27,7 +31,7 @@ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle
27
31
 
28
32
  const jsonRegistry = ( (Registry.as(Extensions.JSONContribution)));
29
33
  let AdapterManager = class AdapterManager extends Disposable {
30
- constructor(delegate, editorService, configurationService, quickInputService, instantiationService, commandService, extensionService, contextKeyService, languageService, dialogService, lifecycleService) {
34
+ constructor(delegate, editorService, configurationService, quickInputService, instantiationService, commandService, extensionService, contextKeyService, languageService, dialogService, lifecycleService, tasksService, menuService) {
31
35
  super();
32
36
  this.editorService = editorService;
33
37
  this.configurationService = configurationService;
@@ -39,11 +43,14 @@ let AdapterManager = class AdapterManager extends Disposable {
39
43
  this.languageService = languageService;
40
44
  this.dialogService = dialogService;
41
45
  this.lifecycleService = lifecycleService;
46
+ this.tasksService = tasksService;
47
+ this.menuService = menuService;
42
48
  this.debugAdapterFactories = ( (new Map()));
43
49
  this._onDidRegisterDebugger = ( (new Emitter()));
44
50
  this._onDidDebuggersExtPointRead = ( (new Emitter()));
45
51
  this.breakpointContributions = [];
46
52
  this.debuggerWhenKeys = ( (new Set()));
53
+ this.taskLabels = [];
47
54
  this.usedDebugTypes = ( (new Set()));
48
55
  this.adapterDescriptorFactories = [];
49
56
  this.debuggers = [];
@@ -61,18 +68,24 @@ let AdapterManager = class AdapterManager extends Disposable {
61
68
  this._register(this.onDidDebuggersExtPointRead(() => {
62
69
  this.debugExtensionsAvailable.set(this.debuggers.length > 0);
63
70
  }));
71
+ const updateTaskScheduler = this._register(( (new RunOnceScheduler(() => this.updateTaskLabels(), 5000))));
72
+ this._register(Event.any(tasksService.onDidChangeTaskConfig, tasksService.onDidChangeTaskProviders)(() => {
73
+ updateTaskScheduler.cancel();
74
+ updateTaskScheduler.schedule();
75
+ }));
64
76
  this.lifecycleService.when(LifecyclePhase.Eventually)
65
77
  .then(() => this.debugExtensionsAvailable.set(this.debuggers.length > 0));
66
78
  this._register(delegate.onDidNewSession(s => {
67
79
  this.usedDebugTypes.add(s.configuration.type);
68
80
  }));
81
+ updateTaskScheduler.schedule();
69
82
  }
70
83
  registerListeners() {
71
84
  debuggersExtPoint.setHandler((extensions, delta) => {
72
85
  delta.added.forEach(added => {
73
86
  added.value.forEach(rawAdapter => {
74
87
  if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
75
- added.collector.error(( localize(5738, "Debugger 'type' can not be omitted and must be of type 'string'.")));
88
+ added.collector.error(( localize(5714, "Debugger 'type' can not be omitted and must be of type 'string'.")));
76
89
  }
77
90
  if (rawAdapter.type !== '*') {
78
91
  const existing = this.getDebugger(rawAdapter.type);
@@ -107,6 +120,12 @@ let AdapterManager = class AdapterManager extends Disposable {
107
120
  ))));
108
121
  });
109
122
  }
123
+ updateTaskLabels() {
124
+ this.tasksService.getKnownTasks().then(tasks => {
125
+ this.taskLabels = ( (tasks.map(task => task._label)));
126
+ this.updateDebugAdapterSchema();
127
+ });
128
+ }
110
129
  updateDebugAdapterSchema() {
111
130
  const items = launchSchema.properties['configurations'].items;
112
131
  const taskSchema = TaskDefinitionRegistry.getJsonSchema();
@@ -116,7 +135,7 @@ let AdapterManager = class AdapterManager extends Disposable {
116
135
  'name': {
117
136
  type: 'string',
118
137
  description: ( localize(
119
- 5739,
138
+ 5715,
120
139
  "Name of configuration; appears in the launch configuration dropdown menu."
121
140
  )),
122
141
  default: 'Launch'
@@ -124,7 +143,7 @@ let AdapterManager = class AdapterManager extends Disposable {
124
143
  'debugServer': {
125
144
  type: 'number',
126
145
  description: ( localize(
127
- 5740,
146
+ 5716,
128
147
  "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"
129
148
  )),
130
149
  default: 4711
@@ -135,7 +154,8 @@ let AdapterManager = class AdapterManager extends Disposable {
135
154
  }],
136
155
  default: '',
137
156
  defaultSnippets: [{ body: { task: '', type: '' } }],
138
- description: ( localize(5741, "Task to run before debug session starts."))
157
+ description: ( localize(5717, "Task to run before debug session starts.")),
158
+ examples: this.taskLabels,
139
159
  },
140
160
  'postDebugTask': {
141
161
  anyOf: [taskSchema, {
@@ -143,14 +163,15 @@ let AdapterManager = class AdapterManager extends Disposable {
143
163
  }],
144
164
  default: '',
145
165
  defaultSnippets: [{ body: { task: '', type: '' } }],
146
- description: ( localize(5742, "Task to run after debug session ends."))
166
+ description: ( localize(5718, "Task to run after debug session ends.")),
167
+ examples: this.taskLabels,
147
168
  },
148
169
  'presentation': presentationSchema,
149
170
  'internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
150
171
  'suppressMultipleSessionWarning': {
151
172
  type: 'boolean',
152
173
  description: ( localize(
153
- 5743,
174
+ 5719,
154
175
  "Disable the warning when trying to start the same debug configuration more than once."
155
176
  )),
156
177
  default: true
@@ -306,11 +327,11 @@ let AdapterManager = class AdapterManager extends Disposable {
306
327
  const { confirmed } = await this.dialogService.confirm({
307
328
  type: Severity$1.Warning,
308
329
  message: ( localize(
309
- 5744,
330
+ 5720,
310
331
  "You don't have an extension for debugging {0}. Should we find a {0} extension in the Marketplace?",
311
332
  languageLabel
312
333
  )),
313
- primaryButton: ( localize(5745, "&&Find {0} extension", languageLabel))
334
+ primaryButton: ( localize(5721, "&&Find {0} extension", languageLabel))
314
335
  });
315
336
  if (confirmed) {
316
337
  await this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
@@ -336,7 +357,7 @@ let AdapterManager = class AdapterManager extends Disposable {
336
357
  });
337
358
  const picks = [];
338
359
  if (suggestedCandidates.length > 0) {
339
- picks.push({ type: 'separator', label: ( localize(5746, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
360
+ picks.push({ type: 'separator', label: ( localize(5722, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
340
361
  }
341
362
  if (otherCandidates.length > 0) {
342
363
  if (picks.length > 0) {
@@ -344,13 +365,23 @@ let AdapterManager = class AdapterManager extends Disposable {
344
365
  }
345
366
  picks.push(...( (otherCandidates.map(c => ({ label: c.label, debugger: c })))));
346
367
  }
347
- picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5747, "Install an extension for {0}...", languageLabel)) : ( localize(5748, "Install extension...")) });
348
- const placeHolder = ( localize(5749, "Select debugger"));
368
+ picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5723, "Install an extension for {0}...", languageLabel)) : ( localize(5724, "Install extension...")) });
369
+ const contributed = this.menuService.getMenuActions(MenuId.DebugCreateConfiguration, this.contextKeyService);
370
+ for (const [, action] of contributed) {
371
+ for (const item of action) {
372
+ picks.push(item);
373
+ }
374
+ }
375
+ const placeHolder = ( localize(5725, "Select debugger"));
349
376
  return this.quickInputService.pick(picks, { activeItem: picks[0], placeHolder })
350
- .then(picked => {
351
- if (picked && picked.debugger) {
377
+ .then(async (picked) => {
378
+ if (picked && 'debugger' in picked && picked.debugger) {
352
379
  return picked.debugger;
353
380
  }
381
+ else if (picked instanceof MenuItemAction) {
382
+ picked.run();
383
+ return;
384
+ }
354
385
  if (picked) {
355
386
  this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
356
387
  }
@@ -390,7 +421,9 @@ AdapterManager = ( (__decorate([
390
421
  ( (__param(7, IContextKeyService))),
391
422
  ( (__param(8, ILanguageService))),
392
423
  ( (__param(9, IDialogService))),
393
- ( (__param(10, ILifecycleService)))
424
+ ( (__param(10, ILifecycleService))),
425
+ ( (__param(11, ITaskService))),
426
+ ( (__param(12, IMenuService)))
394
427
  ], AdapterManager)));
395
428
 
396
429
  export { AdapterManager };
@@ -16,6 +16,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
16
16
  import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
17
17
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
18
18
  import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
19
+ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
19
20
  import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
20
21
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
21
22
  import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -42,7 +43,7 @@ const DEBUG_SELECTED_ROOT = 'debug.selectedroot';
42
43
  const DEBUG_SELECTED_TYPE = 'debug.selectedtype';
43
44
  const DEBUG_RECENT_DYNAMIC_CONFIGURATIONS = 'debug.recentdynamicconfigurations';
44
45
  let ConfigurationManager = class ConfigurationManager {
45
- constructor(adapterManager, contextService, configurationService, quickInputService, instantiationService, storageService, extensionService, historyService, uriIdentityService, contextKeyService) {
46
+ constructor(adapterManager, contextService, configurationService, quickInputService, instantiationService, storageService, extensionService, historyService, uriIdentityService, contextKeyService, logService) {
46
47
  this.adapterManager = adapterManager;
47
48
  this.contextService = contextService;
48
49
  this.configurationService = configurationService;
@@ -52,6 +53,7 @@ let ConfigurationManager = class ConfigurationManager {
52
53
  this.extensionService = extensionService;
53
54
  this.historyService = historyService;
54
55
  this.uriIdentityService = uriIdentityService;
56
+ this.logService = logService;
55
57
  this.getSelectedConfig = () => Promise.resolve(undefined);
56
58
  this.selectedDynamic = false;
57
59
  this._onDidSelectConfigurationName = ( (new Emitter()));
@@ -191,7 +193,7 @@ let ConfigurationManager = class ConfigurationManager {
191
193
  config,
192
194
  buttons: [{
193
195
  iconClass: ThemeIcon.asClassName(debugConfigure),
194
- tooltip: ( localize(5784, "Edit Debug Configuration in launch.json"))
196
+ tooltip: ( localize(5760, "Edit Debug Configuration in launch.json"))
195
197
  }],
196
198
  launch
197
199
  }))))));
@@ -200,7 +202,7 @@ let ConfigurationManager = class ConfigurationManager {
200
202
  const disposables = ( (new DisposableStore()));
201
203
  const input = disposables.add(this.quickInputService.createQuickPick());
202
204
  input.busy = true;
203
- input.placeholder = ( localize(5785, "Select Launch Configuration"));
205
+ input.placeholder = ( localize(5761, "Select Launch Configuration"));
204
206
  const chosenPromise = ( (new Promise(resolve => {
205
207
  disposables.add(input.onDidAccept(() => resolve(input.activeItems[0])));
206
208
  disposables.add(input.onDidTriggerItemButton(async (context) => {
@@ -213,7 +215,15 @@ let ConfigurationManager = class ConfigurationManager {
213
215
  }));
214
216
  disposables.add(input.onDidHide(() => resolve(undefined)));
215
217
  })));
216
- const nestedPicks = await Promise.all(picks);
218
+ let nestedPicks;
219
+ try {
220
+ nestedPicks = await Promise.all(picks);
221
+ }
222
+ catch (err) {
223
+ this.logService.error(err);
224
+ disposables.dispose();
225
+ return;
226
+ }
217
227
  const items = nestedPicks.flat();
218
228
  input.items = items;
219
229
  input.busy = false;
@@ -414,7 +424,8 @@ ConfigurationManager = ( (__decorate([
414
424
  ( (__param(6, IExtensionService))),
415
425
  ( (__param(7, IHistoryService))),
416
426
  ( (__param(8, IUriIdentityService))),
417
- ( (__param(9, IContextKeyService)))
427
+ ( (__param(9, IContextKeyService))),
428
+ ( (__param(10, ILogService)))
418
429
  ], ConfigurationManager)));
419
430
  class AbstractLaunch {
420
431
  constructor(configurationManager, adapterManager) {
@@ -522,7 +533,7 @@ let Launch = class Launch extends AbstractLaunch {
522
533
  }
523
534
  catch (error) {
524
535
  throw ( (new Error(localize(
525
- 5786,
536
+ 5762,
526
537
  "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).",
527
538
  error.message
528
539
  ))));
@@ -579,7 +590,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
579
590
  return this.contextService.getWorkspace().configuration;
580
591
  }
581
592
  get name() {
582
- return ( localize(5787, "workspace"));
593
+ return ( localize(5763, "workspace"));
583
594
  }
584
595
  getConfig() {
585
596
  return this.configurationService.inspect('launch').workspaceValue;
@@ -623,7 +634,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
623
634
  return this.preferencesService.userSettingsResource;
624
635
  }
625
636
  get name() {
626
- return ( localize(5788, "user settings"));
637
+ return ( localize(5764, "user settings"));
627
638
  }
628
639
  get hidden() {
629
640
  return true;
@@ -26,7 +26,7 @@ let DebugConsoleQuickAccess = class DebugConsoleQuickAccess extends PickerQuickA
26
26
  if (debugConsolePicks.length > 0) {
27
27
  debugConsolePicks.push({ type: 'separator' });
28
28
  }
29
- const createTerminalLabel = ( localize(5946, "Start a New Debug Session"));
29
+ const createTerminalLabel = ( localize(5924, "Start a New Debug Session"));
30
30
  debugConsolePicks.push({
31
31
  label: `$(plus) ${createTerminalLabel}`,
32
32
  ariaLabel: createTerminalLabel,
@@ -15,6 +15,7 @@ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/brows
15
15
  import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
16
16
  import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
17
17
  import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
18
+ import { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
18
19
  import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
19
20
  import { DisassemblyView } from './disassemblyView.js';
20
21
  import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_CALLSTACK_ITEM_TYPE, REPL_VIEW_ID, WATCH_VIEW_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -29,8 +30,8 @@ class ToggleBreakpointAction extends Action2 {
29
30
  super({
30
31
  id: 'editor.debug.action.toggleBreakpoint',
31
32
  title: {
32
- ...( localize2(5947, "Debug: Toggle Breakpoint")),
33
- mnemonicTitle: ( localize(5948, "Toggle &&Breakpoint")),
33
+ ...( localize2(5925, "Debug: Toggle Breakpoint")),
34
+ mnemonicTitle: ( localize(5926, "Toggle &&Breakpoint")),
34
35
  },
35
36
  f1: true,
36
37
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -89,12 +90,12 @@ class ConditionalBreakpointAction extends EditorAction {
89
90
  constructor() {
90
91
  super({
91
92
  id: 'editor.debug.action.conditionalBreakpoint',
92
- label: ( localize(5949, "Debug: Add Conditional Breakpoint...")),
93
+ label: ( localize(5927, "Debug: Add Conditional Breakpoint...")),
93
94
  alias: 'Debug: Add Conditional Breakpoint...',
94
95
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
95
96
  menuOpts: {
96
97
  menuId: MenuId.MenubarNewBreakpointMenu,
97
- title: ( localize(5950, "&&Conditional Breakpoint...")),
98
+ title: ( localize(5928, "&&Conditional Breakpoint...")),
98
99
  group: '1_breakpoints',
99
100
  order: 1,
100
101
  when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -113,13 +114,13 @@ class LogPointAction extends EditorAction {
113
114
  constructor() {
114
115
  super({
115
116
  id: 'editor.debug.action.addLogPoint',
116
- label: ( localize(5951, "Debug: Add Logpoint...")),
117
+ label: ( localize(5929, "Debug: Add Logpoint...")),
117
118
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
118
119
  alias: 'Debug: Add Logpoint...',
119
120
  menuOpts: [
120
121
  {
121
122
  menuId: MenuId.MenubarNewBreakpointMenu,
122
- title: ( localize(5952, "&&Logpoint...")),
123
+ title: ( localize(5930, "&&Logpoint...")),
123
124
  group: '1_breakpoints',
124
125
  order: 4,
125
126
  when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -139,13 +140,13 @@ class TriggerByBreakpointAction extends EditorAction {
139
140
  constructor() {
140
141
  super({
141
142
  id: 'editor.debug.action.triggerByBreakpoint',
142
- label: ( localize(5953, "Debug: Add Triggered Breakpoint...")),
143
+ label: ( localize(5931, "Debug: Add Triggered Breakpoint...")),
143
144
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
144
145
  alias: 'Debug: Triggered Breakpoint...',
145
146
  menuOpts: [
146
147
  {
147
148
  menuId: MenuId.MenubarNewBreakpointMenu,
148
- title: ( localize(5954, "&&Triggered Breakpoint...")),
149
+ title: ( localize(5932, "&&Triggered Breakpoint...")),
149
150
  group: '1_breakpoints',
150
151
  order: 4,
151
152
  when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -165,12 +166,12 @@ class EditBreakpointAction extends EditorAction {
165
166
  constructor() {
166
167
  super({
167
168
  id: 'editor.debug.action.editBreakpoint',
168
- label: ( localize(5955, "Debug: Edit Breakpoint")),
169
+ label: ( localize(5933, "Debug: Edit Breakpoint")),
169
170
  alias: 'Debug: Edit Existing Breakpoint',
170
171
  precondition: CONTEXT_DEBUGGERS_AVAILABLE,
171
172
  menuOpts: {
172
173
  menuId: MenuId.MenubarNewBreakpointMenu,
173
- title: ( localize(5956, "&&Edit Breakpoint")),
174
+ title: ( localize(5934, "&&Edit Breakpoint")),
174
175
  group: '1_breakpoints',
175
176
  order: 1,
176
177
  when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -205,8 +206,8 @@ class OpenDisassemblyViewAction extends Action2 {
205
206
  super({
206
207
  id: OpenDisassemblyViewAction.ID,
207
208
  title: {
208
- ...( localize2(5957, "Open Disassembly View")),
209
- mnemonicTitle: ( localize(5958, "&&DisassemblyView")),
209
+ ...( localize2(5935, "Open Disassembly View")),
210
+ mnemonicTitle: ( localize(5936, "&&DisassemblyView")),
210
211
  },
211
212
  precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
212
213
  menu: [
@@ -257,11 +258,11 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
257
258
  super({
258
259
  id: ToggleDisassemblyViewSourceCodeAction.ID,
259
260
  title: {
260
- ...( localize2(5959, "Toggle Source Code in Disassembly View")),
261
- mnemonicTitle: ( localize(5960, "&&ToggleSource")),
261
+ ...( localize2(5937, "Toggle Source Code in Disassembly View")),
262
+ mnemonicTitle: ( localize(5938, "&&ToggleSource")),
262
263
  },
263
264
  metadata: {
264
- description: ( localize2(5961, 'Shows or hides source code in disassembly'))
265
+ description: ( localize2(5939, 'Shows or hides source code in disassembly'))
265
266
  },
266
267
  f1: true,
267
268
  });
@@ -276,7 +277,7 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
276
277
  }
277
278
  class RunToCursorAction extends EditorAction {
278
279
  static { this.ID = 'editor.debug.action.runToCursor'; }
279
- static { this.LABEL = ( localize2(5962, "Run to Cursor")); }
280
+ static { this.LABEL = ( localize2(5940, "Run to Cursor")); }
280
281
  constructor() {
281
282
  super({
282
283
  id: RunToCursorAction.ID,
@@ -285,7 +286,8 @@ class RunToCursorAction extends EditorAction {
285
286
  precondition: ( (ContextKeyExpr.and(
286
287
  CONTEXT_DEBUGGERS_AVAILABLE,
287
288
  (PanelFocusContext.toNegated()),
288
- (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS))
289
+ (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)),
290
+ (CONTEXT_IN_CHAT_SESSION.negate())
289
291
  ))),
290
292
  contextMenuOpts: {
291
293
  group: 'debug',
@@ -313,13 +315,17 @@ class RunToCursorAction extends EditorAction {
313
315
  }
314
316
  class SelectionToReplAction extends EditorAction {
315
317
  static { this.ID = 'editor.debug.action.selectionToRepl'; }
316
- static { this.LABEL = ( localize2(5963, "Evaluate in Debug Console")); }
318
+ static { this.LABEL = ( localize2(5941, "Evaluate in Debug Console")); }
317
319
  constructor() {
318
320
  super({
319
321
  id: SelectionToReplAction.ID,
320
322
  label: SelectionToReplAction.LABEL.value,
321
323
  alias: 'Debug: Evaluate in Console',
322
- precondition: ( (ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus))),
324
+ precondition: ( (ContextKeyExpr.and(
325
+ CONTEXT_IN_DEBUG_MODE,
326
+ EditorContextKeys.editorTextFocus,
327
+ (CONTEXT_IN_CHAT_SESSION.negate())
328
+ ))),
323
329
  contextMenuOpts: {
324
330
  group: 'debug',
325
331
  order: 0
@@ -348,13 +354,17 @@ class SelectionToReplAction extends EditorAction {
348
354
  }
349
355
  class SelectionToWatchExpressionsAction extends EditorAction {
350
356
  static { this.ID = 'editor.debug.action.selectionToWatch'; }
351
- static { this.LABEL = ( localize2(5964, "Add to Watch")); }
357
+ static { this.LABEL = ( localize2(5942, "Add to Watch")); }
352
358
  constructor() {
353
359
  super({
354
360
  id: SelectionToWatchExpressionsAction.ID,
355
361
  label: SelectionToWatchExpressionsAction.LABEL.value,
356
362
  alias: 'Debug: Add to Watch',
357
- precondition: ( (ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus))),
363
+ precondition: ( (ContextKeyExpr.and(
364
+ CONTEXT_IN_DEBUG_MODE,
365
+ EditorContextKeys.editorTextFocus,
366
+ (CONTEXT_IN_CHAT_SESSION.negate())
367
+ ))),
358
368
  contextMenuOpts: {
359
369
  group: 'debug',
360
370
  order: 1
@@ -393,7 +403,7 @@ class ShowDebugHoverAction extends EditorAction {
393
403
  constructor() {
394
404
  super({
395
405
  id: 'editor.debug.action.showDebugHover',
396
- label: ( localize(5965, "Debug: Show Hover")),
406
+ label: ( localize(5943, "Debug: Show Hover")),
397
407
  alias: 'Debug: Show Hover',
398
408
  precondition: CONTEXT_IN_DEBUG_MODE,
399
409
  kbOpts: {
@@ -411,10 +421,10 @@ class ShowDebugHoverAction extends EditorAction {
411
421
  return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
412
422
  }
413
423
  }
414
- const NO_TARGETS_MESSAGE = ( localize(5966, "Step targets are not available here"));
424
+ const NO_TARGETS_MESSAGE = ( localize(5944, "Step targets are not available here"));
415
425
  class StepIntoTargetsAction extends EditorAction {
416
426
  static { this.ID = 'editor.debug.action.stepIntoTargets'; }
417
- static { this.LABEL = ( localize(5967, "Step Into Target")); }
427
+ static { this.LABEL = ( localize(5945, "Step Into Target")); }
418
428
  constructor() {
419
429
  super({
420
430
  id: StepIntoTargetsAction.ID,
@@ -526,7 +536,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
526
536
  constructor() {
527
537
  super(true, {
528
538
  id: 'editor.debug.action.goToNextBreakpoint',
529
- label: ( localize(5968, "Debug: Go to Next Breakpoint")),
539
+ label: ( localize(5946, "Debug: Go to Next Breakpoint")),
530
540
  alias: 'Debug: Go to Next Breakpoint',
531
541
  precondition: CONTEXT_DEBUGGERS_AVAILABLE
532
542
  });
@@ -536,7 +546,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
536
546
  constructor() {
537
547
  super(false, {
538
548
  id: 'editor.debug.action.goToPreviousBreakpoint',
539
- label: ( localize(5969, "Debug: Go to Previous Breakpoint")),
549
+ label: ( localize(5947, "Debug: Go to Previous Breakpoint")),
540
550
  alias: 'Debug: Go to Previous Breakpoint',
541
551
  precondition: CONTEXT_DEBUGGERS_AVAILABLE
542
552
  });
@@ -546,7 +556,7 @@ class CloseExceptionWidgetAction extends EditorAction {
546
556
  constructor() {
547
557
  super({
548
558
  id: 'editor.debug.action.closeExceptionWidget',
549
- label: ( localize(5970, "Close Exception Widget")),
559
+ label: ( localize(5948, "Close Exception Widget")),
550
560
  alias: 'Close Exception Widget',
551
561
  precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
552
562
  kbOpts: {
@@ -31,7 +31,7 @@ import { InjectedTextCursorStops } from 'vscode/vscode/vs/editor/common/model';
31
31
  import { ILanguageFeatureDebounceService } from 'vscode/vscode/vs/editor/common/services/languageFeatureDebounce';
32
32
  import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
33
33
  import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
34
- import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
34
+ import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController2';
35
35
  import { HoverStartMode, HoverStartSource } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverOperation';
36
36
  import { localize } from 'vscode/vscode/vs/nls';
37
37
  import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
@@ -67,8 +67,8 @@ registerColor('editor.inlineValuesForeground', {
67
67
  light: '#00000080',
68
68
  hcDark: '#ffffff80',
69
69
  hcLight: '#00000080'
70
- }, ( localize(5971, "Color for the debug inline value text.")));
71
- registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5972, "Color for the debug inline value background.")));
70
+ }, ( localize(5949, "Color for the debug inline value text.")));
71
+ registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5950, "Color for the debug inline value background.")));
72
72
  class InlineSegment {
73
73
  constructor(column, text) {
74
74
  this.column = column;
@@ -318,7 +318,7 @@ let DebugEditorContribution = class DebugEditorContribution {
318
318
  if (this.defaultHoverLockout.value || this.editorHoverOptions?.enabled === false) {
319
319
  return;
320
320
  }
321
- const hoverController = this.editor.getContribution(HoverController.ID);
321
+ const hoverController = this.editor.getContribution(ContentHoverController.ID);
322
322
  hoverController?.hideContentHover();
323
323
  this.editor.updateOptions({ hover: { enabled: false } });
324
324
  this.defaultHoverLockout.value = {
@@ -330,7 +330,7 @@ let DebugEditorContribution = class DebugEditorContribution {
330
330
  };
331
331
  }
332
332
  showEditorHover(position, focus) {
333
- const hoverController = this.editor.getContribution(HoverController.ID);
333
+ const hoverController = this.editor.getContribution(ContentHoverController.ID);
334
334
  const range = ( (new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
335
335
  this.defaultHoverLockout.clear();
336
336
  hoverController?.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Mouse, focus);