simplify

Author: matklad

crates/ide_assists/src/handlers/replace_let_with_if_let.rs

@@ -50,22 +50,19 @@ pub(crate) fn replace_let_with_if_let(acc: &mut Assists, ctx: &AssistContext) ->
         "Replace with if-let",
         target,
         |edit| {
-            let with_placeholder: ast::Pat = match happy_variant {
-                None => make::wildcard_pat().into(),
-                Some(var_name) => make::tuple_struct_pat(
-                    make::ext::ident_path(var_name),
-                    once(make::wildcard_pat().into()),
-                )
-                .into(),
+            let pat = match happy_variant {
+                None => original_pat,
+                Some(var_name) => {
+                    make::tuple_struct_pat(make::ext::ident_path(var_name), once(original_pat))
+                        .into()
+                }
             };
+
             let block =
-                make::block_expr(None, None).indent(IndentLevel::from_node(let_stmt.syntax()));
-            let if_ = make::expr_if(make::condition(init, Some(with_placeholder)), block, None);
+                make::ext::empty_block_expr().indent(IndentLevel::from_node(let_stmt.syntax()));
+            let if_ = make::expr_if(make::condition(init, Some(pat)), block, None);
             let stmt = make::expr_stmt(if_);
 
-            let placeholder = stmt.syntax().descendants().find_map(ast::WildcardPat::cast).unwrap();
-            let stmt = stmt.replace_descendant(placeholder.into(), original_pat);
-
             edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt));
         },
     )

crates/syntax/src/ast/make.rs

@@ -31,6 +31,9 @@ pub mod ext {
     pub fn expr_todo() -> ast::Expr {
         expr_from_text("todo!()")
     }
+    pub fn empty_block_expr() -> ast::BlockExpr {
+        block_expr(None, None)
+    }
 
     pub fn ty_bool() -> ast::Type {
         ty_path(ident_path("bool"))