Pass the cancellationtoken to the client request registered by provider (#1668)

Signed-off-by: Jinbo Wang <[email protected]>

Author: testforstephen

src/providerDispatcher.ts

@@ -51,7 +51,7 @@ export class ClientHoverProvider implements HoverProvider {
 				textDocument: languageClient.code2ProtocolConverter.asTextDocumentIdentifier(document),
 				position: languageClient.code2ProtocolConverter.asPosition(position)
 			};
-			const hoverResponse = await languageClient.sendRequest(HoverRequest.type, params);
+			const hoverResponse = await languageClient.sendRequest(HoverRequest.type, params, token);
 			return languageClient.protocol2CodeConverter.asHover(hoverResponse);
 		}
 	}
@@ -86,7 +86,7 @@ function createDocumentSymbolProvider(): DocumentSymbolProvider {
 			const params = {
 				textDocument: languageClient.code2ProtocolConverter.asTextDocumentIdentifier(document),
 			};
-			const symbolResponse = await languageClient.sendRequest(DocumentSymbolRequest.type, params);
+			const symbolResponse = await languageClient.sendRequest(DocumentSymbolRequest.type, params, token);
 			if (!symbolResponse || !symbolResponse.length) {
 				return [];
 			}

src/standardLanguageClient.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import { ExtensionContext, window, workspace, commands, Uri, ProgressLocation, ViewColumn, EventEmitter, extensions, Location, languages, CodeActionKind } from "vscode";
+import { ExtensionContext, window, workspace, commands, Uri, ProgressLocation, ViewColumn, EventEmitter, extensions, Location, languages, CodeActionKind, CancellationToken } from "vscode";
 import { Commands } from "./commands";
 import { serverStatus, ServerStatusKind } from "./serverStatus";
 import { prepareExecutable, awaitServerConnection } from "./javaServerStarter";
@@ -263,15 +263,26 @@ export class StandardLanguageClient {
 				}
 			}));
 
-			context.subscriptions.push(commands.registerCommand(Commands.COMPILE_WORKSPACE, (isFullCompile: boolean) => {
+			context.subscriptions.push(commands.registerCommand(Commands.COMPILE_WORKSPACE, (isFullCompile: boolean, token?: CancellationToken) => {
 				return window.withProgress({ location: ProgressLocation.Window }, async p => {
 					if (typeof isFullCompile !== 'boolean') {
 						const selection = await window.showQuickPick(['Incremental', 'Full'], { placeHolder: 'please choose compile type:' });
 						isFullCompile = selection !== 'Incremental';
 					}
 					p.report({ message: 'Compiling workspace...' });
 					const start = new Date().getTime();
-					const res = await this.languageClient.sendRequest(CompileWorkspaceRequest.type, isFullCompile);
+					let res: CompileWorkspaceStatus;
+					try {
+						res = token ? await this.languageClient.sendRequest(CompileWorkspaceRequest.type, isFullCompile, token)
+							: await this.languageClient.sendRequest(CompileWorkspaceRequest.type, isFullCompile);
+					} catch (error) {
+						if (error && error.code === -32800) { // Check if the request is cancelled.
+							res = CompileWorkspaceStatus.CANCELLED;
+						} else {
+							throw error;
+						}
+					}
+
 					const elapsed = new Date().getTime() - start;
 					const humanVisibleDelay = elapsed < 1000 ? 1000 : 0;
 					return new Promise((resolve, reject) => {