Merge pull request #22759 from Wilfred/fix/syntax-factory-mapping-unwraps

Fix crashes in assists due to .unwrap() calls in SyntaxFactory

Author: A4-Tacks

src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_closure_to_fn.rs

@@ -738,6 +738,25 @@ fn main() {
         );
     }
 
+    #[test]
+    fn handles_closures_with_unannotated_rest_patterns() {
+        check_assist(
+            convert_closure_to_fn,
+            r#"
+fn main() {
+    let closure = |$0..| ();
+}
+"#,
+            r#"
+fn main() {
+    fn closure(..: _) {
+        ()
+    }
+}
+"#,
+        );
+    }
+
     #[test]
     fn multiple_capture_usages() {
         check_assist(

src/tools/rust-analyzer/crates/ide-assists/src/handlers/unwrap_branch.rs

@@ -831,6 +831,25 @@ fn main() {
         );
     }
 
+    #[test]
+    fn regression_22759() {
+        check_assist(
+            unwrap_branch,
+            r#"
+fn main() {
+    match () {
+        () $0=> let x = (),
+    }
+}
+"#,
+            r#"
+fn main() {
+    let x = ()
+}
+"#,
+        );
+    }
+
     #[test]
     fn simple_if_in_while_bad_cursor_position() {
         check_assist_not_applicable(

src/tools/rust-analyzer/crates/syntax/src/ast/make.rs

@@ -565,7 +565,17 @@ pub fn async_move_block_expr(
 }
 
 pub fn tail_only_block_expr(tail_expr: ast::Expr) -> ast::BlockExpr {
-    ast_from_text(&format!("fn f() {{ {tail_expr} }}"))
+    quote! {
+        BlockExpr {
+            StmtList {
+                ['{']
+                " "
+                #tail_expr
+                " "
+                ['}']
+            }
+        }
+    }
 }
 
 /// Ideally this function wouldn't exist since it involves manual indenting.
@@ -1043,7 +1053,14 @@ pub fn untyped_param(pat: ast::Pat) -> ast::Param {
 }
 
 pub fn param(pat: ast::Pat, ty: ast::Type) -> ast::Param {
-    ast_from_text(&format!("fn f({pat}: {ty}) {{ }}"))
+    quote! {
+        Param {
+            #pat
+            [:]
+            " "
+            #ty
+        }
+    }
 }
 
 pub fn self_param() -> ast::SelfParam {