diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/src/client.ts | 74 | ||||
-rw-r--r-- | editors/code/src/commands.ts | 19 | ||||
-rw-r--r-- | editors/code/src/lsp_ext.ts | 6 | ||||
-rw-r--r-- | editors/code/src/main.ts | 1 |
4 files changed, 62 insertions, 38 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index d64f9a3f9..40ad1e3cd 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -1,8 +1,11 @@ | |||
1 | import * as lc from 'vscode-languageclient'; | 1 | import * as lc from 'vscode-languageclient'; |
2 | import * as vscode from 'vscode'; | 2 | import * as vscode from 'vscode'; |
3 | import * as ra from '../src/lsp_ext'; | ||
4 | import * as Is from 'vscode-languageclient/lib/utils/is'; | ||
3 | 5 | ||
4 | import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; | 6 | import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; |
5 | import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed'; | 7 | import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed'; |
8 | import { assert } from './util'; | ||
6 | 9 | ||
7 | export function createClient(serverPath: string, cwd: string): lc.LanguageClient { | 10 | export function createClient(serverPath: string, cwd: string): lc.LanguageClient { |
8 | // '.' Is the fallback if no folder is open | 11 | // '.' Is the fallback if no folder is open |
@@ -32,6 +35,8 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient | |||
32 | if (res === undefined) throw new Error('busy'); | 35 | if (res === undefined) throw new Error('busy'); |
33 | return res; | 36 | return res; |
34 | }, | 37 | }, |
38 | // Using custom handling of CodeActions where each code action is resloved lazily | ||
39 | // That's why we are not waiting for any command or edits | ||
35 | async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, _next: lc.ProvideCodeActionsSignature) { | 40 | async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, _next: lc.ProvideCodeActionsSignature) { |
36 | const params: lc.CodeActionParams = { | 41 | const params: lc.CodeActionParams = { |
37 | textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document), | 42 | textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document), |
@@ -43,32 +48,36 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient | |||
43 | const result: (vscode.CodeAction | vscode.Command)[] = []; | 48 | const result: (vscode.CodeAction | vscode.Command)[] = []; |
44 | const groups = new Map<string, { index: number; items: vscode.CodeAction[] }>(); | 49 | const groups = new Map<string, { index: number; items: vscode.CodeAction[] }>(); |
45 | for (const item of values) { | 50 | for (const item of values) { |
51 | // In our case we expect to get code edits only from diagnostics | ||
46 | if (lc.CodeAction.is(item)) { | 52 | if (lc.CodeAction.is(item)) { |
53 | assert(!item.command, "We don't expect to receive commands in CodeActions"); | ||
47 | const action = client.protocol2CodeConverter.asCodeAction(item); | 54 | const action = client.protocol2CodeConverter.asCodeAction(item); |
48 | const group = actionGroup(item); | 55 | result.push(action); |
49 | if (isSnippetEdit(item) || group) { | 56 | continue; |
50 | action.command = { | 57 | } |
51 | command: "rust-analyzer.applySnippetWorkspaceEdit", | 58 | assert(isCodeActionWithoutEditsAndCommands(item), "We don't expect edits or commands here"); |
52 | title: "", | 59 | const action = new vscode.CodeAction(item.title); |
53 | arguments: [action.edit], | 60 | const group = (item as any).group; |
54 | }; | 61 | const id = (item as any).id; |
55 | action.edit = undefined; | 62 | const resolveParams: ra.ResolveCodeActionParams = { |
56 | } | 63 | id: id, |
57 | 64 | codeActionParams: params | |
58 | if (group) { | 65 | }; |
59 | let entry = groups.get(group); | 66 | action.command = { |
60 | if (!entry) { | 67 | command: "rust-analyzer.resolveCodeAction", |
61 | entry = { index: result.length, items: [] }; | 68 | title: item.title, |
62 | groups.set(group, entry); | 69 | arguments: [resolveParams], |
63 | result.push(action); | 70 | }; |
64 | } | 71 | if (group) { |
65 | entry.items.push(action); | 72 | let entry = groups.get(group); |
66 | } else { | 73 | if (!entry) { |
74 | entry = { index: result.length, items: [] }; | ||
75 | groups.set(group, entry); | ||
67 | result.push(action); | 76 | result.push(action); |
68 | } | 77 | } |
78 | entry.items.push(action); | ||
69 | } else { | 79 | } else { |
70 | const command = client.protocol2CodeConverter.asCommand(item); | 80 | result.push(action); |
71 | result.push(command); | ||
72 | } | 81 | } |
73 | } | 82 | } |
74 | for (const [group, { index, items }] of groups) { | 83 | for (const [group, { index, items }] of groups) { |
@@ -80,7 +89,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient | |||
80 | command: "rust-analyzer.applyActionGroup", | 89 | command: "rust-analyzer.applyActionGroup", |
81 | title: "", | 90 | title: "", |
82 | arguments: [items.map((item) => { | 91 | arguments: [items.map((item) => { |
83 | return { label: item.title, edit: item.command!!.arguments!![0] }; | 92 | return { label: item.title, arguments: item.command!!.arguments!![0] }; |
84 | })], | 93 | })], |
85 | }; | 94 | }; |
86 | result[index] = action; | 95 | result[index] = action; |
@@ -119,24 +128,17 @@ class ExperimentalFeatures implements lc.StaticFeature { | |||
119 | const caps: any = capabilities.experimental ?? {}; | 128 | const caps: any = capabilities.experimental ?? {}; |
120 | caps.snippetTextEdit = true; | 129 | caps.snippetTextEdit = true; |
121 | caps.codeActionGroup = true; | 130 | caps.codeActionGroup = true; |
131 | caps.resolveCodeAction = true; | ||
122 | capabilities.experimental = caps; | 132 | capabilities.experimental = caps; |
123 | } | 133 | } |
124 | initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void { | 134 | initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void { |
125 | } | 135 | } |
126 | } | 136 | } |
127 | 137 | ||
128 | function isSnippetEdit(action: lc.CodeAction): boolean { | 138 | function isCodeActionWithoutEditsAndCommands(value: any): boolean { |
129 | const documentChanges = action.edit?.documentChanges ?? []; | 139 | const candidate: lc.CodeAction = value; |
130 | for (const edit of documentChanges) { | 140 | return candidate && Is.string(candidate.title) && |
131 | if (lc.TextDocumentEdit.is(edit)) { | 141 | (candidate.diagnostics === void 0 || Is.typedArray(candidate.diagnostics, lc.Diagnostic.is)) && |
132 | if (edit.edits.some((indel) => (indel as any).insertTextFormat === lc.InsertTextFormat.Snippet)) { | 142 | (candidate.kind === void 0 || Is.string(candidate.kind)) && |
133 | return true; | 143 | (candidate.edit === void 0 && candidate.command === void 0); |
134 | } | ||
135 | } | ||
136 | } | ||
137 | return false; | ||
138 | } | ||
139 | |||
140 | function actionGroup(action: lc.CodeAction): string | undefined { | ||
141 | return (action as any).group; | ||
142 | } | 144 | } |
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts index 534d2a984..3e9c3aa0e 100644 --- a/editors/code/src/commands.ts +++ b/editors/code/src/commands.ts | |||
@@ -343,10 +343,25 @@ export function showReferences(ctx: Ctx): Cmd { | |||
343 | } | 343 | } |
344 | 344 | ||
345 | export function applyActionGroup(_ctx: Ctx): Cmd { | 345 | export function applyActionGroup(_ctx: Ctx): Cmd { |
346 | return async (actions: { label: string; edit: vscode.WorkspaceEdit }[]) => { | 346 | return async (actions: { label: string; arguments: ra.ResolveCodeActionParams }[]) => { |
347 | const selectedAction = await vscode.window.showQuickPick(actions); | 347 | const selectedAction = await vscode.window.showQuickPick(actions); |
348 | if (!selectedAction) return; | 348 | if (!selectedAction) return; |
349 | await applySnippetWorkspaceEdit(selectedAction.edit); | 349 | vscode.commands.executeCommand( |
350 | 'rust-analyzer.resolveCodeAction', | ||
351 | selectedAction.arguments, | ||
352 | ); | ||
353 | }; | ||
354 | } | ||
355 | |||
356 | export function resolveCodeAction(ctx: Ctx): Cmd { | ||
357 | const client = ctx.client; | ||
358 | return async (params: ra.ResolveCodeActionParams) => { | ||
359 | const item: lc.WorkspaceEdit = await client.sendRequest(ra.resolveCodeAction, params); | ||
360 | if (!item) { | ||
361 | return; | ||
362 | } | ||
363 | const edit = client.protocol2CodeConverter.asWorkspaceEdit(item); | ||
364 | await applySnippetWorkspaceEdit(edit); | ||
350 | }; | 365 | }; |
351 | } | 366 | } |
352 | 367 | ||
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts index c51acfccb..9793b926c 100644 --- a/editors/code/src/lsp_ext.ts +++ b/editors/code/src/lsp_ext.ts | |||
@@ -33,6 +33,12 @@ export const matchingBrace = new lc.RequestType<MatchingBraceParams, lc.Position | |||
33 | 33 | ||
34 | export const parentModule = new lc.RequestType<lc.TextDocumentPositionParams, lc.LocationLink[], void>("experimental/parentModule"); | 34 | export const parentModule = new lc.RequestType<lc.TextDocumentPositionParams, lc.LocationLink[], void>("experimental/parentModule"); |
35 | 35 | ||
36 | export interface ResolveCodeActionParams { | ||
37 | id: string; | ||
38 | codeActionParams: lc.CodeActionParams; | ||
39 | } | ||
40 | export const resolveCodeAction = new lc.RequestType<ResolveCodeActionParams, lc.WorkspaceEdit, unknown>('experimental/resolveCodeAction'); | ||
41 | |||
36 | export interface JoinLinesParams { | 42 | export interface JoinLinesParams { |
37 | textDocument: lc.TextDocumentIdentifier; | 43 | textDocument: lc.TextDocumentIdentifier; |
38 | ranges: lc.Range[]; | 44 | ranges: lc.Range[]; |
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index b7337621c..a92c676fa 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts | |||
@@ -98,6 +98,7 @@ export async function activate(context: vscode.ExtensionContext) { | |||
98 | ctx.registerCommand('debugSingle', commands.debugSingle); | 98 | ctx.registerCommand('debugSingle', commands.debugSingle); |
99 | ctx.registerCommand('showReferences', commands.showReferences); | 99 | ctx.registerCommand('showReferences', commands.showReferences); |
100 | ctx.registerCommand('applySnippetWorkspaceEdit', commands.applySnippetWorkspaceEditCommand); | 100 | ctx.registerCommand('applySnippetWorkspaceEdit', commands.applySnippetWorkspaceEditCommand); |
101 | ctx.registerCommand('resolveCodeAction', commands.resolveCodeAction); | ||
101 | ctx.registerCommand('applyActionGroup', commands.applyActionGroup); | 102 | ctx.registerCommand('applyActionGroup', commands.applyActionGroup); |
102 | 103 | ||
103 | ctx.pushCleanup(activateTaskProvider(workspaceFolder)); | 104 | ctx.pushCleanup(activateTaskProvider(workspaceFolder)); |