From b98c16a034620913f3dbc67bd3f48ad2686face7 Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Sun, 28 Jun 2020 18:36:05 -0400
Subject: Categorize assists

---
 crates/ra_assists/src/handlers/merge_imports.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'crates/ra_assists/src/handlers/merge_imports.rs')

diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs
index ac0b3035c..b0458e17f 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/ra_assists/src/handlers/merge_imports.rs
@@ -8,7 +8,7 @@ use ra_syntax::{
 
 use crate::{
     assist_context::{AssistContext, Assists},
-    AssistId,
+    AssistId, AssistKind,
 };
 
 // Assist: merge_imports
@@ -56,9 +56,15 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
     };
 
     let target = tree.syntax().text_range();
-    acc.add(AssistId("merge_imports"), "Merge imports", target, |builder| {
-        builder.rewrite(rewriter);
-    })
+    acc.add(
+        AssistId("merge_imports"),
+        AssistKind::RefactorRewrite,
+        "Merge imports",
+        target,
+        |builder| {
+            builder.rewrite(rewriter);
+        },
+    )
 }
 
 fn next_prev() -> impl Iterator<Item = Direction> {
-- 
cgit v1.2.3


From 36cc81ac71e4246bf58a3758735cc68f7adb5e0f Mon Sep 17 00:00:00 2001
From: kjeremy <kjeremy@gmail.com>
Date: Thu, 2 Jul 2020 17:48:35 -0400
Subject: Move AssistKind into AssistId

---
 crates/ra_assists/src/handlers/merge_imports.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'crates/ra_assists/src/handlers/merge_imports.rs')

diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs
index b0458e17f..1beccb61c 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/ra_assists/src/handlers/merge_imports.rs
@@ -57,8 +57,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
 
     let target = tree.syntax().text_range();
     acc.add(
-        AssistId("merge_imports"),
-        AssistKind::RefactorRewrite,
+        AssistId("merge_imports", AssistKind::RefactorRewrite),
         "Merge imports",
         target,
         |builder| {
-- 
cgit v1.2.3