language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update for languageclient API changes

Browse source
This commit is contained in:
Laurențiu Nicola 2022-04-08 14:24:28 +03:00
parent d3d6267112
commit bfa2a08da1
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editors/code/src/client.ts
View file

@ -90,9 +90,9 @@ export function createClient(serverPath: string, workspace: Workspace, extraEnv:
const params: lc.CodeActionParams = {
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
range: client.code2ProtocolConverter.asRange(range),
context: client.code2ProtocolConverter.asCodeActionContext(context)
context: await client.code2ProtocolConverter.asCodeActionContext(context, token)
};
return client.sendRequest(lc.CodeActionRequest.type, params, token).then((values) => {
return client.sendRequest(lc.CodeActionRequest.type, params, token).then(async (values) => {
if (values === null) return undefined;
const result: (vscode.CodeAction | vscode.Command)[] = [];
const groups = new Map<string, { index: number; items: vscode.CodeAction[] }>();
@ -100,7 +100,7 @@ export function createClient(serverPath: string, workspace: Workspace, extraEnv:
// In our case we expect to get code edits only from diagnostics
if (lc.CodeAction.is(item)) {
assert(!item.command, "We don't expect to receive commands in CodeActions");
const action = client.protocol2CodeConverter.asCodeAction(item);
const action = await client.protocol2CodeConverter.asCodeAction(item, token);
result.push(action);
continue;
}