Allow max 5 seconds for server to shutdown. (#628)

Signed-off-by: Yaohai Zheng <yaozheng@microsoft.com>

Author: yaohaizh

src/extension.ts

@@ -13,6 +13,7 @@ import { StatusNotification, ClassFileContentsRequest, ProjectConfigurationUpdat
 
 let oldConfig;
 let lastStatus;
+let languageClient : LanguageClient;
 
 export function activate(context: ExtensionContext) {
 
@@ -85,7 +86,7 @@ export function activate(context: ExtensionContext) {
 				}
 
 				// Create the language client and start the client.
-				let languageClient = new LanguageClient('java', 'Language Support for Java', serverOptions, clientOptions);
+				languageClient = new LanguageClient('java', 'Language Support for Java', serverOptions, clientOptions);
 				languageClient.registerProposedFeatures();
 				languageClient.onReady().then(() => {
 					languageClient.onNotification(StatusNotification.type, (report) => {
@@ -235,23 +236,27 @@ export function activate(context: ExtensionContext) {
 					};
 					workspace.registerTextDocumentContentProvider('jdt', provider);
 				});
-				let disposable = languageClient.start();
+				languageClient.start();
 				// Register commands here to make it available even when the language client fails
 				commands.registerCommand(Commands.OPEN_SERVER_LOG, () => openServerLogFile(workspacePath));
 
 				let extensionPath = context.extensionPath;
 				commands.registerCommand(Commands.OPEN_FORMATTER, async () => openFormatter(extensionPath));
 
-				// Push the disposable to the context's subscriptions so that the
-				// client can be deactivated on extension deactivation
-				context.subscriptions.push(disposable);
 				context.subscriptions.push(onConfigurationChange());
 				toggleItem(window.activeTextEditor, item);
 			});
 		});
 	});
 }
 
+export function deactivate(): Thenable<void> {
+	if (!languageClient) {
+		return undefined;
+	}
+	return languageClient.stop();
+}
+
 function enableJavadocSymbols() {
 	// Let's enable Javadoc symbols autocompletion, shamelessly copied from MIT licensed code at
 	// https://github.com/Microsoft/vscode/blob/9d611d4dfd5a4a101b5201b8c9e21af97f06e7a7/extensions/typescript/src/typescriptMain.ts#L186