Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 17:07:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: allow unwrap block in let initializers

Browse source
This commit is contained in:
feniljain 2022-12-05 08:37:31 +05:30
parent 26562973b3
commit 4794572e36
1 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
crates/ide-assists/src/handlers/unwrap_block.rs
View file

@ -37,7 +37,8 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option
parent = parent.ancestors().find(|it| ast::MatchExpr::can_cast(it.kind()))?
}
if matches!(parent.kind(), SyntaxKind::STMT_LIST | SyntaxKind::EXPR_STMT) {
if matches!(parent.kind(), SyntaxKind::STMT_LIST | SyntaxKind::EXPR_STMT | SyntaxKind::LET_STMT)
{
return acc.add(assist_id, assist_label, target, |builder| {
builder.replace(block.syntax().text_range(), update_expr_string(block.to_string()));
});
@ -713,6 +714,50 @@ fn main() -> i32 {
return 3;
5
}
"#,
);
}
#[test]
fn unwrap_block_in_let_initializers() {
// https://github.com/rust-lang/rust-analyzer/issues/13679
check_assist(
unwrap_block,
r#"
fn main() {
let x = {$0
bar
};
}
"#,
r#"
fn main() {
let x = bar;
}
"#,
);
}
#[test]
fn unwrap_if_in_let_initializers() {
// https://github.com/rust-lang/rust-analyzer/issues/13679
check_assist(
unwrap_block,
r#"
fn main() {
let a = 1;
let x = if a - 1 == 0 {$0
foo
} else {
bar
};
}
"#,
r#"
fn main() {
let a = 1;
let x = foo;
}
"#,
);
}