squash!

client/Source/common/client.ts

@@ -711,24 +711,25 @@ export abstract class BaseLanguageClient implements FeatureClient<Middleware, La
 			await this.sendPendingFullTextDocumentChanges(connection);
 		}
 
-		const _sendRequest = this._clientOptions.middleware?.sendRequest;
-		if (_sendRequest !== undefined) {
-			let param: any | undefined = undefined;
-			let token: CancellationToken | undefined = undefined;
-
-			// Separate cancellation tokens from other parameters for a better client interface
-			if (params.length === 1) {
-				// CancellationToken is an interface, so we need to check if the first param complies to it
-				if (ProtocolCancellationToken.is(params[0])) {
-					token = params[0];
-				} else {
-					param = params[0];
-				}
-			} else if (params.length === 2) {
+		let param: any | undefined = undefined;
+		let token: CancellationToken | undefined = undefined;
+		// Separate cancellation tokens from other parameters for a better client interface
+		if (params.length === 1) {
+			// CancellationToken is an interface, so we need to check if the first param complies to it
+			if (ProtocolCancellationToken.is(params[0])) {
+				token = params[0];
+			} else {
 				param = params[0];
-				token = params[1];
 			}
-
+		} else if (params.length === 2) {
+			param = params[0];
+			token = params[1];
+		}
+		if (token !== undefined && token.isCancellationRequested) {
+			return Promise.reject(new ResponseError(LSPErrorCodes.RequestCancelled, 'Request got cancelled'));
+		}
+		const _sendRequest = this._clientOptions.middleware?.sendRequest;
+		if (_sendRequest !== undefined) {
 			// Return the general middleware invocation defining `next` as a utility function that reorganizes parameters to
 			// pass them to the original sendRequest function.
 			return _sendRequest(type, param, token, (type, param, token) => {

client/Source/common/codeAction.ts

@@ -5,7 +5,7 @@
 
 import {
 	languages as Languages, Disposable, TextDocument, ProviderResult, Range as VRange, Command as VCommand, CodeAction as VCodeAction,
-	CodeActionContext as VCodeActionContext, CodeActionProvider
+	CodeActionContext as VCodeActionContext, CodeActionProvider, CodeActionProviderMetadata
 } from 'vscode';
 
 import {
@@ -60,6 +60,7 @@ export class CodeActionFeature extends TextDocumentLanguageFeature<boolean | Cod
 			}
 		};
 		cap.honorsChangeAnnotations = true;
+		cap.documentationSupport = true;
 	}
 
 	public initialize(capabilities: ServerCapabilities, documentSelector: DocumentSelector): void {
@@ -115,9 +116,16 @@ export class CodeActionFeature extends TextDocumentLanguageFeature<boolean | Cod
 				}
 				: undefined
 		};
-		return [Languages.registerCodeActionsProvider(this._client.protocol2CodeConverter.asDocumentSelector(selector), provider,
-			(options.codeActionKinds
-				? { providedCodeActionKinds: this._client.protocol2CodeConverter.asCodeActionKinds(options.codeActionKinds) }
-				: undefined)), provider];
+		return [Languages.registerCodeActionsProvider(this._client.protocol2CodeConverter.asDocumentSelector(selector), provider, this.getMetadata(options)), provider];
+	}
+
+	private getMetadata(options: CodeActionRegistrationOptions): CodeActionProviderMetadata | undefined {
+		if (options.codeActionKinds === undefined && options.documentation === undefined) {
+			return undefined;
+		}
+		return {
+			providedCodeActionKinds: this._client.protocol2CodeConverter.asCodeActionKinds(options.codeActionKinds),
+			documentation: this._client.protocol2CodeConverter.asCodeActionDocumentations(options.documentation)
+		};
 	}
 }

client/Source/common/codeConverter.ts

@@ -835,6 +835,7 @@ export function createConverter(uriConverter?: URIConverter): Converter {
 
 	function asCommand(item: code.Command): proto.Command {
 		const result = proto.Command.create(item.title, item.command);
+		if (item.tooltip) { result.tooltip = item.tooltip; }
 		if (item.arguments) { result.arguments = item.arguments; }
 		return result;
 	}

client/Source/common/protocolConverter.ts

@@ -142,6 +142,10 @@ export interface Converter {
 	asCodeActionKinds(items: ls.CodeActionKind[]): code.CodeActionKind[];
 	asCodeActionKinds(item: ls.CodeActionKind[] | null | undefined): code.CodeActionKind[] | undefined;
 
+	asCodeActionDocumentations(items: null | undefined): undefined;
+	asCodeActionDocumentations(items: ls.CodeActionKindDocumentation[]): code.CodeActionProviderMetadata['documentation'];
+	asCodeActionDocumentations(items: ls.CodeActionKindDocumentation[] | null | undefined): code.CodeActionProviderMetadata['documentation'] | undefined;
+
 	asCodeActionResult(items: (ls.Command | ls.CodeAction)[], token?: code.CancellationToken): Promise<(code.Command | code.CodeAction)[]>;
 
 	asCodeLens(item: ls.CodeLens): code.CodeLens;
@@ -932,6 +936,7 @@ export function createConverter(uriConverter: URIConverter | undefined, trustMar
 
 	function asCommand(item: ls.Command): code.Command {
 		const result: code.Command = { title: item.title, command: item.command };
+		if (item.tooltip) { result.tooltip = item.tooltip; }
 		if (item.arguments) { result.arguments = item.arguments; }
 		return result;
 	}
@@ -985,6 +990,16 @@ export function createConverter(uriConverter: URIConverter | undefined, trustMar
 		return items.map(kind => asCodeActionKind(kind));
 	}
 
+	function asCodeActionDocumentations(items: null | undefined): undefined;
+	function asCodeActionDocumentations(items: ls.CodeActionKindDocumentation[]): code.CodeActionProviderMetadata['documentation'];
+	function asCodeActionDocumentations(items: ls.CodeActionKindDocumentation[] | null | undefined): code.CodeActionProviderMetadata['documentation'] | undefined;
+	function asCodeActionDocumentations(items: ls.CodeActionKindDocumentation[] | null | undefined): code.CodeActionProviderMetadata['documentation'] | undefined {
+		if (items === undefined || items === null) {
+			return undefined;
+		}
+		return items.map(doc => ({ kind: asCodeActionKind(doc.kind), command: asCommand(doc.command) }));
+	}
+
 	function asCodeAction(item: undefined | null, token?: code.CancellationToken): Promise<undefined>;
 	function asCodeAction(item: ls.CodeAction, token?: code.CancellationToken): Promise<code.CodeAction>;
 	function asCodeAction(item: ls.CodeAction | undefined | null, token?: code.CancellationToken): Promise<code.CodeAction | undefined>;
@@ -1504,6 +1519,7 @@ export function createConverter(uriConverter: URIConverter | undefined, trustMar
 		asCodeAction,
 		asCodeActionKind,
 		asCodeActionKinds,
+		asCodeActionDocumentations,
 		asCodeActionResult,
 		asCodeLens,
 		asCodeLenses,