Merge #9514

9514: internal: Invert boolean literals in assist negation logic r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <[email protected]>

Author: bors[bot]

crates/ide_assists/src/handlers/auto_import.rs

@@ -144,6 +144,7 @@ fn group_label(import_candidate: &ImportCandidate) -> GroupLabel {
 #[cfg(test)]
 mod tests {
     use super::*;
+
     use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
 
     #[test]

crates/ide_assists/src/handlers/early_return.rs

@@ -211,7 +211,7 @@ mod tests {
             r#"
             fn main() {
                 bar();
-                if !true {
+                if false {
                     return;
                 }
                 foo();
@@ -387,7 +387,7 @@ mod tests {
             r#"
             fn main() {
                 while true {
-                    if !true {
+                    if false {
                         continue;
                     }
                     foo();
@@ -444,7 +444,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if !true {
+                    if false {
                         continue;
                     }
                     foo();

crates/ide_assists/src/handlers/inline_local_variable.rs

@@ -65,35 +65,35 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
                         Some(u) => u,
                         None => return Some(false),
                     };
-                    Some(
-                        !(matches!(
-                            initializer_expr,
-                            ast::Expr::CallExpr(_)
-                                | ast::Expr::IndexExpr(_)
-                                | ast::Expr::MethodCallExpr(_)
-                                | ast::Expr::FieldExpr(_)
-                                | ast::Expr::TryExpr(_)
-                                | ast::Expr::RefExpr(_)
-                                | ast::Expr::Literal(_)
-                                | ast::Expr::TupleExpr(_)
-                                | ast::Expr::ArrayExpr(_)
-                                | ast::Expr::ParenExpr(_)
-                                | ast::Expr::PathExpr(_)
-                                | ast::Expr::BlockExpr(_)
-                                | ast::Expr::EffectExpr(_),
-                        ) || matches!(
-                            usage_parent,
-                            ast::Expr::CallExpr(_)
-                                | ast::Expr::TupleExpr(_)
-                                | ast::Expr::ArrayExpr(_)
-                                | ast::Expr::ParenExpr(_)
-                                | ast::Expr::ForExpr(_)
-                                | ast::Expr::WhileExpr(_)
-                                | ast::Expr::BreakExpr(_)
-                                | ast::Expr::ReturnExpr(_)
-                                | ast::Expr::MatchExpr(_)
-                        )),
-                    )
+                    let initializer = matches!(
+                        initializer_expr,
+                        ast::Expr::CallExpr(_)
+                            | ast::Expr::IndexExpr(_)
+                            | ast::Expr::MethodCallExpr(_)
+                            | ast::Expr::FieldExpr(_)
+                            | ast::Expr::TryExpr(_)
+                            | ast::Expr::RefExpr(_)
+                            | ast::Expr::Literal(_)
+                            | ast::Expr::TupleExpr(_)
+                            | ast::Expr::ArrayExpr(_)
+                            | ast::Expr::ParenExpr(_)
+                            | ast::Expr::PathExpr(_)
+                            | ast::Expr::BlockExpr(_)
+                            | ast::Expr::EffectExpr(_),
+                    );
+                    let parent = matches!(
+                        usage_parent,
+                        ast::Expr::CallExpr(_)
+                            | ast::Expr::TupleExpr(_)
+                            | ast::Expr::ArrayExpr(_)
+                            | ast::Expr::ParenExpr(_)
+                            | ast::Expr::ForExpr(_)
+                            | ast::Expr::WhileExpr(_)
+                            | ast::Expr::BreakExpr(_)
+                            | ast::Expr::ReturnExpr(_)
+                            | ast::Expr::MatchExpr(_)
+                    );
+                    Some(!(initializer || parent))
                 })
                 .collect::<Option<_>>()
                 .map(|b| (file_id, b))

crates/ide_assists/src/handlers/invert_if.rs

@@ -11,7 +11,6 @@ use crate::{
 
 // Assist: invert_if
 //
-// Apply invert_if
 // This transforms if expressions of the form `if !x {A} else {B}` into `if x {B} else {A}`
 // This also works with `!=`. This assist can only be applied with the cursor
 // on `if`.

crates/ide_assists/src/handlers/replace_let_with_if_let.rs

@@ -41,15 +41,16 @@ pub(crate) fn replace_let_with_if_let(acc: &mut Assists, ctx: &AssistContext) ->
     let let_stmt = let_kw.ancestors().find_map(ast::LetStmt::cast)?;
     let init = let_stmt.initializer()?;
     let original_pat = let_stmt.pat()?;
-    let ty = ctx.sema.type_of_expr(&init)?;
-    let happy_variant = TryEnum::from_ty(&ctx.sema, &ty).map(|it| it.happy_case());
 
     let target = let_kw.text_range();
     acc.add(
         AssistId("replace_let_with_if_let", AssistKind::RefactorRewrite),
         "Replace with if-let",
         target,
         |edit| {
+            let ty = ctx.sema.type_of_expr(&init);
+            let happy_variant =
+                ty.and_then(|ty| TryEnum::from_ty(&ctx.sema, &ty)).map(|it| it.happy_case());
             let pat = match happy_variant {
                 None => original_pat,
                 Some(var_name) => {

crates/ide_assists/src/utils.rs

@@ -4,7 +4,6 @@ pub(crate) mod suggest_name;
 
 use std::ops;
 
-use ast::TypeBoundsOwner;
 use hir::{Adt, HasSource, Semantics};
 use ide_db::{
     helpers::{FamousDefs, SnippetCap},
@@ -14,10 +13,11 @@ use ide_db::{
 use itertools::Itertools;
 use stdx::format_to;
 use syntax::{
-    ast::edit::AstNodeEdit,
-    ast::AttrsOwner,
-    ast::NameOwner,
-    ast::{self, edit, make, ArgListOwner, GenericParamsOwner},
+    ast::{
+        self,
+        edit::{self, AstNodeEdit},
+        make, ArgListOwner, AttrsOwner, GenericParamsOwner, NameOwner, TypeBoundsOwner,
+    },
     ted, AstNode, Direction, SmolStr,
     SyntaxKind::*,
     SyntaxNode, TextSize, T,
@@ -70,11 +70,7 @@ pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
 pub fn test_related_attribute(fn_def: &ast::Fn) -> Option<ast::Attr> {
     fn_def.attrs().find_map(|attr| {
         let path = attr.path()?;
-        if path.syntax().text().to_string().contains("test") {
-            Some(attr)
-        } else {
-            None
-        }
+        path.syntax().text().to_string().contains("test").then(|| attr)
     })
 }
 
@@ -216,10 +212,7 @@ pub(crate) fn invert_boolean_expression(
     sema: &Semantics<RootDatabase>,
     expr: ast::Expr,
 ) -> ast::Expr {
-    if let Some(expr) = invert_special_case(sema, &expr) {
-        return expr;
-    }
-    make::expr_prefix(T![!], expr)
+    invert_special_case(sema, &expr).unwrap_or_else(|| make::expr_prefix(T![!], expr))
 }
 
 fn invert_special_case(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<ast::Expr> {
@@ -264,8 +257,13 @@ fn invert_special_case(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Opti
                 pe.expr()
             }
         }
-        // FIXME:
-        // ast::Expr::Literal(true | false )
+        ast::Expr::Literal(lit) => match lit.kind() {
+            ast::LiteralKind::Bool(b) => match b {
+                true => Some(ast::Expr::Literal(make::expr_literal("false"))),
+                false => Some(ast::Expr::Literal(make::expr_literal("true"))),
+            },
+            _ => None,
+        },
         _ => None,
     }
 }