Fix moving refactoring not working in standard mode (#2506)

* Fix moving refactoring not working in standard mode

- return the 'stop()' promise in each 'xxxClient.stop()' method.
- return 'Promise.all()' in 'deactivate()'

Signed-off-by: sheche <sheche@microsoft.com>

Author: jdneo

src/extension.ts

@@ -427,9 +427,7 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 
 			apiManager.getApiInstance().onDidServerModeChange((event: ServerMode) => {
 				if (event === ServerMode.STANDARD) {
-					syntaxClient.getClient().stop().then(client => {
-						syntaxClient.stop();
-					});
+					syntaxClient.stop();
 					fileEventHandler.setServerStatus(true);
 					runtimeStatusBarProvider.initialize(context);
 				}
@@ -635,16 +633,11 @@ export function getJavaConfig(javaHome: string) {
 	return javaConfig;
 }
 
-export function deactivate(): Promise<void> {
-	return getActiveLanguageClient().then(client => {
-		standardClient.stop();
-		syntaxClient.stop();
-		if (!client) {
-			return undefined;
-		} else {
-			return client.stop();
-		}
-	});
+export function deactivate(): Promise<void[]> {
+	return Promise.all<void>([
+		standardClient.stop(),
+		syntaxClient.stop(),
+	]);
 }
 
 export async function getActiveLanguageClient(): Promise<LanguageClient | undefined> {

src/standardLanguageClient.ts

@@ -518,10 +518,16 @@ export class StandardLanguageClient {
 		}
 	}
 
-	public stop() {
+	public stop(): Promise<void> {
+		this.status = ClientStatus.Stopping;
 		if (this.languageClient) {
-			this.status = ClientStatus.Stopping;
+			try {
+				return this.languageClient.stop();
+			} finally {
+				this.languageClient = null;
+			}
 		}
+		return Promise.resolve();
 	}
 
 	public getClient(): LanguageClient {

src/syntaxLanguageClient.ts

@@ -89,11 +89,16 @@ export class SyntaxLanguageClient {
 		}
 	}
 
-	public stop() {
+	public stop(): Promise<void> {
 		this.status = ClientStatus.Stopping;
 		if (this.languageClient) {
-			this.languageClient = null;
+			try {
+				return this.languageClient.stop();
+			} finally {
+				this.languageClient = null;
+			}
 		}
+		return Promise.resolve();
 	}
 
 	public isAlive(): boolean {