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

Remove parentheses when inverting !(cond)

Browse source
This commit is contained in:
Jesse Bakker 2020-12-21 17:37:38 +01:00
parent 9bb9fbab3a
commit 2e7abf8384
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/assists/src/handlers/invert_if.rs
View file

@ -77,6 +77,15 @@ mod tests {
)
}
#[test]
fn invert_if_remove_not_parentheses() {
check_assist(
invert_if,
"fn f() { i<|>f !(x == 3 || x == 4 || x == 5) { 3 * 2 } else { 1 } }",
"fn f() { if x == 3 || x == 4 || x == 5 { 1 } else { 3 * 2 } }",
)
}
#[test]
fn invert_if_remove_inequality() {
check_assist(

8
crates/assists/src/utils.rs
View file

@ -232,7 +232,13 @@ fn invert_special_case(expr: &ast::Expr) -> Option<ast::Expr> {
};
Some(make::expr_method_call(receiver, method, arg_list))
}
ast::Expr::PrefixExpr(pe) if pe.op_kind()? == ast::PrefixOp::Not => pe.expr(),
ast::Expr::PrefixExpr(pe) if pe.op_kind()? == ast::PrefixOp::Not => {
if let ast::Expr::ParenExpr(parexpr) = pe.expr()? {
parexpr.expr()
} else {
pe.expr()
}
}
// FIXME:
// ast::Expr::Literal(true | false )
_ => None,