Don't restart pty host when shutting down

Author: Tyriar

src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts

@@ -23,13 +23,16 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
 
 	private readonly _onBeforeWindowConnection = new Emitter<void>();
 	readonly onBeforeWindowConnection = this._onBeforeWindowConnection.event;
+	private readonly _onWillShutdown = new Emitter<void>();
+	readonly onWillShutdown = this._onWillShutdown.event;
 
 	constructor(
 		private readonly _reconnectConstants: IReconnectConstants,
 		@IEnvironmentService private readonly _environmentService: INativeEnvironmentService,
 		@ILifecycleMainService private readonly _lifecycleMainService: ILifecycleMainService,
 		@ILogService private readonly _logService: ILogService
 	) {
+		this._lifecycleMainService.onWillShutdown(() => this._onWillShutdown.fire());
 		// Listen for new windows to establish connection directly to pty host
 		validatedIpcMain.on('vscode:createPtyHostMessageChannel', (e, nonce) => this._onWindowConnection(e, nonce));
 	}

src/vs/platform/terminal/node/ptyHost.ts

@@ -15,6 +15,7 @@ export interface IPtyHostConnection {
 
 export interface IPtyHostStarter {
 	onBeforeWindowConnection?: Event<void>;
+	onWillShutdown?: Event<void>;
 
 	/**
 	 * Creates a pty host and connects to it.

src/vs/platform/terminal/node/ptyHostService.ts

@@ -57,6 +57,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 
 	private readonly _shellEnv: Promise<typeof process.env>;
 	private readonly _resolveVariablesRequestStore: RequestStore<string[], { workspaceId: string; originalText: string[] }>;
+	private _wasQuitRequested = false;
 	private _restartCount = 0;
 	private _isResponsive = true;
 	private _isDisposed = false;
@@ -105,6 +106,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 
 		this._register(toDisposable(() => this._disposePtyHost()));
 
+
 		this._resolveVariablesRequestStore = this._register(new RequestStore(undefined, this._logService));
 		this._resolveVariablesRequestStore.onCreateRequest(this._onPtyHostRequestResolveVariables.fire, this._onPtyHostRequestResolveVariables);
 
@@ -115,6 +117,8 @@ export class PtyHostService extends Disposable implements IPtyService {
 		} else {
 			this._ensurePtyHost();
 		}
+
+		this._ptyHostStarter.onWillShutdown?.(() => this._wasQuitRequested = true);
 	}
 
 	private get _ignoreProcessNames(): string[] {
@@ -140,7 +144,6 @@ export class PtyHostService extends Disposable implements IPtyService {
 	}
 
 	private _startPtyHost(): [IPtyHostConnection, IPtyService] {
-		this._logService.info('startPtyHost', new Error().stack);
 		const connection = this._ptyHostStarter.start(lastPtyId);
 		const client = connection.client;
 
@@ -154,7 +157,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 		// Handle exit
 		this._register(connection.onDidProcessExit(e => {
 			this._onPtyHostExit.fire(e.code);
-			if (!this._isDisposed) {
+			if (!this._wasQuitRequested && !this._isDisposed) {
 				if (this._restartCount <= Constants.MaxRestarts) {
 					this._logService.error(`ptyHost terminated unexpectedly with code ${e.code}`);
 					this._restartCount++;

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

@@ -44,7 +44,6 @@ export abstract class BaseTerminalBackend extends Disposable {
 		let unresponsiveNotification: INotificationHandle | undefined;
 		if (eventSource.onPtyHostStart) {
 			this._register(eventSource.onPtyHostStart(() => {
-				this._logService.info(`ptyHost restarted`);
 				this._onPtyHostRestart.fire();
 				unresponsiveNotification?.close();
 				unresponsiveNotification = undefined;