revert addition of killGracefully setting (microsoft#250668)

revert addition of killGracefully setting microsoft#206607

Author: meganrogge

src/vs/platform/terminal/common/terminal.ts

@@ -121,7 +121,6 @@ export const enum TerminalSettingId {
 	FontLigaturesEnabled = 'terminal.integrated.fontLigatures.enabled',
 	FontLigaturesFeatureSettings = 'terminal.integrated.fontLigatures.featureSettings',
 	FontLigaturesFallbackLigatures = 'terminal.integrated.fontLigatures.fallbackLigatures',
-	KillGracefully = 'terminal.integrated.killGracefully',
 
 	// Debug settings that are hidden from user
 
@@ -650,10 +649,6 @@ export interface IShellLaunchConfig {
 	 * Report terminal's shell environment variables to VS Code and extensions
 	 */
 	shellIntegrationEnvironmentReporting?: boolean;
-	/**
-	 * Whether the process should be killed gracefully
-	 */
-	killGracefully?: boolean;
 }
 
 export interface ITerminalTabAction {

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

@@ -377,11 +377,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			if (this._ptyProcess) {
 				await this._throttleKillSpawn();
 				this._logService.trace('node-pty.IPty#kill');
-				if (this.shellLaunchConfig.killGracefully) {
-					this._killGracefully(this._ptyProcess);
-				} else {
-					this._ptyProcess.kill();
-				}
+				this._ptyProcess.kill();
 			}
 		} catch (ex) {
 			// Swallow, the pty has already been killed
@@ -390,10 +386,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this.dispose();
 	}
 
-	private async _killGracefully(ptyProcess: IPty): Promise<void> {
-		ptyProcess.kill('SIGTERM');
-	}
-
 	private async _throttleKillSpawn(): Promise<void> {
 		// Only throttle on Windows/conpty
 		if (!isWindows || !('useConpty' in this._ptyOptions) || !this._ptyOptions.useConpty) {
@@ -460,11 +452,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 				setTimeout(() => {
 					if (this._closeTimeout && !this._store.isDisposed) {
 						this._closeTimeout = undefined;
-						if (this._ptyProcess && this.shellLaunchConfig.killGracefully) {
-							this._killGracefully(this._ptyProcess);
-						} else {
-							this._kill();
-						}
+						this._kill();
 					}
 				}, ShutdownConstants.MaximumShutdownTime);
 			}

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

@@ -566,10 +566,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			if (e.affectsConfiguration(AccessibilityVerbositySettingId.Terminal)) {
 				this._setAriaLabel(this.xterm?.raw, this._instanceId, this.title);
 			}
-			if (e.affectsConfiguration(TerminalSettingId.KillGracefully)) {
-				// For windows, we already attempt to gracefully kill the process
-				this.shellLaunchConfig.killGracefully = !isWindows && this._configurationService.getValue(TerminalSettingId.KillGracefully);
-			}
 			if (e.affectsConfiguration('terminal.integrated')) {
 				this.updateConfig();
 				this.setVisible(this._isVisible);
@@ -1510,8 +1506,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				message: nls.localize('workspaceNotTrustedCreateTerminalCwd', "Cannot launch a terminal process in an untrusted workspace with cwd {0} and userHome {1}", this._cwd, this._userHome)
 			});
 		}
-		// For windows, we already attempt to gracefully kill the process
-		this.shellLaunchConfig.killGracefully = !isWindows && this._configurationService.getValue(TerminalSettingId.KillGracefully);
 		// Re-evaluate dimensions if the container has been set since the xterm instance was created
 		if (this._container && this._cols === 0 && this._rows === 0) {
 			this._initDimensions();

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

@@ -640,15 +640,6 @@ const terminalConfiguration: IConfigurationNode = {
 				localize('terminal.integrated.focusAfterRun.none', "Do nothing."),
 			]
 		},
-		[TerminalSettingId.KillGracefully]: {
-			type: 'boolean',
-			default: false,
-			markdownDescription: localize(
-				'terminal.integrated.killGracefully',
-				'Controls how terminal processes are terminated on macOS and Linux. When enabled, attempts a graceful shutdown of the process tree. This will send \`SIGTERM\`. When disabled (default), processes are terminated with: \`SIGHUP\` (Experimental).'
-			),
-			tags: ['experimental']
-		},
 		...terminalContribConfiguration,
 	}
 };