debug: Breaking should jump to top frame that has source

isidorn · isidorn · commit b995df24fa0c · 2018-12-27T16:10:08.000+01:00
fixes microsoft#64193
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
@@ -393,7 +393,7 @@ export interface IDebugModel extends ITreeElement {
 	getWatchExpressions(): ReadonlyArray<IExpression & IEvaluate>;
 
 	onDidChangeBreakpoints: Event<IBreakpointsChangeEvent>;
-	onDidChangeCallStack: Event<void>;
+	onDidChangeCallStack: Event<IThread | undefined>;
 	onDidChangeWatchExpressions: Event<IExpression>;
 }
 
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -737,7 +737,7 @@ export class DebugModel implements IDebugModel {
 	private schedulers = new Map<string, RunOnceScheduler>();
 	private breakpointsSessionId: string;
 	private readonly _onDidChangeBreakpoints: Emitter<IBreakpointsChangeEvent>;
-	private readonly _onDidChangeCallStack: Emitter<void>;
+	private readonly _onDidChangeCallStack: Emitter<IThread | undefined>;
 	private readonly _onDidChangeWatchExpressions: Emitter<IExpression>;
 
 	constructor(
@@ -751,7 +751,7 @@ export class DebugModel implements IDebugModel {
 		this.sessions = [];
 		this.toDispose = [];
 		this._onDidChangeBreakpoints = new Emitter<IBreakpointsChangeEvent>();
-		this._onDidChangeCallStack = new Emitter<void>();
+		this._onDidChangeCallStack = new Emitter<IThread | undefined>();
 		this._onDidChangeWatchExpressions = new Emitter<IExpression>();
 	}
 
@@ -786,7 +786,7 @@ export class DebugModel implements IDebugModel {
 		return this._onDidChangeBreakpoints.event;
 	}
 
-	get onDidChangeCallStack(): Event<void> {
+	get onDidChangeCallStack(): Event<IThread | undefined> {
 		return this._onDidChangeCallStack.event;
 	}
 
@@ -819,12 +819,12 @@ export class DebugModel implements IDebugModel {
 			return thread.fetchCallStack(1).then(() => {
 				if (!this.schedulers.has(thread.getId())) {
 					this.schedulers.set(thread.getId(), new RunOnceScheduler(() => {
-						thread.fetchCallStack(19).then(() => this._onDidChangeCallStack.fire());
+						thread.fetchCallStack(19).then(() => this._onDidChangeCallStack.fire(thread));
 					}, 420));
 				}
 
 				this.schedulers.get(thread.getId()).schedule();
-				this._onDidChangeCallStack.fire();
+				this._onDidChangeCallStack.fire(thread);
 			});
 		}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
@@ -611,6 +611,16 @@ export class DebugSession implements IDebugSession {
 					this.model.fetchCallStack(<Thread>thread).then(() => {
 						if (!event.body.preserveFocusHint && thread.getCallStack().length) {
 							this.debugService.focusStackFrame(undefined, thread);
+							if (!this.debugService.getViewModel().focusedStackFrame) {
+								// There were no appropriate stack frames to focus.
+								// We need to listen on additional stack frame fetching and try to refocus #65012
+								const listener = this.model.onDidChangeCallStack(t => {
+									if (t && t.getId() === thread.getId()) {
+										dispose(listener);
+										this.debugService.focusStackFrame(undefined, thread);
+									}
+								});
+							}
 							if (thread.stoppedDetails) {
 								if (this.configurationService.getValue<IDebugConfiguration>('debug').openDebug === 'openOnDebugBreak') {
 									this.viewletService.openViewlet(VIEWLET_ID);

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ export interface IDebugModel extends ITreeElement {`
`393`	`393`	`getWatchExpressions(): ReadonlyArray<IExpression & IEvaluate>;`
`394`	`394`
`395`	`395`	`onDidChangeBreakpoints: Event<IBreakpointsChangeEvent>;`
`396`		`- onDidChangeCallStack: Event<void>;`
	`396`	`+ onDidChangeCallStack: Event<IThread \| undefined>;`
`397`	`397`	`onDidChangeWatchExpressions: Event<IExpression>;`
`398`	`398`	`}`
`399`	`399`