Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 05:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #8620

Browse source 
8620: Remove unnecessary braces for extracted block expression r=Veykril a=brandondong

This change addresses the first bullet point of https://github.com/rust-analyzer/rust-analyzer/issues/7839.

Specifically, when extracting block expressions, remove the unneeded extra braces inside the generated function.

Co-authored-by: Brandon <brandondong604@hotmail.com>
This commit is contained in:
bors[bot] 2021-04-22 15:22:43 +00:00 committed by GitHub
commit 0bb074aa26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
crates/ide_assists/src/handlers/extract_function.rs
View file

@ -1227,9 +1227,19 @@ fn make_body(
FunctionBody::Expr(expr) => { FunctionBody::Expr(expr) => {
let expr = rewrite_body_segment(ctx, &fun.params, &handler, expr.syntax()); let expr = rewrite_body_segment(ctx, &fun.params, &handler, expr.syntax());
let expr = ast::Expr::cast(expr).unwrap(); let expr = ast::Expr::cast(expr).unwrap();
let expr = expr.dedent(old_indent).indent(IndentLevel(1)); match expr {
ast::Expr::BlockExpr(block) => {
// If the extracted expression is itself a block, there is no need to wrap it inside another block.
let block = block.dedent(old_indent);
// Recreate the block for formatting consistency with other extracted functions.
make::block_expr(block.statements(), block.tail_expr())
}
_ => {
let expr = expr.dedent(old_indent).indent(IndentLevel(1));
make::block_expr(Vec::new(), Some(expr)) make::block_expr(Vec::new(), Some(expr))
}
}
} }
FunctionBody::Span { parent, text_range } => { FunctionBody::Span { parent, text_range } => {
let mut elements: Vec<_> = parent let mut elements: Vec<_> = parent
@ -1544,7 +1554,7 @@ fn foo() {
} }
fn $0fun_name() -> i32 { fn $0fun_name() -> i32 {
{ 1 + 1 } 1 + 1
}"#, }"#,
); );
} }
@ -2526,17 +2536,15 @@ fn foo() {
} }
fn $0fun_name(n: &mut i32) { fn $0fun_name(n: &mut i32) {
{ *n += *n;
*n += *n; bar(*n);
bar(*n); bar(*n+1);
bar(*n+1); bar(*n**n);
bar(*n**n); bar(&*n);
bar(&*n); n.inc();
n.inc(); let v = n;
let v = n; *v = v.succ();
*v = v.succ(); n.succ();
n.succ();
}
}", }",
); );
} }