about summary refs log tree commit diff
path: root/editors/code/src/client.ts
diff options
context:
space:
mode:
authorLaurențiu Nicola <lnicola@dend.ro>2022-04-08 14:24:28 +0300
committerLaurențiu Nicola <lnicola@dend.ro>2022-04-08 14:24:28 +0300
commitbfa2a08da1fb7704cd95eec7111977d5d8f60ddc (patch)
treea750257fcae8959b6f90a20ea22daf17574cd648 /editors/code/src/client.ts
parentd3d62671127daf1b1cc13e040b61f1ec715fd29b (diff)
downloadrust-bfa2a08da1fb7704cd95eec7111977d5d8f60ddc.tar.gz
rust-bfa2a08da1fb7704cd95eec7111977d5d8f60ddc.zip
Update for languageclient API changes
Diffstat (limited to 'editors/code/src/client.ts')
-rw-r--r--editors/code/src/client.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 26567c6df3c..f7520f6c436 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -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;
                         }