Merge #5116

5116: Categorize assists r=matklad a=kjeremy

Categorize assists so that editors can use them. Follows the LSP spec pretty close (and some things may need adjustments) but this populates the Refactor menu in vscode and pushes quickfixes through again.

This is a prerequisite to filtering out assists that the client doesn't care about.

Fixes #4147

Co-authored-by: Jeremy Kolb <[email protected]>
Co-authored-by: kjeremy <[email protected]>

1 files changed, 4 insertions, 2 deletions

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 3e5915c28..41ffac7b3 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -66,7 +66,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                         return Promise.resolve(null);
                     });
             },
-            // Using custom handling of CodeActions where each code action is resloved lazily
+            // Using custom handling of CodeActions where each code action is resolved lazily
             // That's why we are not waiting for any command or edits
             async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, _next: lc.ProvideCodeActionsSignature) {
                 const params: lc.CodeActionParams = {
@@ -87,7 +87,8 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                             continue;
                         }
                         assert(isCodeActionWithoutEditsAndCommands(item), "We don't expect edits or commands here");
-                        const action = new vscode.CodeAction(item.title);
+                        const kind = client.protocol2CodeConverter.asCodeActionKind((item as any).kind);
+                        const action = new vscode.CodeAction(item.title, kind);
                         const group = (item as any).group;
                         const id = (item as any).id;
                         const resolveParams: ra.ResolveCodeActionParams = {
@@ -116,6 +117,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                             result[index] = items[0];
                         } else {
                             const action = new vscode.CodeAction(group);
+                            action.kind = items[0].kind;
                             action.command = {
                                 command: "rust-analyzer.applyActionGroup",
                                 title: "",