Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Taking the top most available stack frame for exception widget. Resolves #27903

Browse Source
This commit is contained in:
Michel Kaporin
2017-06-13 14:55:38 +02:00
parent 91a0e04417
commit 3a192e94d8
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
View File

@@ -356,19 +356,25 @@ export class DebugEditorContribution implements IDebugEditorContribution {
// Toggles exception widget based on the state of the current editor model and debug stack frame
const model = this.editor.getModel();
const focusedSf = this.debugService.getViewModel().focusedStackFrame;
if (!model || !focusedSf || !focusedSf.source || !focusedSf.source.available) {
const callStack = focusedSf ? focusedSf.thread.getCallStack() : null;
if (!model || !focusedSf || !callStack || callStack.length === 0) {
this.closeExceptionWidget();
return;
}
const callStack = focusedSf.thread.getCallStack();
if (!callStack || callStack.length === 0) {
// First call stack frame that is available is the frame where exception has been thrown
let exceptionSf;
for (let sf of callStack) {
if (sf.source && sf.source.available) {
exceptionSf = sf;
break;
}
}
if (!exceptionSf) {
this.closeExceptionWidget();
return;
}
// First call stack frame is the frame where exception has been thrown
const exceptionSf = callStack[0];
const sameUri = exceptionSf.source.uri.toString() === model.uri.toString();
if (this.exceptionWidget && !sameUri) {
this.closeExceptionWidget();