From b98c16a034620913f3dbc67bd3f48ad2686face7 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 28 Jun 2020 18:36:05 -0400 Subject: Categorize assists --- crates/ra_assists/src/handlers/move_guard.rs | 29 +++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'crates/ra_assists/src/handlers/move_guard.rs') diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs index 7edcf0748..7f3aaf4f7 100644 --- a/crates/ra_assists/src/handlers/move_guard.rs +++ b/crates/ra_assists/src/handlers/move_guard.rs @@ -3,7 +3,7 @@ use ra_syntax::{ SyntaxKind::WHITESPACE, }; -use crate::{AssistContext, AssistId, Assists}; +use crate::{AssistContext, AssistId, AssistKind, Assists}; // Assist: move_guard_to_arm_body // @@ -40,17 +40,23 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) -> let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text()); let target = guard.syntax().text_range(); - acc.add(AssistId("move_guard_to_arm_body"), "Move guard to arm body", target, |edit| { - match space_before_guard { - Some(element) if element.kind() == WHITESPACE => { - edit.delete(element.text_range()); - } - _ => (), - }; + acc.add( + AssistId("move_guard_to_arm_body"), + AssistKind::RefactorExtract, + "Move guard to arm body", + target, + |edit| { + match space_before_guard { + Some(element) if element.kind() == WHITESPACE => { + edit.delete(element.text_range()); + } + _ => (), + }; - edit.delete(guard.syntax().text_range()); - edit.replace_node_and_indent(arm_expr.syntax(), buf); - }) + edit.delete(guard.syntax().text_range()); + edit.replace_node_and_indent(arm_expr.syntax(), buf); + }, + ) } // Assist: move_arm_cond_to_match_guard @@ -101,6 +107,7 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex let target = if_expr.syntax().text_range(); acc.add( AssistId("move_arm_cond_to_match_guard"), + AssistKind::RefactorRewrite, "Move condition to match guard", target, |edit| { -- cgit v1.2.3 From 1d58e168246e1ca64f3ce3936e90077922b82d05 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Thu, 2 Jul 2020 17:14:15 -0400 Subject: Recategorize a few --- crates/ra_assists/src/handlers/move_guard.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_assists/src/handlers/move_guard.rs') diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs index 7f3aaf4f7..77c1b66be 100644 --- a/crates/ra_assists/src/handlers/move_guard.rs +++ b/crates/ra_assists/src/handlers/move_guard.rs @@ -42,7 +42,7 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) -> let target = guard.syntax().text_range(); acc.add( AssistId("move_guard_to_arm_body"), - AssistKind::RefactorExtract, + AssistKind::RefactorRewrite, "Move guard to arm body", target, |edit| { -- cgit v1.2.3 From 36cc81ac71e4246bf58a3758735cc68f7adb5e0f Mon Sep 17 00:00:00 2001 From: kjeremy Date: Thu, 2 Jul 2020 17:48:35 -0400 Subject: Move AssistKind into AssistId --- crates/ra_assists/src/handlers/move_guard.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crates/ra_assists/src/handlers/move_guard.rs') diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs index 77c1b66be..4060d34c6 100644 --- a/crates/ra_assists/src/handlers/move_guard.rs +++ b/crates/ra_assists/src/handlers/move_guard.rs @@ -41,8 +41,7 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) -> let target = guard.syntax().text_range(); acc.add( - AssistId("move_guard_to_arm_body"), - AssistKind::RefactorRewrite, + AssistId("move_guard_to_arm_body", AssistKind::RefactorRewrite), "Move guard to arm body", target, |edit| { @@ -106,8 +105,7 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex let target = if_expr.syntax().text_range(); acc.add( - AssistId("move_arm_cond_to_match_guard"), - AssistKind::RefactorRewrite, + AssistId("move_arm_cond_to_match_guard", AssistKind::RefactorRewrite), "Move condition to match guard", target, |edit| { -- cgit v1.2.3