From 99ad6143cdbd783e969649d9243aaa2e5a8131c4 Mon Sep 17 00:00:00 2001 From: Unreal Hoang Date: Thu, 16 May 2019 12:53:52 +0900 Subject: rename --- crates/ra_assists/src/lib.rs | 4 +- crates/ra_assists/src/move_guard_to_arm_body.rs | 115 --------------------- .../src/move_guard_to_arm_body_and_back.rs | 115 +++++++++++++++++++++ 3 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 crates/ra_assists/src/move_guard_to_arm_body.rs create mode 100644 crates/ra_assists/src/move_guard_to_arm_body_and_back.rs (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index ae97a1ab5..70197e3cd 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -100,7 +100,7 @@ mod split_import; mod remove_dbg; pub mod auto_import; mod add_missing_impl_members; -mod move_guard_to_arm_body; +mod move_guard_to_arm_body_and_back; fn all_assists() -> &'static [fn(AssistCtx) -> Option] { &[ @@ -119,7 +119,7 @@ fn all_assists() -> &'static [fn(AssistCtx) -> Option) -> Option { - let match_arm = ctx.node_at_offset::()?; - let guard = match_arm.guard()?; - let space_before_guard = guard.syntax().prev_sibling_or_token(); - - let guard_conditions = guard.expr()?; - let arm_expr = match_arm.expr()?; - let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text()); - - ctx.add_action(AssistId("move_guard_to_arm_body"), "move guard to arm body", |edit| { - edit.target(guard.syntax().range()); - let offseting_amount = match space_before_guard { - Some(SyntaxElement::Token(tok)) => { - if let Some(_) = ast::Whitespace::cast(tok) { - let ele = space_before_guard.unwrap().range(); - edit.delete(ele); - ele.len() - } else { - TextUnit::from(0) - } - } - _ => TextUnit::from(0), - }; - - edit.delete(guard.syntax().range()); - edit.replace_node_and_indent(arm_expr.syntax(), buf); - edit.set_cursor(arm_expr.syntax().range().start() + TextUnit::from(3) - offseting_amount); - }); - ctx.build() -} - -#[cfg(test)] -mod tests { - use super::*; - - use crate::helpers::{ check_assist, check_assist_target }; - - #[test] - fn move_guard_to_arm_body_target() { - check_assist_target( - move_guard_to_arm_body, - r#" - fn f() { - let t = 'a'; - let chars = "abcd"; - match t { - '\r' <|>if chars.clone().next() == Some('\n') => false, - _ => true - } - } - "#, - r#"if chars.clone().next() == Some('\n')"#, - ); - } - - #[test] - fn move_guard_to_arm_body_works() { - check_assist( - move_guard_to_arm_body, - r#" - fn f() { - let t = 'a'; - let chars = "abcd"; - match t { - '\r' <|>if chars.clone().next() == Some('\n') => false, - _ => true - } - } - "#, - r#" - fn f() { - let t = 'a'; - let chars = "abcd"; - match t { - '\r' => if chars.clone().next() == Some('\n') { <|>false }, - _ => true - } - } - "#, - ); - } - - #[test] - fn move_guard_to_arm_body_works_complex_match() { - check_assist( - move_guard_to_arm_body, - r#" - fn f() { - match x { - <|>y @ 4 | y @ 5 if y > 5 => true, - _ => false - } - } - "#, - r#" - fn f() { - match x { - y @ 4 | y @ 5 => if y > 5 { <|>true }, - _ => false - } - } - "#, - ); - } -} diff --git a/crates/ra_assists/src/move_guard_to_arm_body_and_back.rs b/crates/ra_assists/src/move_guard_to_arm_body_and_back.rs new file mode 100644 index 000000000..a8ca19f5d --- /dev/null +++ b/crates/ra_assists/src/move_guard_to_arm_body_and_back.rs @@ -0,0 +1,115 @@ +use hir::db::HirDatabase; +use ra_syntax::{ + TextUnit, + SyntaxElement, + ast::{MatchArm, AstNode, AstToken}, + ast, +}; + +use crate::{AssistCtx, Assist, AssistId}; + +pub(crate) fn move_guard_to_arm_body(mut ctx: AssistCtx) -> Option { + let match_arm = ctx.node_at_offset::()?; + let guard = match_arm.guard()?; + let space_before_guard = guard.syntax().prev_sibling_or_token(); + + let guard_conditions = guard.expr()?; + let arm_expr = match_arm.expr()?; + let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text()); + + ctx.add_action(AssistId("move_guard_to_arm_body"), "move guard to arm body", |edit| { + edit.target(guard.syntax().range()); + let offseting_amount = match space_before_guard { + Some(SyntaxElement::Token(tok)) => { + if let Some(_) = ast::Whitespace::cast(tok) { + let ele = space_before_guard.unwrap().range(); + edit.delete(ele); + ele.len() + } else { + TextUnit::from(0) + } + } + _ => TextUnit::from(0), + }; + + edit.delete(guard.syntax().range()); + edit.replace_node_and_indent(arm_expr.syntax(), buf); + edit.set_cursor(arm_expr.syntax().range().start() + TextUnit::from(3) - offseting_amount); + }); + ctx.build() +} + +#[cfg(test)] +mod tests { + use super::*; + + use crate::helpers::{ check_assist, check_assist_target }; + + #[test] + fn move_guard_to_arm_body_target() { + check_assist_target( + move_guard_to_arm_body, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next() == Some('\n') => false, + _ => true + } + } + "#, + r#"if chars.clone().next() == Some('\n')"#, + ); + } + + #[test] + fn move_guard_to_arm_body_works() { + check_assist( + move_guard_to_arm_body, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next() == Some('\n') => false, + _ => true + } + } + "#, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' => if chars.clone().next() == Some('\n') { <|>false }, + _ => true + } + } + "#, + ); + } + + #[test] + fn move_guard_to_arm_body_works_complex_match() { + check_assist( + move_guard_to_arm_body, + r#" + fn f() { + match x { + <|>y @ 4 | y @ 5 if y > 5 => true, + _ => false + } + } + "#, + r#" + fn f() { + match x { + y @ 4 | y @ 5 => if y > 5 { <|>true }, + _ => false + } + } + "#, + ); + } +} -- cgit v1.2.3 From 08e954f0fd35f4f5f847dba7921d48dc4aa669c0 Mon Sep 17 00:00:00 2001 From: Unreal Hoang Date: Thu, 16 May 2019 12:54:32 +0900 Subject: add assist to move arm condition to match guard --- crates/ra_assists/src/lib.rs | 5 +- crates/ra_assists/src/move_guard.rs | 260 +++++++++++++++++++++ .../src/move_guard_to_arm_body_and_back.rs | 115 --------- 3 files changed, 263 insertions(+), 117 deletions(-) create mode 100644 crates/ra_assists/src/move_guard.rs delete mode 100644 crates/ra_assists/src/move_guard_to_arm_body_and_back.rs (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index 70197e3cd..28eb0226b 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -100,7 +100,7 @@ mod split_import; mod remove_dbg; pub mod auto_import; mod add_missing_impl_members; -mod move_guard_to_arm_body_and_back; +mod move_guard; fn all_assists() -> &'static [fn(AssistCtx) -> Option] { &[ @@ -119,7 +119,8 @@ fn all_assists() -> &'static [fn(AssistCtx) -> Option) -> Option { + let match_arm = ctx.node_at_offset::()?; + let guard = match_arm.guard()?; + let space_before_guard = guard.syntax().prev_sibling_or_token(); + + let guard_conditions = guard.expr()?; + let arm_expr = match_arm.expr()?; + let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text()); + + ctx.add_action(AssistId("move_guard_to_arm_body"), "move guard to arm body", |edit| { + edit.target(guard.syntax().range()); + let offseting_amount = match space_before_guard { + Some(SyntaxElement::Token(tok)) => { + if let Some(_) = ast::Whitespace::cast(tok) { + let ele = space_before_guard.unwrap().range(); + edit.delete(ele); + ele.len() + } else { + TextUnit::from(0) + } + } + _ => TextUnit::from(0), + }; + + edit.delete(guard.syntax().range()); + edit.replace_node_and_indent(arm_expr.syntax(), buf); + edit.set_cursor(arm_expr.syntax().range().start() + TextUnit::from(3) - offseting_amount); + }); + ctx.build() +} + +pub(crate) fn move_arm_cond_to_match_guard(mut ctx: AssistCtx) -> Option { + let match_arm: &MatchArm = ctx.node_at_offset::()?; + let last_match_pat = match_arm.pats().last()?; + + let arm_body = match_arm.expr()?; + let if_expr: &IfExpr = IfExpr::cast(arm_body.syntax())?; + let cond = if_expr.condition()?; + let then_block = if_expr.then_branch()?; + + // Not support if with else branch + if let Some(_) = if_expr.else_branch() { + return None; + } + // Not support moving if let to arm guard + if let Some(_) = cond.pat() { + return None; + } + + let buf = format!(" if {}", cond.syntax().text()); + + ctx.add_action( + AssistId("move_arm_cond_to_match_guard"), + "move condition to match guard", + |edit| { + edit.target(if_expr.syntax().range()); + let then_only_expr = then_block.statements().next().is_none(); + + match then_block.expr() { + Some(then_expr) if then_only_expr => { + edit.replace(if_expr.syntax().range(), then_expr.syntax().text()) + } + _ => edit.replace(if_expr.syntax().range(), then_block.syntax().text()), + } + + edit.insert(last_match_pat.syntax().range().end(), buf); + edit.set_cursor(last_match_pat.syntax().range().end() + TextUnit::from(1)); + }, + ); + ctx.build() +} + +#[cfg(test)] +mod tests { + use super::*; + + use crate::helpers::{ check_assist, check_assist_target, check_assist_not_applicable }; + + #[test] + fn move_guard_to_arm_body_target() { + check_assist_target( + move_guard_to_arm_body, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next() == Some('\n') => false, + _ => true + } + } + "#, + r#"if chars.clone().next() == Some('\n')"#, + ); + } + + #[test] + fn move_guard_to_arm_body_works() { + check_assist( + move_guard_to_arm_body, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next() == Some('\n') => false, + _ => true + } + } + "#, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' => if chars.clone().next() == Some('\n') { <|>false }, + _ => true + } + } + "#, + ); + } + + #[test] + fn move_guard_to_arm_body_works_complex_match() { + check_assist( + move_guard_to_arm_body, + r#" + fn f() { + match x { + <|>y @ 4 | y @ 5 if y > 5 => true, + _ => false + } + } + "#, + r#" + fn f() { + match x { + y @ 4 | y @ 5 => if y > 5 { <|>true }, + _ => false + } + } + "#, + ); + } + + #[test] + fn move_arm_cond_to_match_guard_works() { + check_assist( + move_arm_cond_to_match_guard, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' => if chars.clone().next() == Some('\n') { <|>false }, + _ => true + } + } + "#, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next() == Some('\n') => false, + _ => true + } + } + "#, + ); + } + + #[test] + fn move_arm_cond_to_match_guard_if_let_not_works() { + check_assist_not_applicable( + move_arm_cond_to_match_guard, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' => if let Some(_) = chars.clone().next() { <|>false }, + _ => true + } + } + "#, + ); + } + + #[test] + fn move_arm_cond_to_match_guard_if_empty_body_works() { + check_assist( + move_arm_cond_to_match_guard, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' => if chars.clone().next().is_some() { <|> }, + _ => true + } + } + "#, + r#" + fn f() { + let t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next().is_some() => { }, + _ => true + } + } + "#, + ); + } + + #[test] + fn move_arm_cond_to_match_guard_if_multiline_body_works() { + check_assist( + move_arm_cond_to_match_guard, + r#" + fn f() { + let mut t = 'a'; + let chars = "abcd"; + match t { + '\r' => if chars.clone().next().is_some() { + t = 'e';<|> + false + }, + _ => true + } + } + "#, + r#" + fn f() { + let mut t = 'a'; + let chars = "abcd"; + match t { + '\r' <|>if chars.clone().next().is_some() => { + t = 'e'; + false + }, + _ => true + } + } + "#, + ); + } +} diff --git a/crates/ra_assists/src/move_guard_to_arm_body_and_back.rs b/crates/ra_assists/src/move_guard_to_arm_body_and_back.rs deleted file mode 100644 index a8ca19f5d..000000000 --- a/crates/ra_assists/src/move_guard_to_arm_body_and_back.rs +++ /dev/null @@ -1,115 +0,0 @@ -use hir::db::HirDatabase; -use ra_syntax::{ - TextUnit, - SyntaxElement, - ast::{MatchArm, AstNode, AstToken}, - ast, -}; - -use crate::{AssistCtx, Assist, AssistId}; - -pub(crate) fn move_guard_to_arm_body(mut ctx: AssistCtx) -> Option { - let match_arm = ctx.node_at_offset::()?; - let guard = match_arm.guard()?; - let space_before_guard = guard.syntax().prev_sibling_or_token(); - - let guard_conditions = guard.expr()?; - let arm_expr = match_arm.expr()?; - let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text()); - - ctx.add_action(AssistId("move_guard_to_arm_body"), "move guard to arm body", |edit| { - edit.target(guard.syntax().range()); - let offseting_amount = match space_before_guard { - Some(SyntaxElement::Token(tok)) => { - if let Some(_) = ast::Whitespace::cast(tok) { - let ele = space_before_guard.unwrap().range(); - edit.delete(ele); - ele.len() - } else { - TextUnit::from(0) - } - } - _ => TextUnit::from(0), - }; - - edit.delete(guard.syntax().range()); - edit.replace_node_and_indent(arm_expr.syntax(), buf); - edit.set_cursor(arm_expr.syntax().range().start() + TextUnit::from(3) - offseting_amount); - }); - ctx.build() -} - -#[cfg(test)] -mod tests { - use super::*; - - use crate::helpers::{ check_assist, check_assist_target }; - - #[test] - fn move_guard_to_arm_body_target() { - check_assist_target( - move_guard_to_arm_body, - r#" - fn f() { - let t = 'a'; - let chars = "abcd"; - match t { - '\r' <|>if chars.clone().next() == Some('\n') => false, - _ => true - } - } - "#, - r#"if chars.clone().next() == Some('\n')"#, - ); - } - - #[test] - fn move_guard_to_arm_body_works() { - check_assist( - move_guard_to_arm_body, - r#" - fn f() { - let t = 'a'; - let chars = "abcd"; - match t { - '\r' <|>if chars.clone().next() == Some('\n') => false, - _ => true - } - } - "#, - r#" - fn f() { - let t = 'a'; - let chars = "abcd"; - match t { - '\r' => if chars.clone().next() == Some('\n') { <|>false }, - _ => true - } - } - "#, - ); - } - - #[test] - fn move_guard_to_arm_body_works_complex_match() { - check_assist( - move_guard_to_arm_body, - r#" - fn f() { - match x { - <|>y @ 4 | y @ 5 if y > 5 => true, - _ => false - } - } - "#, - r#" - fn f() { - match x { - y @ 4 | y @ 5 => if y > 5 { <|>true }, - _ => false - } - } - "#, - ); - } -} -- cgit v1.2.3