@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
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-debug-service-override",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.2",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@4.5.
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -20,7 +20,7 @@ class ExtensionHostDebugBroadcastChannel {
|
|
|
20
20
|
case 'attach':
|
|
21
21
|
return Promise.resolve(this._onAttachEmitter.fire({ sessionId: arg[0], port: arg[1], subId: arg[2] }));
|
|
22
22
|
}
|
|
23
|
-
throw new Error('Method not implemented.');
|
|
23
|
+
throw ( new Error('Method not implemented.'));
|
|
24
24
|
}
|
|
25
25
|
listen(ctx, event, arg) {
|
|
26
26
|
switch (event) {
|
|
@@ -33,7 +33,7 @@ class ExtensionHostDebugBroadcastChannel {
|
|
|
33
33
|
case 'attach':
|
|
34
34
|
return this._onAttachEmitter.event;
|
|
35
35
|
}
|
|
36
|
-
throw new Error('Method not implemented.');
|
|
36
|
+
throw ( new Error('Method not implemented.'));
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
class ExtensionHostDebugChannelClient extends Disposable {
|
|
@@ -52,6 +52,7 @@ import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatab
|
|
|
52
52
|
import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
|
53
53
|
|
|
54
54
|
var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1;
|
|
55
|
+
const _moduleId = "vs/workbench/contrib/debug/browser/callStackView";
|
|
55
56
|
const $ = $$1;
|
|
56
57
|
function assignSessionContext(element, context) {
|
|
57
58
|
context.sessionId = element.getId();
|
|
@@ -88,7 +89,9 @@ function getContextForContributedActions(element) {
|
|
|
88
89
|
if (element.source.inMemory) {
|
|
89
90
|
return element.source.raw.path || element.source.reference || element.source.name;
|
|
90
91
|
}
|
|
91
|
-
return (
|
|
92
|
+
return (
|
|
93
|
+
(element.source.uri.toString())
|
|
94
|
+
);
|
|
92
95
|
}
|
|
93
96
|
if (element instanceof Thread) {
|
|
94
97
|
return element.threadId;
|
|
@@ -101,7 +104,7 @@ function getContextForContributedActions(element) {
|
|
|
101
104
|
function getSpecificSourceName(stackFrame) {
|
|
102
105
|
let callStack = stackFrame.thread.getStaleCallStack();
|
|
103
106
|
callStack = callStack.length > 0 ? callStack : stackFrame.thread.getCallStack();
|
|
104
|
-
const otherSources = ( callStack.map(sf => sf.source)).filter(s => s !== stackFrame.source);
|
|
107
|
+
const otherSources = ( (callStack.map(sf => sf.source))).filter(s => s !== stackFrame.source);
|
|
105
108
|
let suffixLength = 0;
|
|
106
109
|
otherSources.forEach(s => {
|
|
107
110
|
if (s.name === stackFrame.source.name) {
|
|
@@ -129,9 +132,9 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
129
132
|
this.needsRefresh = false;
|
|
130
133
|
this.ignoreSelectionChangedEvent = false;
|
|
131
134
|
this.ignoreFocusStackFrameEvent = false;
|
|
132
|
-
this.autoExpandedSessions = ( new Set());
|
|
135
|
+
this.autoExpandedSessions = ( (new Set()));
|
|
133
136
|
this.selectionNeedsUpdate = false;
|
|
134
|
-
this.onCallStackChangeScheduler = this._register(( new RunOnceScheduler(async () => {
|
|
137
|
+
this.onCallStackChangeScheduler = this._register(( (new RunOnceScheduler(async () => {
|
|
135
138
|
const sessions = this.debugService.getModel().getSessions();
|
|
136
139
|
if (sessions.length === 0) {
|
|
137
140
|
this.autoExpandedSessions.clear();
|
|
@@ -145,11 +148,7 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
145
148
|
this.stateMessage.hidden = false;
|
|
146
149
|
}
|
|
147
150
|
else if (sessions.length === 1 && sessions[0].state === 3 ) {
|
|
148
|
-
this.stateMessageLabel.textContent = ( localizeWithPath(
|
|
149
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
150
|
-
{ key: 'running', comment: ['indicates state'] },
|
|
151
|
-
"Running"
|
|
152
|
-
));
|
|
151
|
+
this.stateMessageLabel.textContent = ( localizeWithPath(_moduleId, 0, "Running"));
|
|
153
152
|
this.stateMessageLabelHover.update(sessions[0].getLabel());
|
|
154
153
|
this.stateMessageLabel.classList.remove('exception');
|
|
155
154
|
this.stateMessage.hidden = false;
|
|
@@ -162,9 +161,9 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
162
161
|
this.dataSource.deemphasizedStackFramesToShow = [];
|
|
163
162
|
await this.tree.updateChildren();
|
|
164
163
|
try {
|
|
165
|
-
const toExpand = ( new Set());
|
|
164
|
+
const toExpand = ( (new Set()));
|
|
166
165
|
sessions.forEach(s => {
|
|
167
|
-
if (s.parentSession && !( this.autoExpandedSessions.has(s.parentSession))) {
|
|
166
|
+
if (s.parentSession && !( (this.autoExpandedSessions.has(s.parentSession)))) {
|
|
168
167
|
toExpand.add(s.parentSession);
|
|
169
168
|
}
|
|
170
169
|
});
|
|
@@ -179,7 +178,7 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
179
178
|
this.selectionNeedsUpdate = false;
|
|
180
179
|
await this.updateTreeSelection();
|
|
181
180
|
}
|
|
182
|
-
}, 50)));
|
|
181
|
+
}, 50))));
|
|
183
182
|
}
|
|
184
183
|
renderHeaderTitle(container) {
|
|
185
184
|
super.renderHeaderTitle(container, this.options.title);
|
|
@@ -193,16 +192,16 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
193
192
|
this.element.classList.add('debug-pane');
|
|
194
193
|
container.classList.add('debug-call-stack');
|
|
195
194
|
const treeContainer = renderViewTree(container);
|
|
196
|
-
this.dataSource = ( new CallStackDataSource(this.debugService));
|
|
197
|
-
this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'CallStackView', treeContainer, ( new CallStackDelegate()), ( new CallStackCompressionDelegate(this.debugService)), [
|
|
195
|
+
this.dataSource = ( (new CallStackDataSource(this.debugService)));
|
|
196
|
+
this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'CallStackView', treeContainer, ( (new CallStackDelegate())), ( (new CallStackCompressionDelegate(this.debugService))), [
|
|
198
197
|
this.instantiationService.createInstance(SessionsRenderer),
|
|
199
198
|
this.instantiationService.createInstance(ThreadsRenderer),
|
|
200
199
|
this.instantiationService.createInstance(StackFramesRenderer),
|
|
201
|
-
( new ErrorsRenderer()),
|
|
202
|
-
( new LoadMoreRenderer()),
|
|
203
|
-
( new ShowMoreRenderer())
|
|
200
|
+
( (new ErrorsRenderer())),
|
|
201
|
+
( (new LoadMoreRenderer())),
|
|
202
|
+
( (new ShowMoreRenderer()))
|
|
204
203
|
], this.dataSource, {
|
|
205
|
-
accessibilityProvider: ( new CallStackAccessibilityProvider()),
|
|
204
|
+
accessibilityProvider: ( (new CallStackAccessibilityProvider())),
|
|
206
205
|
compressionEnabled: true,
|
|
207
206
|
autoExpandSingleChildren: true,
|
|
208
207
|
identityProvider: {
|
|
@@ -230,11 +229,7 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
230
229
|
if (e instanceof ThreadAndSessionIds) {
|
|
231
230
|
return LoadMoreRenderer.LABEL;
|
|
232
231
|
}
|
|
233
|
-
return ( localizeWithPath(
|
|
234
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
235
|
-
'showMoreStackFrames2',
|
|
236
|
-
"Show More Stack Frames"
|
|
237
|
-
));
|
|
232
|
+
return ( localizeWithPath(_moduleId, 1, "Show More Stack Frames"));
|
|
238
233
|
},
|
|
239
234
|
getCompressedNodeKeyboardNavigationLabel: (e) => {
|
|
240
235
|
const firstItem = e[0];
|
|
@@ -424,19 +419,19 @@ let CallStackView = class CallStackView extends ViewPane {
|
|
|
424
419
|
});
|
|
425
420
|
}
|
|
426
421
|
};
|
|
427
|
-
CallStackView = ( __decorate([
|
|
428
|
-
( __param(1, IContextMenuService)),
|
|
429
|
-
( __param(2, IDebugService)),
|
|
430
|
-
( __param(3, IKeybindingService)),
|
|
431
|
-
( __param(4, IInstantiationService)),
|
|
432
|
-
( __param(5, IViewDescriptorService)),
|
|
433
|
-
( __param(6, IConfigurationService)),
|
|
434
|
-
( __param(7, IContextKeyService)),
|
|
435
|
-
( __param(8, IOpenerService)),
|
|
436
|
-
( __param(9, IThemeService)),
|
|
437
|
-
( __param(10, ITelemetryService)),
|
|
438
|
-
( __param(11, IMenuService))
|
|
439
|
-
], CallStackView));
|
|
422
|
+
CallStackView = ( (__decorate([
|
|
423
|
+
( (__param(1, IContextMenuService))),
|
|
424
|
+
( (__param(2, IDebugService))),
|
|
425
|
+
( (__param(3, IKeybindingService))),
|
|
426
|
+
( (__param(4, IInstantiationService))),
|
|
427
|
+
( (__param(5, IViewDescriptorService))),
|
|
428
|
+
( (__param(6, IConfigurationService))),
|
|
429
|
+
( (__param(7, IContextKeyService))),
|
|
430
|
+
( (__param(8, IOpenerService))),
|
|
431
|
+
( (__param(9, IThemeService))),
|
|
432
|
+
( (__param(10, ITelemetryService))),
|
|
433
|
+
( (__param(11, IMenuService)))
|
|
434
|
+
], CallStackView)));
|
|
440
435
|
function getSessionContextOverlay(session) {
|
|
441
436
|
return [
|
|
442
437
|
[CONTEXT_CALLSTACK_ITEM_TYPE.key, 'session'],
|
|
@@ -461,10 +456,10 @@ let SessionsRenderer = class SessionsRenderer {
|
|
|
461
456
|
append(session, $(ThemeIcon.asCSSSelector(callstackViewSession)));
|
|
462
457
|
const name = append(session, $('.name'));
|
|
463
458
|
const stateLabel = append(session, $('span.state.label.monaco-count-badge.long'));
|
|
464
|
-
const templateDisposable = ( new DisposableStore());
|
|
465
|
-
const label = templateDisposable.add(( new HighlightedLabel(name)));
|
|
466
|
-
const stopActionViewItemDisposables = templateDisposable.add(( new DisposableStore()));
|
|
467
|
-
const actionBar = templateDisposable.add(( new ActionBar(session, {
|
|
459
|
+
const templateDisposable = ( (new DisposableStore()));
|
|
460
|
+
const label = templateDisposable.add(( (new HighlightedLabel(name))));
|
|
461
|
+
const stopActionViewItemDisposables = templateDisposable.add(( (new DisposableStore())));
|
|
462
|
+
const actionBar = templateDisposable.add(( (new ActionBar(session, {
|
|
468
463
|
actionViewItemProvider: (action, options) => {
|
|
469
464
|
if ((action.id === STOP_ID || action.id === DISCONNECT_ID) && action instanceof MenuItemAction) {
|
|
470
465
|
stopActionViewItemDisposables.clear();
|
|
@@ -481,8 +476,8 @@ let SessionsRenderer = class SessionsRenderer {
|
|
|
481
476
|
}
|
|
482
477
|
return undefined;
|
|
483
478
|
}
|
|
484
|
-
})));
|
|
485
|
-
const elementDisposable = templateDisposable.add(( new DisposableStore()));
|
|
479
|
+
}))));
|
|
480
|
+
const elementDisposable = templateDisposable.add(( (new DisposableStore())));
|
|
486
481
|
return { session, name, stateLabel, label, actionBar, elementDisposable, templateDisposable };
|
|
487
482
|
}
|
|
488
483
|
renderElement(element, _, data) {
|
|
@@ -494,11 +489,7 @@ let SessionsRenderer = class SessionsRenderer {
|
|
|
494
489
|
this.doRenderElement(lastElement, matches, templateData);
|
|
495
490
|
}
|
|
496
491
|
doRenderElement(session, matches, data) {
|
|
497
|
-
const sessionHover = data.elementDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(
|
|
498
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
499
|
-
{ key: 'session', comment: ['Session is a noun'] },
|
|
500
|
-
"Session"
|
|
501
|
-
))));
|
|
492
|
+
const sessionHover = data.elementDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(_moduleId, 2, "Session"))));
|
|
502
493
|
data.label.set(session.getLabel(), matches);
|
|
503
494
|
const stoppedDetails = session.getStoppedDetails();
|
|
504
495
|
const thread = session.getAllThreads().find(t => t.stopped);
|
|
@@ -527,11 +518,7 @@ let SessionsRenderer = class SessionsRenderer {
|
|
|
527
518
|
data.stateLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
|
|
528
519
|
}
|
|
529
520
|
else {
|
|
530
|
-
data.stateLabel.textContent = ( localizeWithPath(
|
|
531
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
532
|
-
{ key: 'running', comment: ['indicates state'] },
|
|
533
|
-
"Running"
|
|
534
|
-
));
|
|
521
|
+
data.stateLabel.textContent = ( localizeWithPath(_moduleId, 0, "Running"));
|
|
535
522
|
data.stateLabel.classList.remove('exception');
|
|
536
523
|
}
|
|
537
524
|
}
|
|
@@ -545,11 +532,11 @@ let SessionsRenderer = class SessionsRenderer {
|
|
|
545
532
|
templateData.elementDisposable.clear();
|
|
546
533
|
}
|
|
547
534
|
};
|
|
548
|
-
SessionsRenderer = SessionsRenderer_1 = ( __decorate([
|
|
549
|
-
( __param(0, IInstantiationService)),
|
|
550
|
-
( __param(1, IContextKeyService)),
|
|
551
|
-
( __param(2, IMenuService))
|
|
552
|
-
], SessionsRenderer));
|
|
535
|
+
SessionsRenderer = SessionsRenderer_1 = ( (__decorate([
|
|
536
|
+
( (__param(0, IInstantiationService))),
|
|
537
|
+
( (__param(1, IContextKeyService))),
|
|
538
|
+
( (__param(2, IMenuService)))
|
|
539
|
+
], SessionsRenderer)));
|
|
553
540
|
function getThreadContextOverlay(thread) {
|
|
554
541
|
return [
|
|
555
542
|
[CONTEXT_CALLSTACK_ITEM_TYPE.key, 'thread'],
|
|
@@ -570,10 +557,10 @@ let ThreadsRenderer = class ThreadsRenderer {
|
|
|
570
557
|
const thread = append(container, $('.thread'));
|
|
571
558
|
const name = append(thread, $('.name'));
|
|
572
559
|
const stateLabel = append(thread, $('span.state.label.monaco-count-badge.long'));
|
|
573
|
-
const templateDisposable = ( new DisposableStore());
|
|
574
|
-
const label = templateDisposable.add(( new HighlightedLabel(name)));
|
|
575
|
-
const actionBar = templateDisposable.add(( new ActionBar(thread)));
|
|
576
|
-
const elementDisposable = templateDisposable.add(( new DisposableStore()));
|
|
560
|
+
const templateDisposable = ( (new DisposableStore()));
|
|
561
|
+
const label = templateDisposable.add(( (new HighlightedLabel(name))));
|
|
562
|
+
const actionBar = templateDisposable.add(( (new ActionBar(thread))));
|
|
563
|
+
const elementDisposable = templateDisposable.add(( (new DisposableStore())));
|
|
577
564
|
return { thread, name, stateLabel, label, actionBar, elementDisposable, templateDisposable };
|
|
578
565
|
}
|
|
579
566
|
renderElement(element, _index, data) {
|
|
@@ -597,7 +584,7 @@ let ThreadsRenderer = class ThreadsRenderer {
|
|
|
597
584
|
setupActionBar();
|
|
598
585
|
}
|
|
599
586
|
renderCompressedElements(_node, _index, _templateData, _height) {
|
|
600
|
-
throw new Error('Method not implemented.');
|
|
587
|
+
throw ( (new Error('Method not implemented.')));
|
|
601
588
|
}
|
|
602
589
|
disposeElement(_element, _index, templateData) {
|
|
603
590
|
templateData.elementDisposable.clear();
|
|
@@ -606,10 +593,10 @@ let ThreadsRenderer = class ThreadsRenderer {
|
|
|
606
593
|
templateData.templateDisposable.dispose();
|
|
607
594
|
}
|
|
608
595
|
};
|
|
609
|
-
ThreadsRenderer = ThreadsRenderer_1 = ( __decorate([
|
|
610
|
-
( __param(0, IContextKeyService)),
|
|
611
|
-
( __param(1, IMenuService))
|
|
612
|
-
], ThreadsRenderer));
|
|
596
|
+
ThreadsRenderer = ThreadsRenderer_1 = ( (__decorate([
|
|
597
|
+
( (__param(0, IContextKeyService))),
|
|
598
|
+
( (__param(1, IMenuService)))
|
|
599
|
+
], ThreadsRenderer)));
|
|
613
600
|
function getStackFrameContextOverlay(stackFrame) {
|
|
614
601
|
return [
|
|
615
602
|
[CONTEXT_CALLSTACK_ITEM_TYPE.key, 'stackFrame'],
|
|
@@ -633,9 +620,9 @@ let StackFramesRenderer = class StackFramesRenderer {
|
|
|
633
620
|
const fileName = append(file, $('span.file-name'));
|
|
634
621
|
const wrapper = append(file, $('span.line-number-wrapper'));
|
|
635
622
|
const lineNumber = append(wrapper, $('span.line-number.monaco-count-badge'));
|
|
636
|
-
const templateDisposable = ( new DisposableStore());
|
|
637
|
-
const label = templateDisposable.add(( new HighlightedLabel(labelDiv)));
|
|
638
|
-
const actionBar = templateDisposable.add(( new ActionBar(stackFrame)));
|
|
623
|
+
const templateDisposable = ( (new DisposableStore()));
|
|
624
|
+
const label = templateDisposable.add(( (new HighlightedLabel(labelDiv))));
|
|
625
|
+
const actionBar = templateDisposable.add(( (new ActionBar(stackFrame))));
|
|
639
626
|
return { file, fileName, label, lineNumber, stackFrame, actionBar, templateDisposable };
|
|
640
627
|
}
|
|
641
628
|
renderElement(element, index, data) {
|
|
@@ -664,32 +651,28 @@ let StackFramesRenderer = class StackFramesRenderer {
|
|
|
664
651
|
}
|
|
665
652
|
data.actionBar.clear();
|
|
666
653
|
if (hasActions) {
|
|
667
|
-
const action = ( new Action('debug.callStack.restartFrame', ( localizeWithPath(
|
|
668
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
669
|
-
'restartFrame',
|
|
670
|
-
"Restart Frame"
|
|
671
|
-
)), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
|
|
654
|
+
const action = ( (new Action('debug.callStack.restartFrame', ( localizeWithPath(_moduleId, 3, "Restart Frame")), ThemeIcon.asClassName(debugRestartFrame), true, async () => {
|
|
672
655
|
try {
|
|
673
656
|
await stackFrame.restart();
|
|
674
657
|
}
|
|
675
658
|
catch (e) {
|
|
676
659
|
this.notificationService.error(e);
|
|
677
660
|
}
|
|
678
|
-
}));
|
|
661
|
+
})));
|
|
679
662
|
data.actionBar.push(action, { icon: true, label: false });
|
|
680
663
|
}
|
|
681
664
|
}
|
|
682
665
|
renderCompressedElements(node, index, templateData, height) {
|
|
683
|
-
throw new Error('Method not implemented.');
|
|
666
|
+
throw ( (new Error('Method not implemented.')));
|
|
684
667
|
}
|
|
685
668
|
disposeTemplate(templateData) {
|
|
686
669
|
templateData.actionBar.dispose();
|
|
687
670
|
}
|
|
688
671
|
};
|
|
689
|
-
StackFramesRenderer = StackFramesRenderer_1 = ( __decorate([
|
|
690
|
-
( __param(0, ILabelService)),
|
|
691
|
-
( __param(1, INotificationService))
|
|
692
|
-
], StackFramesRenderer));
|
|
672
|
+
StackFramesRenderer = StackFramesRenderer_1 = ( (__decorate([
|
|
673
|
+
( (__param(0, ILabelService))),
|
|
674
|
+
( (__param(1, INotificationService)))
|
|
675
|
+
], StackFramesRenderer)));
|
|
693
676
|
class ErrorsRenderer {
|
|
694
677
|
static { this.ID = 'error'; }
|
|
695
678
|
get templateId() {
|
|
@@ -697,7 +680,7 @@ class ErrorsRenderer {
|
|
|
697
680
|
}
|
|
698
681
|
renderTemplate(container) {
|
|
699
682
|
const label = append(container, $('.error'));
|
|
700
|
-
return { label, templateDisposable: ( new DisposableStore()) };
|
|
683
|
+
return { label, templateDisposable: ( (new DisposableStore())) };
|
|
701
684
|
}
|
|
702
685
|
renderElement(element, index, data) {
|
|
703
686
|
const error = element.element;
|
|
@@ -705,18 +688,14 @@ class ErrorsRenderer {
|
|
|
705
688
|
data.templateDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.label, error));
|
|
706
689
|
}
|
|
707
690
|
renderCompressedElements(node, index, templateData, height) {
|
|
708
|
-
throw new Error('Method not implemented.');
|
|
691
|
+
throw ( (new Error('Method not implemented.')));
|
|
709
692
|
}
|
|
710
693
|
disposeTemplate(templateData) {
|
|
711
694
|
}
|
|
712
695
|
}
|
|
713
696
|
class LoadMoreRenderer {
|
|
714
697
|
static { this.ID = 'loadMore'; }
|
|
715
|
-
static { this.LABEL = ( localizeWithPath(
|
|
716
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
717
|
-
'loadAllStackFrames',
|
|
718
|
-
"Load More Stack Frames"
|
|
719
|
-
)); }
|
|
698
|
+
static { this.LABEL = ( localizeWithPath(_moduleId, 4, "Load More Stack Frames")); }
|
|
720
699
|
constructor() { }
|
|
721
700
|
get templateId() {
|
|
722
701
|
return LoadMoreRenderer.ID;
|
|
@@ -730,7 +709,7 @@ class LoadMoreRenderer {
|
|
|
730
709
|
data.label.textContent = LoadMoreRenderer.LABEL;
|
|
731
710
|
}
|
|
732
711
|
renderCompressedElements(node, index, templateData, height) {
|
|
733
|
-
throw new Error('Method not implemented.');
|
|
712
|
+
throw ( (new Error('Method not implemented.')));
|
|
734
713
|
}
|
|
735
714
|
disposeTemplate(templateData) {
|
|
736
715
|
}
|
|
@@ -750,24 +729,19 @@ class ShowMoreRenderer {
|
|
|
750
729
|
const stackFrames = element.element;
|
|
751
730
|
if (stackFrames.every(sf => !!(sf.source && sf.source.origin && sf.source.origin === stackFrames[0].source.origin))) {
|
|
752
731
|
data.label.textContent = ( localizeWithPath(
|
|
753
|
-
|
|
754
|
-
|
|
732
|
+
_moduleId,
|
|
733
|
+
5,
|
|
755
734
|
"Show {0} More: {1}",
|
|
756
735
|
stackFrames.length,
|
|
757
736
|
stackFrames[0].source.origin
|
|
758
737
|
));
|
|
759
738
|
}
|
|
760
739
|
else {
|
|
761
|
-
data.label.textContent = ( localizeWithPath(
|
|
762
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
763
|
-
'showMoreStackFrames',
|
|
764
|
-
"Show {0} More Stack Frames",
|
|
765
|
-
stackFrames.length
|
|
766
|
-
));
|
|
740
|
+
data.label.textContent = ( localizeWithPath(_moduleId, 6, "Show {0} More Stack Frames", stackFrames.length));
|
|
767
741
|
}
|
|
768
742
|
}
|
|
769
743
|
renderCompressedElements(node, index, templateData, height) {
|
|
770
|
-
throw new Error('Method not implemented.');
|
|
744
|
+
throw ( (new Error('Method not implemented.')));
|
|
771
745
|
}
|
|
772
746
|
disposeTemplate(templateData) {
|
|
773
747
|
}
|
|
@@ -806,12 +780,7 @@ function stoppedText(stoppedDetails) {
|
|
|
806
780
|
}
|
|
807
781
|
function stoppedDescription(stoppedDetails) {
|
|
808
782
|
return stoppedDetails.description ||
|
|
809
|
-
(stoppedDetails.reason ? ( localizeWithPath(
|
|
810
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
811
|
-
{ key: 'pausedOn', comment: ['indicates reason for program being paused'] },
|
|
812
|
-
"Paused on {0}",
|
|
813
|
-
stoppedDetails.reason
|
|
814
|
-
)) : ( localizeWithPath('vs/workbench/contrib/debug/browser/callStackView', 'paused', "Paused")));
|
|
783
|
+
(stoppedDetails.reason ? ( localizeWithPath(_moduleId, 7, "Paused on {0}", stoppedDetails.reason)) : ( localizeWithPath(_moduleId, 8, "Paused")));
|
|
815
784
|
}
|
|
816
785
|
function isDebugModel(obj) {
|
|
817
786
|
return typeof obj.getSessions === 'function';
|
|
@@ -897,18 +866,14 @@ class CallStackDataSource {
|
|
|
897
866
|
callStack = callStack.concat([thread.stoppedDetails.framesErrorMessage]);
|
|
898
867
|
}
|
|
899
868
|
if (!thread.reachedEndOfCallStack && thread.stoppedDetails) {
|
|
900
|
-
callStack = callStack.concat([( new ThreadAndSessionIds(thread.session.getId(), thread.threadId))]);
|
|
869
|
+
callStack = callStack.concat([( (new ThreadAndSessionIds(thread.session.getId(), thread.threadId)))]);
|
|
901
870
|
}
|
|
902
871
|
return callStack;
|
|
903
872
|
}
|
|
904
873
|
}
|
|
905
874
|
class CallStackAccessibilityProvider {
|
|
906
875
|
getWidgetAriaLabel() {
|
|
907
|
-
return ( localizeWithPath(
|
|
908
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
909
|
-
{ comment: ['Debug is a noun in this context, not a verb.'], key: 'callStackAriaLabel' },
|
|
910
|
-
"Debug Call Stack"
|
|
911
|
-
));
|
|
876
|
+
return ( localizeWithPath(_moduleId, 9, "Debug Call Stack"));
|
|
912
877
|
}
|
|
913
878
|
getWidgetRole() {
|
|
914
879
|
return 'treegrid';
|
|
@@ -918,18 +883,12 @@ class CallStackAccessibilityProvider {
|
|
|
918
883
|
}
|
|
919
884
|
getAriaLabel(element) {
|
|
920
885
|
if (element instanceof Thread) {
|
|
921
|
-
return ( localizeWithPath(
|
|
922
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
923
|
-
{ key: 'threadAriaLabel', comment: ['Placeholders stand for the thread name and the thread state.For example "Thread 1" and "Stopped'] },
|
|
924
|
-
"Thread {0} {1}",
|
|
925
|
-
element.name,
|
|
926
|
-
element.stateLabel
|
|
927
|
-
));
|
|
886
|
+
return ( localizeWithPath(_moduleId, 10, "Thread {0} {1}", element.name, element.stateLabel));
|
|
928
887
|
}
|
|
929
888
|
if (element instanceof StackFrame) {
|
|
930
889
|
return ( localizeWithPath(
|
|
931
|
-
|
|
932
|
-
|
|
890
|
+
_moduleId,
|
|
891
|
+
11,
|
|
933
892
|
"Stack Frame {0}, line {1}, {2}",
|
|
934
893
|
element.name,
|
|
935
894
|
element.range.startLineNumber,
|
|
@@ -938,29 +897,14 @@ class CallStackAccessibilityProvider {
|
|
|
938
897
|
}
|
|
939
898
|
if (isDebugSession(element)) {
|
|
940
899
|
const thread = element.getAllThreads().find(t => t.stopped);
|
|
941
|
-
const state = thread ? thread.stateLabel : ( localizeWithPath(
|
|
942
|
-
|
|
943
|
-
{ key: 'running', comment: ['indicates state'] },
|
|
944
|
-
"Running"
|
|
945
|
-
));
|
|
946
|
-
return ( localizeWithPath(
|
|
947
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
948
|
-
{ key: 'sessionLabel', comment: ['Placeholders stand for the session name and the session state. For example "Launch Program" and "Running"'] },
|
|
949
|
-
"Session {0} {1}",
|
|
950
|
-
element.getLabel(),
|
|
951
|
-
state
|
|
952
|
-
));
|
|
900
|
+
const state = thread ? thread.stateLabel : ( localizeWithPath(_moduleId, 0, "Running"));
|
|
901
|
+
return ( localizeWithPath(_moduleId, 12, "Session {0} {1}", element.getLabel(), state));
|
|
953
902
|
}
|
|
954
903
|
if (typeof element === 'string') {
|
|
955
904
|
return element;
|
|
956
905
|
}
|
|
957
906
|
if (element instanceof Array) {
|
|
958
|
-
return ( localizeWithPath(
|
|
959
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
960
|
-
'showMoreStackFrames',
|
|
961
|
-
"Show {0} More Stack Frames",
|
|
962
|
-
element.length
|
|
963
|
-
));
|
|
907
|
+
return ( localizeWithPath(_moduleId, 6, "Show {0} More Stack Frames", element.length));
|
|
964
908
|
}
|
|
965
909
|
return LoadMoreRenderer.LABEL;
|
|
966
910
|
}
|
|
@@ -975,7 +919,7 @@ class CallStackCompressionDelegate {
|
|
|
975
919
|
return false;
|
|
976
920
|
}
|
|
977
921
|
const sessions = this.debugService.getModel().getSessions();
|
|
978
|
-
if (( sessions.some(s => s.parentSession === stat && s.compact))) {
|
|
922
|
+
if (( (sessions.some(s => s.parentSession === stat && s.compact)))) {
|
|
979
923
|
return false;
|
|
980
924
|
}
|
|
981
925
|
return true;
|
|
@@ -988,19 +932,15 @@ registerAction2(class Collapse extends ViewAction {
|
|
|
988
932
|
super({
|
|
989
933
|
id: 'callStack.collapse',
|
|
990
934
|
viewId: CALLSTACK_VIEW_ID,
|
|
991
|
-
title: ( localizeWithPath(
|
|
992
|
-
'vs/workbench/contrib/debug/browser/callStackView',
|
|
993
|
-
'collapse',
|
|
994
|
-
"Collapse All"
|
|
995
|
-
)),
|
|
935
|
+
title: ( localizeWithPath(_moduleId, 13, "Collapse All")),
|
|
996
936
|
f1: false,
|
|
997
937
|
icon: Codicon.collapseAll,
|
|
998
|
-
precondition: ( CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(2 ))),
|
|
938
|
+
precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(2 )))),
|
|
999
939
|
menu: {
|
|
1000
940
|
id: MenuId.ViewTitle,
|
|
1001
941
|
order: 10,
|
|
1002
942
|
group: 'navigation',
|
|
1003
|
-
when: ( ContextKeyExpr.equals('view', CALLSTACK_VIEW_ID))
|
|
943
|
+
when: ( (ContextKeyExpr.equals('view', CALLSTACK_VIEW_ID)))
|
|
1004
944
|
}
|
|
1005
945
|
});
|
|
1006
946
|
}
|
|
@@ -1016,14 +956,29 @@ function registerCallStackInlineMenuItem(id, title, icon, when, order, precondit
|
|
|
1016
956
|
command: { id, title, icon, precondition }
|
|
1017
957
|
});
|
|
1018
958
|
}
|
|
1019
|
-
const threadOrSessionWithOneThread = ( ContextKeyExpr.or(
|
|
1020
|
-
|
|
1021
|
-
|
|
959
|
+
const threadOrSessionWithOneThread = ( (ContextKeyExpr.or(
|
|
960
|
+
(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('thread')),
|
|
961
|
+
(ContextKeyExpr.and(
|
|
962
|
+
(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')),
|
|
963
|
+
CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD
|
|
964
|
+
))
|
|
965
|
+
)));
|
|
966
|
+
registerCallStackInlineMenuItem(PAUSE_ID, PAUSE_LABEL, debugPause, ( (ContextKeyExpr.and(
|
|
967
|
+
threadOrSessionWithOneThread,
|
|
968
|
+
(CONTEXT_CALLSTACK_ITEM_STOPPED.toNegated())
|
|
969
|
+
))), 10, ( (CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated())));
|
|
970
|
+
registerCallStackInlineMenuItem(CONTINUE_ID, CONTINUE_LABEL, debugContinue, ( (ContextKeyExpr.and(threadOrSessionWithOneThread, CONTEXT_CALLSTACK_ITEM_STOPPED))), 10);
|
|
1022
971
|
registerCallStackInlineMenuItem(STEP_OVER_ID, STEP_OVER_LABEL, debugStepOver, threadOrSessionWithOneThread, 20, CONTEXT_CALLSTACK_ITEM_STOPPED);
|
|
1023
972
|
registerCallStackInlineMenuItem(STEP_INTO_ID, STEP_INTO_LABEL, debugStepInto, threadOrSessionWithOneThread, 30, CONTEXT_CALLSTACK_ITEM_STOPPED);
|
|
1024
973
|
registerCallStackInlineMenuItem(STEP_OUT_ID, STEP_OUT_LABEL, debugStepOut, threadOrSessionWithOneThread, 40, CONTEXT_CALLSTACK_ITEM_STOPPED);
|
|
1025
|
-
registerCallStackInlineMenuItem(RESTART_SESSION_ID, RESTART_LABEL, debugRestart, ( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session')), 50);
|
|
1026
|
-
registerCallStackInlineMenuItem(STOP_ID, STOP_LABEL, debugStop, ( ContextKeyExpr.and(
|
|
1027
|
-
|
|
974
|
+
registerCallStackInlineMenuItem(RESTART_SESSION_ID, RESTART_LABEL, debugRestart, ( (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))), 50);
|
|
975
|
+
registerCallStackInlineMenuItem(STOP_ID, STOP_LABEL, debugStop, ( (ContextKeyExpr.and(
|
|
976
|
+
(CONTEXT_CALLSTACK_SESSION_IS_ATTACH.toNegated()),
|
|
977
|
+
(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))
|
|
978
|
+
))), 60);
|
|
979
|
+
registerCallStackInlineMenuItem(DISCONNECT_ID, DISCONNECT_LABEL, debugDisconnect, ( (ContextKeyExpr.and(
|
|
980
|
+
CONTEXT_CALLSTACK_SESSION_IS_ATTACH,
|
|
981
|
+
(CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('session'))
|
|
982
|
+
))), 60);
|
|
1028
983
|
|
|
1029
984
|
export { CallStackView, getContext, getContextForContributedActions, getSpecificSourceName };
|