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/move_guard_to_arm_body.rs | 115 ------------------------ 1 file changed, 115 deletions(-) delete mode 100644 crates/ra_assists/src/move_guard_to_arm_body.rs (limited to 'crates/ra_assists/src/move_guard_to_arm_body.rs') diff --git a/crates/ra_assists/src/move_guard_to_arm_body.rs b/crates/ra_assists/src/move_guard_to_arm_body.rs deleted file mode 100644 index a8ca19f5d..000000000 --- a/crates/ra_assists/src/move_guard_to_arm_body.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