@codingame/monaco-vscode-debug-service-override 4.5.1 → 4.5.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.
- package/package.json +2 -2
- package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js +105 -150
- package/vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js +258 -529
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +28 -48
- package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js +44 -71
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +84 -163
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +116 -120
- package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js +7 -10
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js +78 -140
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +72 -75
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +25 -28
- package/vscode/src/vs/workbench/contrib/debug/browser/debugMemory.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/debugQuickAccess.js +16 -48
- package/vscode/src/vs/workbench/contrib/debug/browser/debugService.js +140 -132
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSession.js +218 -175
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +5 -18
- package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js +9 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js +69 -110
- package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.js +68 -53
- package/vscode/src/vs/workbench/contrib/debug/browser/debugViewlet.js +77 -56
- package/vscode/src/vs/workbench/contrib/debug/browser/disassemblyView.js +50 -75
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +13 -29
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +22 -51
- package/vscode/src/vs/workbench/contrib/debug/browser/loadedScriptsView.js +47 -73
- package/vscode/src/vs/workbench/contrib/debug/browser/rawDebugSession.js +60 -76
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +14 -43
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +23 -42
- package/vscode/src/vs/workbench/contrib/debug/browser/statusbarColorProvider.js +17 -16
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +56 -94
- package/vscode/src/vs/workbench/contrib/debug/browser/watchExpressionsView.js +40 -79
- package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js +55 -57
- package/vscode/src/vs/workbench/contrib/debug/common/debugContentProvider.js +14 -28
- package/vscode/src/vs/workbench/contrib/debug/common/debugLifecycle.js +12 -15
- package/vscode/src/vs/workbench/contrib/debug/common/debugSchemas.js +71 -146
- package/vscode/src/vs/workbench/contrib/debug/common/debugger.js +92 -111
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +5 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableCommands.js +5 -12
- package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js +42 -22
|
@@ -31,6 +31,7 @@ import { showLoadedScriptMenu } from '../common/loadedScriptsPicker.js';
|
|
|
31
31
|
import { showDebugSessionMenu } from './debugSessionPicker.js';
|
|
32
32
|
import { TEXT_FILE_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
|
|
33
33
|
|
|
34
|
+
const _moduleId = "vs/workbench/contrib/debug/browser/debugCommands";
|
|
34
35
|
const ADD_CONFIGURATION_ID = 'debug.addConfiguration';
|
|
35
36
|
const TOGGLE_INLINE_BREAKPOINT_ID = 'editor.debug.action.toggleInlineBreakpoint';
|
|
36
37
|
const COPY_STACK_TRACE_ID = 'debug.copyStackTrace';
|
|
@@ -67,120 +68,31 @@ const CALLSTACK_TOP_ID = 'workbench.action.debug.callStackTop';
|
|
|
67
68
|
const CALLSTACK_BOTTOM_ID = 'workbench.action.debug.callStackBottom';
|
|
68
69
|
const CALLSTACK_UP_ID = 'workbench.action.debug.callStackUp';
|
|
69
70
|
const CALLSTACK_DOWN_ID = 'workbench.action.debug.callStackDown';
|
|
70
|
-
const DEBUG_COMMAND_CATEGORY = ( localize2WithPath(
|
|
71
|
-
const RESTART_LABEL = ( localize2WithPath(
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
));
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
));
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
));
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
));
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
));
|
|
96
|
-
const PAUSE_LABEL = ( localize2WithPath('vs/workbench/contrib/debug/browser/debugCommands', 'pauseDebug', "Pause"));
|
|
97
|
-
const DISCONNECT_LABEL = ( localize2WithPath(
|
|
98
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
99
|
-
'disconnect',
|
|
100
|
-
"Disconnect"
|
|
101
|
-
));
|
|
102
|
-
const DISCONNECT_AND_SUSPEND_LABEL = ( localize2WithPath(
|
|
103
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
104
|
-
'disconnectSuspend',
|
|
105
|
-
"Disconnect and Suspend"
|
|
106
|
-
));
|
|
107
|
-
const STOP_LABEL = ( localize2WithPath('vs/workbench/contrib/debug/browser/debugCommands', 'stop', "Stop"));
|
|
108
|
-
const CONTINUE_LABEL = ( localize2WithPath(
|
|
109
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
110
|
-
'continueDebug',
|
|
111
|
-
"Continue"
|
|
112
|
-
));
|
|
113
|
-
const FOCUS_SESSION_LABEL = ( localize2WithPath(
|
|
114
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
115
|
-
'focusSession',
|
|
116
|
-
"Focus Session"
|
|
117
|
-
));
|
|
118
|
-
const SELECT_AND_START_LABEL = ( localize2WithPath(
|
|
119
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
120
|
-
'selectAndStartDebugging',
|
|
121
|
-
"Select and Start Debugging"
|
|
122
|
-
));
|
|
123
|
-
const DEBUG_CONFIGURE_LABEL = ( localizeWithPath(
|
|
124
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
125
|
-
'openLaunchJson',
|
|
126
|
-
"Open '{0}'",
|
|
127
|
-
'launch.json'
|
|
128
|
-
));
|
|
129
|
-
const DEBUG_START_LABEL = ( localize2WithPath(
|
|
130
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
131
|
-
'startDebug',
|
|
132
|
-
"Start Debugging"
|
|
133
|
-
));
|
|
134
|
-
const DEBUG_RUN_LABEL = ( localize2WithPath(
|
|
135
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
136
|
-
'startWithoutDebugging',
|
|
137
|
-
"Start Without Debugging"
|
|
138
|
-
));
|
|
139
|
-
const NEXT_DEBUG_CONSOLE_LABEL = ( localize2WithPath(
|
|
140
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
141
|
-
'nextDebugConsole',
|
|
142
|
-
"Focus Next Debug Console"
|
|
143
|
-
));
|
|
144
|
-
const PREV_DEBUG_CONSOLE_LABEL = ( localize2WithPath(
|
|
145
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
146
|
-
'prevDebugConsole',
|
|
147
|
-
"Focus Previous Debug Console"
|
|
148
|
-
));
|
|
149
|
-
const OPEN_LOADED_SCRIPTS_LABEL = ( localize2WithPath(
|
|
150
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
151
|
-
'openLoadedScript',
|
|
152
|
-
"Open Loaded Script..."
|
|
153
|
-
));
|
|
154
|
-
const CALLSTACK_TOP_LABEL = ( localize2WithPath(
|
|
155
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
156
|
-
'callStackTop',
|
|
157
|
-
"Navigate to Top of Call Stack"
|
|
158
|
-
));
|
|
159
|
-
const CALLSTACK_BOTTOM_LABEL = ( localize2WithPath(
|
|
160
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
161
|
-
'callStackBottom',
|
|
162
|
-
"Navigate to Bottom of Call Stack"
|
|
163
|
-
));
|
|
164
|
-
const CALLSTACK_UP_LABEL = ( localize2WithPath(
|
|
165
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
166
|
-
'callStackUp',
|
|
167
|
-
"Navigate Up Call Stack"
|
|
168
|
-
));
|
|
169
|
-
const CALLSTACK_DOWN_LABEL = ( localize2WithPath(
|
|
170
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
171
|
-
'callStackDown',
|
|
172
|
-
"Navigate Down Call Stack"
|
|
173
|
-
));
|
|
174
|
-
const SELECT_DEBUG_CONSOLE_LABEL = ( localize2WithPath(
|
|
175
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
176
|
-
'selectDebugConsole',
|
|
177
|
-
"Select Debug Console"
|
|
178
|
-
));
|
|
179
|
-
const SELECT_DEBUG_SESSION_LABEL = ( localize2WithPath(
|
|
180
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
181
|
-
'selectDebugSession',
|
|
182
|
-
"Select Debug Session"
|
|
183
|
-
));
|
|
71
|
+
const DEBUG_COMMAND_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Debug'));
|
|
72
|
+
const RESTART_LABEL = ( localize2WithPath(_moduleId, 1, "Restart"));
|
|
73
|
+
const STEP_OVER_LABEL = ( localize2WithPath(_moduleId, 2, "Step Over"));
|
|
74
|
+
const STEP_INTO_LABEL = ( localize2WithPath(_moduleId, 3, "Step Into"));
|
|
75
|
+
const STEP_INTO_TARGET_LABEL = ( localize2WithPath(_moduleId, 4, "Step Into Target"));
|
|
76
|
+
const STEP_OUT_LABEL = ( localize2WithPath(_moduleId, 5, "Step Out"));
|
|
77
|
+
const PAUSE_LABEL = ( localize2WithPath(_moduleId, 6, "Pause"));
|
|
78
|
+
const DISCONNECT_LABEL = ( localize2WithPath(_moduleId, 7, "Disconnect"));
|
|
79
|
+
const DISCONNECT_AND_SUSPEND_LABEL = ( localize2WithPath(_moduleId, 8, "Disconnect and Suspend"));
|
|
80
|
+
const STOP_LABEL = ( localize2WithPath(_moduleId, 9, "Stop"));
|
|
81
|
+
const CONTINUE_LABEL = ( localize2WithPath(_moduleId, 10, "Continue"));
|
|
82
|
+
const FOCUS_SESSION_LABEL = ( localize2WithPath(_moduleId, 11, "Focus Session"));
|
|
83
|
+
const SELECT_AND_START_LABEL = ( localize2WithPath(_moduleId, 12, "Select and Start Debugging"));
|
|
84
|
+
const DEBUG_CONFIGURE_LABEL = ( localizeWithPath(_moduleId, 13, "Open '{0}'", 'launch.json'));
|
|
85
|
+
const DEBUG_START_LABEL = ( localize2WithPath(_moduleId, 14, "Start Debugging"));
|
|
86
|
+
const DEBUG_RUN_LABEL = ( localize2WithPath(_moduleId, 15, "Start Without Debugging"));
|
|
87
|
+
const NEXT_DEBUG_CONSOLE_LABEL = ( localize2WithPath(_moduleId, 16, "Focus Next Debug Console"));
|
|
88
|
+
const PREV_DEBUG_CONSOLE_LABEL = ( localize2WithPath(_moduleId, 17, "Focus Previous Debug Console"));
|
|
89
|
+
const OPEN_LOADED_SCRIPTS_LABEL = ( localize2WithPath(_moduleId, 18, "Open Loaded Script..."));
|
|
90
|
+
const CALLSTACK_TOP_LABEL = ( localize2WithPath(_moduleId, 19, "Navigate to Top of Call Stack"));
|
|
91
|
+
const CALLSTACK_BOTTOM_LABEL = ( localize2WithPath(_moduleId, 20, "Navigate to Bottom of Call Stack"));
|
|
92
|
+
const CALLSTACK_UP_LABEL = ( localize2WithPath(_moduleId, 21, "Navigate Up Call Stack"));
|
|
93
|
+
const CALLSTACK_DOWN_LABEL = ( localize2WithPath(_moduleId, 22, "Navigate Down Call Stack"));
|
|
94
|
+
const SELECT_DEBUG_CONSOLE_LABEL = ( localize2WithPath(_moduleId, 23, "Select Debug Console"));
|
|
95
|
+
const SELECT_DEBUG_SESSION_LABEL = ( localize2WithPath(_moduleId, 24, "Select Debug Session"));
|
|
184
96
|
const DEBUG_QUICK_ACCESS_PREFIX = 'debug ';
|
|
185
97
|
const DEBUG_CONSOLE_QUICK_ACCESS_PREFIX = 'debug consoles ';
|
|
186
98
|
function isThreadContext(obj) {
|
|
@@ -353,7 +265,7 @@ CommandsRegistry.registerCommand({
|
|
|
353
265
|
const frame = getFrame(debugService, context);
|
|
354
266
|
if (frame) {
|
|
355
267
|
const eol = textResourcePropertiesService.getEOL(frame.source.uri);
|
|
356
|
-
await clipboardService.writeText(( frame.thread.getCallStack().map(sf => ( sf.toString()))).join(eol));
|
|
268
|
+
await clipboardService.writeText(( (frame.thread.getCallStack().map(sf => ( (sf.toString()))))).join(eol));
|
|
357
269
|
}
|
|
358
270
|
}
|
|
359
271
|
});
|
|
@@ -400,12 +312,8 @@ CommandsRegistry.registerCommand({
|
|
|
400
312
|
if (targets && targets.length) {
|
|
401
313
|
let id = targets[0].id;
|
|
402
314
|
if (targets.length > 1) {
|
|
403
|
-
const picks = ( targets.map(t => ({ label: t.label, _id: t.id })));
|
|
404
|
-
const pick = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(
|
|
405
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
406
|
-
'chooseLocation',
|
|
407
|
-
"Choose the specific location"
|
|
408
|
-
)) });
|
|
315
|
+
const picks = ( (targets.map(t => ({ label: t.label, _id: t.id }))));
|
|
316
|
+
const pick = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(_moduleId, 25, "Choose the specific location")) });
|
|
409
317
|
if (!pick) {
|
|
410
318
|
return;
|
|
411
319
|
}
|
|
@@ -416,8 +324,8 @@ CommandsRegistry.registerCommand({
|
|
|
416
324
|
}
|
|
417
325
|
}
|
|
418
326
|
return notificationService.warn(( localizeWithPath(
|
|
419
|
-
|
|
420
|
-
|
|
327
|
+
_moduleId,
|
|
328
|
+
26,
|
|
421
329
|
"No executable code is associated at the current cursor position."
|
|
422
330
|
)));
|
|
423
331
|
}
|
|
@@ -453,14 +361,10 @@ CommandsRegistry.registerCommand({
|
|
|
453
361
|
MenuRegistry.appendMenuItem(MenuId.EditorContext, {
|
|
454
362
|
command: {
|
|
455
363
|
id: JUMP_TO_CURSOR_ID,
|
|
456
|
-
title: ( localizeWithPath(
|
|
457
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
458
|
-
'jumpToCursor',
|
|
459
|
-
"Jump to Cursor"
|
|
460
|
-
)),
|
|
364
|
+
title: ( localizeWithPath(_moduleId, 27, "Jump to Cursor")),
|
|
461
365
|
category: DEBUG_COMMAND_CATEGORY
|
|
462
366
|
},
|
|
463
|
-
when: ( ContextKeyExpr.and(CONTEXT_JUMP_TO_CURSOR_SUPPORTED, EditorContextKeys.editorTextFocus)),
|
|
367
|
+
when: ( (ContextKeyExpr.and(CONTEXT_JUMP_TO_CURSOR_SUPPORTED, EditorContextKeys.editorTextFocus))),
|
|
464
368
|
group: 'debug',
|
|
465
369
|
order: 3
|
|
466
370
|
});
|
|
@@ -517,7 +421,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
517
421
|
id: STEP_OVER_ID,
|
|
518
422
|
weight: 200 ,
|
|
519
423
|
primary: 68 ,
|
|
520
|
-
when: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
|
|
424
|
+
when: ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))),
|
|
521
425
|
handler: async (accessor, _, context) => {
|
|
522
426
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
523
427
|
if (CONTEXT_DISASSEMBLY_VIEW_FOCUS.getValue(contextKeyService)) {
|
|
@@ -533,7 +437,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
533
437
|
id: STEP_INTO_ID,
|
|
534
438
|
weight: 200 + 10,
|
|
535
439
|
primary: STEP_INTO_KEYBINDING,
|
|
536
|
-
when: ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')),
|
|
440
|
+
when: ( (CONTEXT_DEBUG_STATE.notEqualsTo('inactive'))),
|
|
537
441
|
handler: async (accessor, _, context) => {
|
|
538
442
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
539
443
|
if (CONTEXT_DISASSEMBLY_VIEW_FOCUS.getValue(contextKeyService)) {
|
|
@@ -548,7 +452,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
548
452
|
id: STEP_OUT_ID,
|
|
549
453
|
weight: 200 ,
|
|
550
454
|
primary: 1024 | 69 ,
|
|
551
|
-
when: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
|
|
455
|
+
when: ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))),
|
|
552
456
|
handler: async (accessor, _, context) => {
|
|
553
457
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
554
458
|
if (CONTEXT_DISASSEMBLY_VIEW_FOCUS.getValue(contextKeyService)) {
|
|
@@ -563,7 +467,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
563
467
|
id: PAUSE_ID,
|
|
564
468
|
weight: 200 + 2,
|
|
565
469
|
primary: 64 ,
|
|
566
|
-
when: ( CONTEXT_DEBUG_STATE.isEqualTo('running')),
|
|
470
|
+
when: ( (CONTEXT_DEBUG_STATE.isEqualTo('running'))),
|
|
567
471
|
handler: async (accessor, _, context) => {
|
|
568
472
|
await getThreadAndRun(accessor, context, thread => thread.pause());
|
|
569
473
|
}
|
|
@@ -571,7 +475,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
571
475
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
572
476
|
id: STEP_INTO_TARGET_ID,
|
|
573
477
|
primary: STEP_INTO_KEYBINDING | 2048 ,
|
|
574
|
-
when: ( ContextKeyExpr.and(
|
|
478
|
+
when: ( (ContextKeyExpr.and(
|
|
479
|
+
CONTEXT_STEP_INTO_TARGETS_SUPPORTED,
|
|
480
|
+
CONTEXT_IN_DEBUG_MODE,
|
|
481
|
+
(CONTEXT_DEBUG_STATE.isEqualTo('stopped'))
|
|
482
|
+
))),
|
|
575
483
|
weight: 200 ,
|
|
576
484
|
handler: async (accessor, _, context) => {
|
|
577
485
|
const quickInputService = accessor.get(IQuickInputService);
|
|
@@ -618,11 +526,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
618
526
|
qp.items = targets?.map(target => ({ target, label: target.label }));
|
|
619
527
|
}
|
|
620
528
|
else {
|
|
621
|
-
qp.placeholder = ( localizeWithPath(
|
|
622
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
623
|
-
'editor.debug.action.stepIntoTargets.none',
|
|
624
|
-
"No step targets available"
|
|
625
|
-
));
|
|
529
|
+
qp.placeholder = ( localizeWithPath(_moduleId, 28, "No step targets available"));
|
|
626
530
|
}
|
|
627
531
|
});
|
|
628
532
|
}
|
|
@@ -647,7 +551,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
647
551
|
id: DISCONNECT_ID,
|
|
648
552
|
weight: 200 ,
|
|
649
553
|
primary: 1024 | 63 ,
|
|
650
|
-
when: ( ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE)),
|
|
554
|
+
when: ( (ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE))),
|
|
651
555
|
handler: (accessor, _, context) => stopHandler(accessor, _, context, true)
|
|
652
556
|
});
|
|
653
557
|
CommandsRegistry.registerCommand({
|
|
@@ -658,7 +562,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
658
562
|
id: STOP_ID,
|
|
659
563
|
weight: 200 ,
|
|
660
564
|
primary: 1024 | 63 ,
|
|
661
|
-
when: ( ContextKeyExpr.and(
|
|
565
|
+
when: ( (ContextKeyExpr.and(
|
|
566
|
+
(CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()),
|
|
567
|
+
CONTEXT_IN_DEBUG_MODE
|
|
568
|
+
))),
|
|
662
569
|
handler: (accessor, _, context) => stopHandler(accessor, _, context, false)
|
|
663
570
|
});
|
|
664
571
|
CommandsRegistry.registerCommand({
|
|
@@ -681,7 +588,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
681
588
|
id: CONTINUE_ID,
|
|
682
589
|
weight: 200 + 10,
|
|
683
590
|
primary: 63 ,
|
|
684
|
-
when: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
|
|
591
|
+
when: ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))),
|
|
685
592
|
handler: async (accessor, _, context) => {
|
|
686
593
|
await getThreadAndRun(accessor, context, thread => thread.continue());
|
|
687
594
|
}
|
|
@@ -761,7 +668,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
761
668
|
id: DEBUG_START_COMMAND_ID,
|
|
762
669
|
weight: 200 ,
|
|
763
670
|
primary: 63 ,
|
|
764
|
-
when: ( ContextKeyExpr.and(
|
|
671
|
+
when: ( (ContextKeyExpr.and(
|
|
672
|
+
CONTEXT_DEBUGGERS_AVAILABLE,
|
|
673
|
+
(CONTEXT_DEBUG_STATE.isEqualTo('inactive'))
|
|
674
|
+
))),
|
|
765
675
|
handler: async (accessor, debugStartOptions) => {
|
|
766
676
|
const debugService = accessor.get(IDebugService);
|
|
767
677
|
await saveAllBeforeDebugStart(accessor.get(IConfigurationService), accessor.get(IEditorService));
|
|
@@ -776,7 +686,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
776
686
|
weight: 200 ,
|
|
777
687
|
primary: 2048 | 63 ,
|
|
778
688
|
mac: { primary: 256 | 63 },
|
|
779
|
-
when: ( ContextKeyExpr.and(
|
|
689
|
+
when: ( (ContextKeyExpr.and(
|
|
690
|
+
CONTEXT_DEBUGGERS_AVAILABLE,
|
|
691
|
+
(CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))
|
|
692
|
+
))),
|
|
780
693
|
handler: async (accessor) => {
|
|
781
694
|
const commandService = accessor.get(ICommandService);
|
|
782
695
|
await commandService.executeCommand(DEBUG_START_COMMAND_ID, { noDebug: true });
|
|
@@ -785,7 +698,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
785
698
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
786
699
|
id: 'debug.toggleBreakpoint',
|
|
787
700
|
weight: 200 + 5,
|
|
788
|
-
when: ( ContextKeyExpr.and(
|
|
701
|
+
when: ( (ContextKeyExpr.and(
|
|
702
|
+
CONTEXT_BREAKPOINTS_FOCUSED,
|
|
703
|
+
(InputFocusedContext.toNegated())
|
|
704
|
+
))),
|
|
789
705
|
primary: 10 ,
|
|
790
706
|
handler: (accessor) => {
|
|
791
707
|
const listService = accessor.get(IListService);
|
|
@@ -875,7 +791,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
875
791
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
876
792
|
id: REMOVE_EXPRESSION_COMMAND_ID,
|
|
877
793
|
weight: 200 ,
|
|
878
|
-
when: ( ContextKeyExpr.and(
|
|
794
|
+
when: ( (ContextKeyExpr.and(
|
|
795
|
+
CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
|
|
796
|
+
(CONTEXT_EXPRESSION_SELECTED.toNegated())
|
|
797
|
+
))),
|
|
879
798
|
primary: 20 ,
|
|
880
799
|
mac: { primary: 2048 | 1 },
|
|
881
800
|
handler: (accessor, expression) => {
|
|
@@ -901,7 +820,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
901
820
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
902
821
|
id: 'debug.removeBreakpoint',
|
|
903
822
|
weight: 200 ,
|
|
904
|
-
when: ( ContextKeyExpr.and(
|
|
823
|
+
when: ( (ContextKeyExpr.and(
|
|
824
|
+
CONTEXT_BREAKPOINTS_FOCUSED,
|
|
825
|
+
(CONTEXT_BREAKPOINT_INPUT_FOCUSED.toNegated())
|
|
826
|
+
))),
|
|
905
827
|
primary: 20 ,
|
|
906
828
|
mac: { primary: 2048 | 1 },
|
|
907
829
|
handler: (accessor) => {
|
|
@@ -943,22 +865,21 @@ registerAction2(class AddConfigurationAction extends Action2 {
|
|
|
943
865
|
constructor() {
|
|
944
866
|
super({
|
|
945
867
|
id: ADD_CONFIGURATION_ID,
|
|
946
|
-
title: ( localize2WithPath(
|
|
947
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
948
|
-
'addConfiguration',
|
|
949
|
-
"Add Configuration..."
|
|
950
|
-
)),
|
|
868
|
+
title: ( localize2WithPath(_moduleId, 29, "Add Configuration...")),
|
|
951
869
|
category: DEBUG_COMMAND_CATEGORY,
|
|
952
870
|
f1: true,
|
|
953
871
|
menu: {
|
|
954
872
|
id: MenuId.EditorContent,
|
|
955
|
-
when: ( ContextKeyExpr.and(
|
|
873
|
+
when: ( (ContextKeyExpr.and(
|
|
874
|
+
(ContextKeyExpr.regex(ResourceContextKey.Path.key, /\.vscode[/\\]launch\.json$/)),
|
|
875
|
+
(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID))
|
|
876
|
+
)))
|
|
956
877
|
}
|
|
957
878
|
});
|
|
958
879
|
}
|
|
959
880
|
async run(accessor, launchUri) {
|
|
960
881
|
const manager = accessor.get(IDebugService).getConfigurationManager();
|
|
961
|
-
const launch = manager.getLaunches().find(l => ( l.uri.toString()) === launchUri) || manager.selectedConfiguration.launch;
|
|
882
|
+
const launch = manager.getLaunches().find(l => ( (l.uri.toString())) === launchUri) || manager.selectedConfiguration.launch;
|
|
962
883
|
if (launch) {
|
|
963
884
|
const { editor, created } = await launch.openConfigFile({ preserveFocus: false });
|
|
964
885
|
if (editor && !created) {
|
|
@@ -978,10 +899,10 @@ const inlineBreakpointHandler = (accessor) => {
|
|
|
978
899
|
const position = control.getPosition();
|
|
979
900
|
if (position && control.hasModel() && debugService.canSetBreakpointsIn(control.getModel())) {
|
|
980
901
|
const modelUri = control.getModel().uri;
|
|
981
|
-
const breakpointAlreadySet = ( debugService.getModel().getBreakpoints({ lineNumber: position.lineNumber, uri: modelUri })
|
|
902
|
+
const breakpointAlreadySet = ( (debugService.getModel().getBreakpoints({ lineNumber: position.lineNumber, uri: modelUri })
|
|
982
903
|
.some(
|
|
983
904
|
bp => (bp.sessionAgnosticData.column === position.column || (!bp.column && position.column <= 1))
|
|
984
|
-
));
|
|
905
|
+
)));
|
|
985
906
|
if (!breakpointAlreadySet) {
|
|
986
907
|
debugService.addBreakpoints(modelUri, [{ lineNumber: position.lineNumber, column: position.column > 1 ? position.column : undefined }]);
|
|
987
908
|
}
|
|
@@ -998,14 +919,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
998
919
|
MenuRegistry.appendMenuItem(MenuId.EditorContext, {
|
|
999
920
|
command: {
|
|
1000
921
|
id: TOGGLE_INLINE_BREAKPOINT_ID,
|
|
1001
|
-
title: ( localizeWithPath(
|
|
1002
|
-
'vs/workbench/contrib/debug/browser/debugCommands',
|
|
1003
|
-
'addInlineBreakpoint',
|
|
1004
|
-
"Add Inline Breakpoint"
|
|
1005
|
-
)),
|
|
922
|
+
title: ( localizeWithPath(_moduleId, 30, "Add Inline Breakpoint")),
|
|
1006
923
|
category: DEBUG_COMMAND_CATEGORY
|
|
1007
924
|
},
|
|
1008
|
-
when: ( ContextKeyExpr.and(
|
|
925
|
+
when: ( (ContextKeyExpr.and(
|
|
926
|
+
CONTEXT_IN_DEBUG_MODE,
|
|
927
|
+
(PanelFocusContext.toNegated()),
|
|
928
|
+
EditorContextKeys.editorTextFocus
|
|
929
|
+
))),
|
|
1009
930
|
group: 'debug',
|
|
1010
931
|
order: 1
|
|
1011
932
|
});
|
|
@@ -1030,7 +951,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
1030
951
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
1031
952
|
id: 'debug.openView',
|
|
1032
953
|
weight: 200 ,
|
|
1033
|
-
when: ( CONTEXT_DEBUGGERS_AVAILABLE.toNegated()),
|
|
954
|
+
when: ( (CONTEXT_DEBUGGERS_AVAILABLE.toNegated())),
|
|
1034
955
|
primary: 63 ,
|
|
1035
956
|
secondary: [2048 | 63 ],
|
|
1036
957
|
handler: async (accessor) => {
|