debug: allow orphans to outlive their parents

src/vs/workbench/contrib/debug/browser/debugCommands.ts

@@ -458,7 +458,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		} else {
 			const showSubSessions = configurationService.getValue<IDebugConfiguration>('debug').showSubSessionsInToolBar;
 			// Stop should be sent to the root parent session
-			while (!showSubSessions && session && session.parentSession) {
+			while (!showSubSessions && session.lifecycleManagedByParent && session.parentSession) {
 				session = session.parentSession;
 			}
 			session.removeReplExpressions();
@@ -605,7 +605,7 @@ async function stopHandler(accessor: ServicesAccessor, _: string, context: CallS
 	const configurationService = accessor.get(IConfigurationService);
 	const showSubSessions = configurationService.getValue<IDebugConfiguration>('debug').showSubSessionsInToolBar;
 	// Stop should be sent to the root parent session
-	while (!showSubSessions && session && session.parentSession) {
+	while (!showSubSessions && session && session.lifecycleManagedByParent && session.parentSession) {
 		session = session.parentSession;
 	}
 

src/vs/workbench/contrib/debug/browser/debugSession.ts

@@ -10,7 +10,7 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
 import { canceled } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
 import { mixin } from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import * as resources from 'vs/base/common/resources';
@@ -40,6 +40,7 @@ import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecy
 import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
 
 export class DebugSession implements IDebugSession {
+	parentSession: IDebugSession | undefined;
 
 	private _subId: string | undefined;
 	raw: RawDebugSession | undefined; // used in tests
@@ -93,24 +94,26 @@ export class DebugSession implements IDebugSession {
 		@IWorkbenchEnvironmentService private readonly workbenchEnvironmentService: IWorkbenchEnvironmentService,
 	) {
 		this._options = options || {};
+		this.parentSession = this._options.parentSession;
 		if (this.hasSeparateRepl()) {
 			this.repl = new ReplModel(this.configurationService);
 		} else {
 			this.repl = (this.parentSession as DebugSession).repl;
 		}
 
-		const toDispose: IDisposable[] = [];
-		toDispose.push(this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire()));
+		const toDispose = new DisposableStore();
+		const replListener = toDispose.add(new MutableDisposable());
+		replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
 		if (lifecycleService) {
-			toDispose.push(lifecycleService.onWillShutdown(() => {
+			toDispose.add(lifecycleService.onWillShutdown(() => {
 				this.shutdown();
 				dispose(toDispose);
 			}));
 		}
 
 		const compoundRoot = this._options.compoundRoot;
 		if (compoundRoot) {
-			toDispose.push(compoundRoot.onDidSessionStop(() => this.terminate()));
+			toDispose.add(compoundRoot.onDidSessionStop(() => this.terminate()));
 		}
 		this.passFocusScheduler = new RunOnceScheduler(() => {
 			// If there is some session or thread that is stopped pass focus to it
@@ -130,6 +133,18 @@ export class DebugSession implements IDebugSession {
 				}
 			}
 		}, 800);
+
+		const parent = this._options.parentSession;
+		if (parent) {
+			toDispose.add(parent.onDidEndAdapter(() => {
+				// copy the parent repl and get a new detached repl for this child
+				if (!this.hasSeparateRepl()) {
+					this.repl = this.repl.clone();
+					replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
+				}
+				this.parentSession = undefined;
+			}));
+		}
 	}
 
 	getId(): string {
@@ -156,8 +171,8 @@ export class DebugSession implements IDebugSession {
 		return this._configuration.unresolved;
 	}
 
-	get parentSession(): IDebugSession | undefined {
-		return this._options.parentSession;
+	get lifecycleManagedByParent(): boolean {
+		return !!this._options.lifecycleManagedByParent;
 	}
 
 	get compact(): boolean {

src/vs/workbench/contrib/debug/browser/repl.ts

@@ -176,6 +176,11 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			}
 			this.multiSessionRepl.set(this.isMultiSessionView);
 		}));
+		this._register(this.debugService.onDidEndSession(async session => {
+			// Update view, since orphaned sessions might now be separate
+			await Promise.resolve(); // allow other listeners to go first, so sessions can update parents
+			this.multiSessionRepl.set(this.isMultiSessionView);
+		}));
 		this._register(this.themeService.onDidColorThemeChange(() => {
 			this.refreshReplElements(false);
 			if (this.isVisible()) {

src/vs/workbench/contrib/debug/common/debug.ts

@@ -304,6 +304,7 @@ export interface IDebugSession extends ITreeElement {
 	readonly suppressDebugToolbar: boolean;
 	readonly suppressDebugStatusbar: boolean;
 	readonly suppressDebugView: boolean;
+	readonly lifecycleManagedByParent: boolean;
 
 	setSubId(subId: string | undefined): void;
 

src/vs/workbench/contrib/debug/common/replModel.ts

@@ -297,4 +297,11 @@ export class ReplModel {
 			this._onDidChangeElements.fire();
 		}
 	}
+
+	/** Returns a new REPL model that's a copy of this one. */
+	clone() {
+		const newRepl = new ReplModel(this.configurationService);
+		newRepl.replElements = this.replElements.slice();
+		return newRepl;
+	}
 }

src/vs/workbench/contrib/debug/test/common/mockDebug.ts

@@ -197,6 +197,10 @@ export class MockSession implements IDebugSession {
 		return false;
 	}
 
+	get lifecycleManagedByParent(): boolean {
+		return false;
+	}
+
 	stepInTargets(frameId: number): Promise<{ id: number; label: string }[]> {
 		throw new Error('Method not implemented.');
 	}