debug session become inactive when shutdown. Also more precise listeners for session changes

isidorn · isidorn · commit 97e20be47c3e · 2018-09-19T12:27:53.000+02:00
fixes microsoft#58308
diff --git a/src/vs/workbench/parts/debug/browser/debugActionItems.ts b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
@@ -198,15 +198,17 @@ export class FocusSessionActionItem extends SelectActionItem {
 
 		this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService));
 
-		this.debugService.getViewModel().onDidFocusStackFrame(() => {
+		this.toDispose.push(this.debugService.getViewModel().onDidFocusStackFrame(() => {
 			const session = this.debugService.getViewModel().focusedSession;
 			if (session) {
 				const index = this.debugService.getModel().getSessions().indexOf(session);
 				this.select(index);
 			}
-		});
+		}));
+
+		this.toDispose.push(this.debugService.onDidNewSession(() => this.update()));
+		this.toDispose.push(this.debugService.onDidEndSession(() => this.update()));
 
-		this.debugService.getModel().onDidChangeCallStack(() => this.update());
 		this.update();
 	}
 
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -131,7 +131,8 @@ export class StartAction extends AbstractDebugAction {
 		super(id, label, 'debug-action start', debugService, keybindingService);
 
 		this.toDispose.push(this.debugService.getConfigurationManager().onDidSelectConfiguration(() => this.updateEnablement()));
-		this.toDispose.push(this.debugService.getModel().onDidChangeCallStack(() => this.updateEnablement()));
+		this.toDispose.push(this.debugService.onDidNewSession(() => this.updateEnablement()));
+		this.toDispose.push(this.debugService.onDidEndSession(() => this.updateEnablement()));
 		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => this.updateEnablement()));
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts
@@ -725,6 +725,7 @@ export class DebugSession implements IDebugSession {
 		dispose(this.rawListeners);
 		this.model.clearThreads(this.getId(), true);
 		this.model.removeSession(this.getId());
+		this.state = State.Inactive;
 		this.fetchThreadsScheduler = undefined;
 		if (this.raw) {
 			this.raw.disconnect();

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,8 @@ export class StartAction extends AbstractDebugAction {`
`131`	`131`	`super(id, label, 'debug-action start', debugService, keybindingService);`
`132`	`132`
`133`	`133`	`this.toDispose.push(this.debugService.getConfigurationManager().onDidSelectConfiguration(() => this.updateEnablement()));`
`134`		`- this.toDispose.push(this.debugService.getModel().onDidChangeCallStack(() => this.updateEnablement()));`
	`134`	`+ this.toDispose.push(this.debugService.onDidNewSession(() => this.updateEnablement()));`
	`135`	`+ this.toDispose.push(this.debugService.onDidEndSession(() => this.updateEnablement()));`
`135`	`136`	`this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => this.updateEnablement()));`
`136`	`137`	`}`
`137`	`138`