Merge pull request #252429 from microsoft/tyriar/252300

Don't focus terminal on group dispose unless it was focused before

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/terminal.ts

@@ -133,6 +133,7 @@ export interface ITerminalGroup {
 	activeInstance: ITerminalInstance | undefined;
 	terminalInstances: ITerminalInstance[];
 	title: string;
+	readonly hadFocusOnExit: boolean;
 
 	readonly onDidDisposeInstance: Event<ITerminalInstance>;
 	readonly onDisposed: Event<ITerminalGroup>;

src/vs/workbench/contrib/terminal/browser/terminalGroup.ts

@@ -251,6 +251,9 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 
 	get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
 
+	private _hadFocusOnExit: boolean = false;
+	get hadFocusOnExit(): boolean { return this._hadFocusOnExit; }
+
 	private _initialRelativeSizes: number[] | undefined;
 	private _visible: boolean = false;
 
@@ -395,6 +398,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 
 		// Fire events and dispose group if it was the last instance
 		if (this._terminalInstances.length === 0) {
+			this._hadFocusOnExit = instance.hadFocusOnExit;
 			this._onDisposed.fire(this);
 			this.dispose();
 		} else {

src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts

@@ -218,7 +218,9 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 			if (this.groups.length > 0 && !this._isQuickInputOpened) {
 				const newIndex = index < this.groups.length ? index : this.groups.length - 1;
 				this.setActiveGroupByIndex(newIndex, true);
-				this.activeInstance?.focus(true);
+				if (group.hadFocusOnExit) {
+					this.activeInstance?.focus(true);
+				}
 			}
 		} else {
 			// Adjust the active group if the removed group was above the active group