Fixing TSServer Restart Happening Twice

mjbvz · mjbvz · commit 732824c35467 · 2017-06-13T15:48:32.000-07:00
Fixes microsoft#27817 **Bug** When triggering a manual TSServer restart, we currently start a new instance than immediatly kill it and start another new instance of the service. This is caused by the current handler for proces crashes not knowing that it should not restart the service for manual restarts. **Fix** Make sure kill doesn't automatically try to start up another instance of the TS Server when we manually restart the server
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
@@ -240,6 +240,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 	private firstStart: number;
 	private lastStart: number;
 	private numberRestarts: number;
+	private isRestarting: boolean = false;
+
 	private cancellationPipeName: string | null = null;
 
 	private requestQueue: RequestQueue;
@@ -305,13 +307,14 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 
 	public restartTsServer(): void {
 		const start = () => {
-			this.servicePromise = this.startService();
+			this.servicePromise = this.startService(true);
 			return this.servicePromise;
 		};
 
 		if (this.servicePromise) {
 			this.servicePromise = this.servicePromise.then(cp => {
 				if (cp) {
+					this.isRestarting = true;
 					cp.kill();
 				}
 			}).then(start);
@@ -352,15 +355,15 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 		return this._onReady.promise;
 	}
 
-	public info(message: string, data?: any): void {
+	private info(message: string, data?: any): void {
 		this.logger.info(message, data);
 	}
 
 	public warn(message: string, data?: any): void {
 		this.logger.warn(message, data);
 	}
 
-	public error(message: string, data?: any): void {
+	private error(message: string, data?: any): void {
 		this.logger.error(message, data);
 	}
 
@@ -567,7 +570,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 							if (this.tsServerLogFile) {
 								this.info(`TSServer log file: ${this.tsServerLogFile}`);
 							}
-							this.serviceExited(true);
+							this.serviceExited(!this.isRestarting);
+							this.isRestarting = false;
 						});
 
 						this.reader = new Reader<Proto.Response>(
