From 0bf8b3c8f70ca448c02686387bb2dfd34eb6879d Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 12 Jul 2017 11:12:48 -0700
Subject: [PATCH] Force kill tsserver on ts extension shutdown

---
 extensions/typescript/src/typescriptMain.ts   |  4 ++-
 .../typescript/src/typescriptServiceClient.ts | 26 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript/src/typescriptMain.ts b/extensions/typescript/src/typescriptMain.ts
index acaef657266..e966d6c7916 100644
--- a/extensions/typescript/src/typescriptMain.ts
+++ b/extensions/typescript/src/typescriptMain.ts
@@ -477,7 +477,9 @@ class TypeScriptServiceClientHost implements ITypescriptServiceClientHost {
 		this.versionStatus = new VersionStatus();
 		this.disposables.push(this.versionStatus);
 
-		this.client = new TypeScriptServiceClient(this, workspaceState, this.versionStatus, plugins, this.disposables);
+		this.client = new TypeScriptServiceClient(this, workspaceState, this.versionStatus, plugins);
+		this.disposables.push(this.client);
+
 		this.languagePerId = new Map();
 		for (const description of descriptions) {
 			const manager = new LanguageProvider(this.client, description);
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index 8ce69e6e9f7..ab3bc1ce215 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -153,12 +153,13 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 	private _apiVersion: API;
 	private telemetryReporter: TelemetryReporter;
 
+	private readonly disposables: Disposable[] = [];
+
 	constructor(
 		private readonly host: ITypescriptServiceClientHost,
 		private readonly workspaceState: Memento,
 		private readonly versionStatus: VersionStatus,
-		private readonly plugins: TypeScriptServerPlugin[],
-		disposables: Disposable[]
+		private readonly plugins: TypeScriptServerPlugin[]
 	) {
 		this.pathSeparator = path.sep;
 		this.lastStart = Date.now();
@@ -182,7 +183,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 		this._apiVersion = new API('1.0.0');
 		this.tracer = new Tracer(this.logger);
 
-		disposables.push(workspace.onDidChangeConfiguration(() => {
+		this.disposables.push(workspace.onDidChangeConfiguration(() => {
 			const oldConfiguration = this.configuration;
 			this.configuration = TypeScriptServiceConfiguration.loadFromWorkspace();
 
@@ -200,10 +201,27 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 			}
 		}));
 		this.telemetryReporter = new TelemetryReporter();
-		disposables.push(this.telemetryReporter);
+		this.disposables.push(this.telemetryReporter);
 		this.startService();
 	}
 
+	public dispose() {
+		if (this.servicePromise) {
+			this.servicePromise.then(cp => {
+				if (cp) {
+					cp.kill();
+				}
+			}).then(undefined, () => void 0);
+		}
+
+		while (this.disposables.length) {
+			const obj = this.disposables.pop();
+			if (obj) {
+				obj.dispose();
+			}
+		}
+	}
+
 	public restartTsServer(): void {
 		const start = () => {
 			this.servicePromise = this.startService(true);