mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add comma for "move if to guard"

Browse Source
This commit is contained in:
Wang Ruochen 2021-12-15 15:26:24 -08:00
parent 4ec6bd6206
commit ee079561b1
No known key found for this signature in database
GPG Key ID: C6DEA570A3B026FC
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
crates/ide_assists/src/handlers/move_guard.rs
View File

@ -135,7 +135,15 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex
match &then_block.tail_expr() {
Some(then_expr) if then_only_expr => {
edit.replace(replace_node.text_range(), then_expr.syntax().text())
edit.replace(replace_node.text_range(), then_expr.syntax().text());
// Insert comma for expression if there isn't one
match match_arm.syntax().last_child_or_token() {
Some(NodeOrToken::Token(t)) if t.kind() == COMMA => {}
_ => {
cov_mark::hit!(move_guard_if_add_comma);
edit.insert(match_arm.syntax().text_range().end(), ",");
}
}
}
_ if replace_node != *if_expr.syntax() => {
// Dedent because if_expr is in a BlockExpr
@ -150,13 +158,6 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex
// If with only an else branch
if let Some(ElseBranch::Block(else_block)) = if_expr.else_branch() {
let then_arm_end = match_arm.syntax().text_range().end();
if then_block.tail_expr().is_some() && then_only_expr {
// Insert comma for expression if there isn't one
match match_arm.syntax().last_child_or_token() {
Some(NodeOrToken::Token(t)) if t.kind() == COMMA => {}
_ => edit.insert(then_arm_end, ","),
}
}
let else_only_expr = else_block.statements().next().is_none();
let indent_level = match_arm.indent_level();
let spaces = " ".repeat(indent_level.0 as _);
@ -318,6 +319,34 @@ fn main() {
);
}
#[test]
fn move_arm_cond_in_block_to_match_guard_add_comma_works() {
cov_mark::check!(move_guard_if_add_comma);
check_assist(
move_arm_cond_to_match_guard,
r#"
fn main() {
match 92 {
x => {
$0if x > 10 {
false
}
}
_ => true
}
}
"#,
r#"
fn main() {
match 92 {
x if x > 10 => false,
_ => true
}
}
"#,
);
}
#[test]
fn move_arm_cond_to_match_guard_if_let_not_works() {
check_assist_not_applicable(