Merge pull request #83249 from ChayimFriedman2/issue-#82931

Hide Debug Console After Session Has Stopped

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

@@ -212,6 +212,12 @@ configurationRegistry.registerConfiguration({
 			default: 'onFirstSessionStart'
 		},
 		'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
+		'debug.console.closeOnEnd': {
+			enum: ['never', 'always', 'whenOpenedByDebug'],
+			description: nls.localize('debug.console.closeOnEnd', "Controls what to do with the debug console when the debug session ends."),
+			enumDescriptions: [nls.localize('neverClose', "Remain it as-is"), nls.localize('alwaysClose', "Close it (if opened)"), nls.localize('closeWhenOpenedByDebug', "Close if the debugging process opened it, see debug.internalConsoleOptions")],
+			default: 'never'
+		},
 		'debug.openDebug': {
 			enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart', 'openOnDebugBreak'],
 			default: 'openOnSessionStart',

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

@@ -74,6 +74,9 @@ export class DebugService implements IDebugService {
 	private initCancellationToken: CancellationTokenSource | undefined;
 	private activity: IDisposable | undefined;
 
+	// Enable undefined because that makes the test easier.
+	private replWasOpened : boolean | undefined = false;
+
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
 		@IEditorService private readonly editorService: IEditorService,
@@ -452,6 +455,8 @@ export class DebugService implements IDebugService {
 			await this.launchOrAttachToSession(session);
 
 			const internalConsoleOptions = session.configuration.internalConsoleOptions || this.configurationService.getValue<IDebugConfiguration>('debug').internalConsoleOptions;
+			const activePanel = this.panelService.getActivePanel();
+			this.replWasOpened = activePanel && activePanel.getId() === REPL_ID;
 			if (internalConsoleOptions === 'openOnSessionStart' || (this.viewModel.firstSessionStart && internalConsoleOptions === 'openOnFirstSessionStart')) {
 				this.panelService.openPanel(REPL_ID, false);
 			}
@@ -565,6 +570,12 @@ export class DebugService implements IDebugService {
 				dataBreakpoints.forEach(dbp => this.model.removeDataBreakpoints(dbp.getId()));
 			}
 
+			const closeConsoleOnEnd = this.configurationService.getValue<IDebugConfiguration>('debug').console.closeOnEnd;
+			if (this.panelService.getLastActivePanelId() === REPL_ID &&
+				(closeConsoleOnEnd === 'always' || (closeConsoleOnEnd === 'whenOpenedByDebug' && !this.replWasOpened))) {
+				this.panelService.hideActivePanel();
+			}
+
 		}));
 	}
 

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

@@ -463,6 +463,7 @@ export interface IDebugConfiguration {
 		fontFamily: string;
 		lineHeight: number;
 		wordWrap: boolean;
+		closeOnEnd: 'never' | 'always' | 'whenOpenedByDebug';
 	};
 	focusWindowOnBreak: boolean;
 	onTaskErrors: 'debugAnyway' | 'showErrors' | 'prompt';