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, 24 insertions, 19 deletions

diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs
index 5b1235682..511355e07 100644
--- a/crates/ra_assists/src/handlers/fill_match_arms.rs
+++ b/crates/ra_assists/src/handlers/fill_match_arms.rs
@@ -8,7 +8,7 @@ use test_utils::mark;
 
 use crate::{
     utils::{render_snippet, Cursor, FamousDefs},
-    AssistContext, AssistId, Assists,
+    AssistContext, AssistId, AssistKind, Assists,
 };
 
 // Assist: fill_match_arms
@@ -103,24 +103,29 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<
     }
 
     let target = match_expr.syntax().text_range();
-    acc.add(AssistId("fill_match_arms"), "Fill match arms", target, |builder| {
-        let new_arm_list = match_arm_list.remove_placeholder();
-        let n_old_arms = new_arm_list.arms().count();
-        let new_arm_list = new_arm_list.append_arms(missing_arms);
-        let first_new_arm = new_arm_list.arms().nth(n_old_arms);
-        let old_range = match_arm_list.syntax().text_range();
-        match (first_new_arm, ctx.config.snippet_cap) {
-            (Some(first_new_arm), Some(cap)) => {
-                let snippet = render_snippet(
-                    cap,
-                    new_arm_list.syntax(),
-                    Cursor::Before(first_new_arm.syntax()),
-                );
-                builder.replace_snippet(cap, old_range, snippet);
-            }
-            _ => builder.replace(old_range, new_arm_list.to_string()),
-        }
-    })
+    acc.add(
+        AssistId("fill_match_arms", AssistKind::QuickFix),
+        "Fill match arms",
+        target,
+        |builder| {
+            let new_arm_list = match_arm_list.remove_placeholder();
+            let n_old_arms = new_arm_list.arms().count();
+            let new_arm_list = new_arm_list.append_arms(missing_arms);
+            let first_new_arm = new_arm_list.arms().nth(n_old_arms);
+            let old_range = match_arm_list.syntax().text_range();
+            match (first_new_arm, ctx.config.snippet_cap) {
+                (Some(first_new_arm), Some(cap)) => {
+                    let snippet = render_snippet(
+                        cap,
+                        new_arm_list.syntax(),
+                        Cursor::Before(first_new_arm.syntax()),
+                    );
+                    builder.replace_snippet(cap, old_range, snippet);
+                }
+                _ => builder.replace(old_range, new_arm_list.to_string()),
+            }
+        },
+    )
 }
 
 fn is_variant_missing(existing_arms: &mut Vec<MatchArm>, var: &Pat) -> bool {