debug progress: list on progress while launching as well

isidorn · isidorn · commit b8639cb6675f · 2020-04-20T12:15:01.000+02:00
fixes microsoft#95541
diff --git a/src/vs/workbench/contrib/debug/browser/debugProgress.ts b/src/vs/workbench/contrib/debug/browser/debugProgress.ts
@@ -17,10 +17,11 @@ export class DebugProgressContribution implements IWorkbenchContribution {
 		@IDebugService private readonly debugService: IDebugService,
 		@IProgressService private readonly progressService: IProgressService
 	) {
-		let progressListener: IDisposable;
-		const onFocusSession = (session: IDebugSession | undefined) => {
+		let progressListener: IDisposable | undefined;
+		const listenOnProgress = (session: IDebugSession | undefined) => {
 			if (progressListener) {
 				progressListener.dispose();
+				progressListener = undefined;
 			}
 			if (session) {
 				progressListener = session.onDidProgressStart(async progressStartEvent => {
@@ -71,8 +72,13 @@ export class DebugProgressContribution implements IWorkbenchContribution {
 				});
 			}
 		};
-		this.toDispose.push(this.debugService.getViewModel().onDidFocusSession(onFocusSession));
-		onFocusSession(this.debugService.getViewModel().focusedSession);
+		this.toDispose.push(this.debugService.getViewModel().onDidFocusSession(listenOnProgress));
+		listenOnProgress(this.debugService.getViewModel().focusedSession);
+		this.toDispose.push(this.debugService.onWillNewSession(session => {
+			if (!progressListener) {
+				listenOnProgress(session);
+			}
+		}));
 	}
 
 	dispose(): void {
