mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-01 11:31:15 +00:00
fix parens when inlining closure in body of function
This commit is contained in:
parent
60f7473c99
commit
ea11846490
@ -481,8 +481,12 @@ fn inline(
|
|||||||
};
|
};
|
||||||
body.reindent_to(original_indentation);
|
body.reindent_to(original_indentation);
|
||||||
|
|
||||||
|
let no_stmts = body.statements().next().is_none();
|
||||||
match body.tail_expr() {
|
match body.tail_expr() {
|
||||||
Some(expr) if !is_async_fn && body.statements().next().is_none() => expr,
|
Some(expr) if matches!(expr, ast::Expr::ClosureExpr(_)) && no_stmts => {
|
||||||
|
make::expr_paren(expr).clone_for_update()
|
||||||
|
}
|
||||||
|
Some(expr) if !is_async_fn && no_stmts => expr,
|
||||||
_ => match node
|
_ => match node
|
||||||
.syntax()
|
.syntax()
|
||||||
.parent()
|
.parent()
|
||||||
@ -1471,6 +1475,31 @@ fn main() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
"#,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn inline_call_closure_body() {
|
||||||
|
check_assist(
|
||||||
|
inline_call,
|
||||||
|
r#"
|
||||||
|
fn f() -> impl Fn() -> i32 {
|
||||||
|
|| 2
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = $0f()();
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
r#"
|
||||||
|
fn f() -> impl Fn() -> i32 {
|
||||||
|
|| 2
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = (|| 2)();
|
||||||
|
}
|
||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user