5 files changed, 413 insertions, 274 deletions

diff --git a/crates/assists/src/handlers/ignore_test.rs b/crates/assists/src/handlers/ignore_test.rs
new file mode 100644
index 000000000..d2339184f
--- /dev/null
+++ b/crates/assists/src/handlers/ignore_test.rs
@@ -0,0 +1,34 @@
+use syntax::{ast, AstNode};
+
+use crate::{utils::test_related_attribute, AssistContext, AssistId, AssistKind, Assists};
+
+// Assist: ignore_test
+//
+// Adds `#[ignore]` attribute to the test.
+//
+// ```
+// <|>#[test]
+// fn arithmetics {
+//     assert_eq!(2 + 2, 5);
+// }
+// ```
+// ->
+// ```
+// #[test]
+// #[ignore]
+// fn arithmetics {
+//     assert_eq!(2 + 2, 5);
+// }
+// ```
+pub(crate) fn ignore_test(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+    let attr: ast::Attr = ctx.find_node_at_offset()?;
+    let func = attr.syntax().parent().and_then(ast::Fn::cast)?;
+    let attr = test_related_attribute(&func)?;
+
+    acc.add(
+        AssistId("ignore_test", AssistKind::None),
+        "Ignore this test",
+        attr.syntax().text_range(),
+        |builder| builder.insert(attr.syntax().text_range().end(), &format!("\n#[ignore]")),
+    )
+}
diff --git a/crates/assists/src/handlers/unwrap_block.rs b/crates/assists/src/handlers/unwrap_block.rs
index 36ef871b9..676db7137 100644
--- a/crates/assists/src/handlers/unwrap_block.rs
+++ b/crates/assists/src/handlers/unwrap_block.rs
@@ -3,7 +3,7 @@ use syntax::{
         self,
         edit::{AstNodeEdit, IndentLevel},
     },
-    AstNode, TextRange, T,
+    AstNode, SyntaxKind, TextRange, T,
 };
 
 use crate::{utils::unwrap_trivial_block, AssistContext, AssistId, AssistKind, Assists};
@@ -31,11 +31,21 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
 
     let l_curly_token = ctx.find_token_syntax_at_offset(T!['{'])?;
     let mut block = ast::BlockExpr::cast(l_curly_token.parent())?;
+    let target = block.syntax().text_range();
     let mut parent = block.syntax().parent()?;
     if ast::MatchArm::can_cast(parent.kind()) {
         parent = parent.ancestors().find(|it| ast::MatchExpr::can_cast(it.kind()))?
     }
 
+    if matches!(parent.kind(), SyntaxKind::BLOCK_EXPR | SyntaxKind::EXPR_STMT) {
+        return acc.add(assist_id, assist_label, target, |builder| {
+            builder.replace(
+                block.syntax().text_range(),
+                update_expr_string(block.to_string(), &[' ', '{', '\n']),
+            );
+        });
+    }
+
     let parent = ast::Expr::cast(parent)?;
 
     match parent.clone() {
@@ -48,7 +58,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
                     // For `else if` blocks
                     let ancestor_then_branch = ancestor.then_branch()?;
 
-                    let target = then_branch.syntax().text_range();
                     return acc.add(assist_id, assist_label, target, |edit| {
                         let range_to_del_else_if = TextRange::new(
                             ancestor_then_branch.syntax().text_range().end(),
@@ -68,7 +77,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
                     });
                 }
             } else {
-                let target = block.syntax().text_range();
                 return acc.add(assist_id, assist_label, target, |edit| {
                     let range_to_del = TextRange::new(
                         then_branch.syntax().text_range().end(),
@@ -84,7 +92,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
     };
 
     let unwrapped = unwrap_trivial_block(block);
-    let target = unwrapped.syntax().text_range();
     acc.add(assist_id, assist_label, target, |builder| {
         builder.replace(
             parent.syntax().text_range(),
@@ -112,31 +119,89 @@ mod tests {
     use super::*;
 
     #[test]
+    fn unwrap_tail_expr_block() {
+        check_assist(
+            unwrap_block,
+            r#"
+fn main() {
+    <|>{
+        92
+    }
+}
+"#,
+            r#"
+fn main() {
+    92
+}
+"#,
+        )
+    }
+
+    #[test]
+    fn unwrap_stmt_expr_block() {
+        check_assist(
+            unwrap_block,
+            r#"
+fn main() {
+    <|>{
+        92;
+    }
+    ()
+}
+"#,
+            r#"
+fn main() {
+    92;
+    ()
+}
+"#,
+        );
+        // Pedantically, we should add an `;` here...
+        check_assist(
+            unwrap_block,
+            r#"
+fn main() {
+    <|>{
+        92
+    }
+    ()
+}
+"#,
+            r#"
+fn main() {
+    92
+    ()
+}
+"#,
+        );
+    }
+
+    #[test]
     fn simple_if() {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                bar();
-                if true {<|>
-                    foo();
-
-                    //comment
-                    bar();
-                } else {
-                    println!("bar");
-                }
-            }
-            "#,
+fn main() {
+    bar();
+    if true {<|>
+        foo();
+
+        //comment
+        bar();
+    } else {
+        println!("bar");
+    }
+}
+"#,
             r#"
-            fn main() {
-                bar();
-                foo();
+fn main() {
+    bar();
+    foo();
 
-                //comment
-                bar();
-            }
-            "#,
+    //comment
+    bar();
+}
+"#,
         );
     }
 
@@ -145,30 +210,30 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                bar();
-                if true {
-                    foo();
-
-                    //comment
-                    bar();
-                } else {<|>
-                    println!("bar");
-                }
-            }
-            "#,
+fn main() {
+    bar();
+    if true {
+        foo();
+
+        //comment
+        bar();
+    } else {<|>
+        println!("bar");
+    }
+}
+"#,
             r#"
-            fn main() {
-                bar();
-                if true {
-                    foo();
+fn main() {
+    bar();
+    if true {
+        foo();
 
-                    //comment
-                    bar();
-                }
-                println!("bar");
-            }
-            "#,
+        //comment
+        bar();
+    }
+    println!("bar");
+}
+"#,
         );
     }
 
@@ -177,32 +242,32 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {<|>
-                    println!("bar");
-                } else {
-                    println!("foo");
-                }
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {<|>
+        println!("bar");
+    } else {
+        println!("foo");
+    }
+}
+"#,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
+fn main() {
+    //bar();
+    if true {
+        println!("true");
 
-                    //comment
-                    //bar();
-                }
-                println!("bar");
-            }
-            "#,
+        //comment
+        //bar();
+    }
+    println!("bar");
+}
+"#,
         );
     }
 
@@ -211,34 +276,34 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {
-                    println!("bar");
-                } else if true {<|>
-                    println!("foo");
-                }
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {
+        println!("bar");
+    } else if true {<|>
+        println!("foo");
+    }
+}
+"#,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {
-                    println!("bar");
-                }
-                println!("foo");
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {
+        println!("bar");
+    }
+    println!("foo");
+}
+"#,
         );
     }
 
@@ -247,38 +312,38 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {
-                    println!("bar");
-                } else if true {
-                    println!("foo");
-                } else {<|>
-                    println!("else");
-                }
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {
+        println!("bar");
+    } else if true {
+        println!("foo");
+    } else {<|>
+        println!("else");
+    }
+}
+"#,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {
-                    println!("bar");
-                } else if true {
-                    println!("foo");
-                }
-                println!("else");
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {
+        println!("bar");
+    } else if true {
+        println!("foo");
+    }
+    println!("else");
+}
+"#,
         );
     }
 
@@ -287,36 +352,36 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {
-                    println!("bar");
-                } else if true {<|>
-                    println!("foo");
-                } else {
-                    println!("else");
-                }
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {
+        println!("bar");
+    } else if true {<|>
+        println!("foo");
+    } else {
+        println!("else");
+    }
+}
+"#,
             r#"
-            fn main() {
-                //bar();
-                if true {
-                    println!("true");
-
-                    //comment
-                    //bar();
-                } else if false {
-                    println!("bar");
-                }
-                println!("foo");
-            }
-            "#,
+fn main() {
+    //bar();
+    if true {
+        println!("true");
+
+        //comment
+        //bar();
+    } else if false {
+        println!("bar");
+    }
+    println!("foo");
+}
+"#,
         );
     }
 
@@ -325,18 +390,18 @@ mod tests {
         check_assist_not_applicable(
             unwrap_block,
             r#"
-            fn main() {
-                bar();<|>
-                if true {
-                    foo();
-
-                    //comment
-                    bar();
-                } else {
-                    println!("bar");
-                }
-            }
-            "#,
+fn main() {
+    bar();<|>
+    if true {
+        foo();
+
+        //comment
+        bar();
+    } else {
+        println!("bar");
+    }
+}
+"#,
         );
     }
 
@@ -345,31 +410,31 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                for i in 0..5 {<|>
-                    if true {
-                        foo();
-
-                        //comment
-                        bar();
-                    } else {
-                        println!("bar");
-                    }
-                }
-            }
-            "#,
+fn main() {
+    for i in 0..5 {<|>
+        if true {
+            foo();
+
+            //comment
+            bar();
+        } else {
+            println!("bar");
+        }
+    }
+}
+"#,
             r#"
-            fn main() {
-                if true {
-                    foo();
-
-                    //comment
-                    bar();
-                } else {
-                    println!("bar");
-                }
-            }
-            "#,
+fn main() {
+    if true {
+        foo();
+
+        //comment
+        bar();
+    } else {
+        println!("bar");
+    }
+}
+"#,
         );
     }
 
@@ -378,29 +443,29 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                for i in 0..5 {
-                    if true {<|>
-                        foo();
-
-                        //comment
-                        bar();
-                    } else {
-                        println!("bar");
-                    }
-                }
-            }
-            "#,
+fn main() {
+    for i in 0..5 {
+        if true {<|>
+            foo();
+
+            //comment
+            bar();
+        } else {
+            println!("bar");
+        }
+    }
+}
+"#,
             r#"
-            fn main() {
-                for i in 0..5 {
-                    foo();
+fn main() {
+    for i in 0..5 {
+        foo();
 
-                    //comment
-                    bar();
-                }
-            }
-            "#,
+        //comment
+        bar();
+    }
+}
+"#,
         );
     }
 
@@ -409,31 +474,31 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                loop {<|>
-                    if true {
-                        foo();
-
-                        //comment
-                        bar();
-                    } else {
-                        println!("bar");
-                    }
-                }
-            }
-            "#,
+fn main() {
+    loop {<|>
+        if true {
+            foo();
+
+            //comment
+            bar();
+        } else {
+            println!("bar");
+        }
+    }
+}
+"#,
             r#"
-            fn main() {
-                if true {
-                    foo();
-
-                    //comment
-                    bar();
-                } else {
-                    println!("bar");
-                }
-            }
-            "#,
+fn main() {
+    if true {
+        foo();
+
+        //comment
+        bar();
+    } else {
+        println!("bar");
+    }
+}
+"#,
         );
     }
 
@@ -442,31 +507,31 @@ mod tests {
         check_assist(
             unwrap_block,
             r#"
-            fn main() {
-                while true {<|>
-                    if true {
-                        foo();
-
-                        //comment
-                        bar();
-                    } else {
-                        println!("bar");
-                    }
-                }
-            }
-            "#,
+fn main() {
+    while true {<|>
+        if true {
+            foo();
+
+            //comment
+            bar();
+        } else {
+            println!("bar");
+        }
+    }
+}
+"#,
             r#"
-            fn main() {
-                if true {
-                    foo();
-
-                    //comment
-                    bar();
-                } else {
-                    println!("bar");
-                }
-            }
-            "#,
+fn main() {
+    if true {
+        foo();
+
+        //comment
+        bar();
+    } else {
+        println!("bar");
+    }
+}
+"#,
         );
     }
 
@@ -499,19 +564,19 @@ fn main() {
         check_assist_not_applicable(
             unwrap_block,
             r#"
-            fn main() {
-                while true {
-                    if true {
-                        foo();<|>
-
-                        //comment
-                        bar();
-                    } else {
-                        println!("bar");
-                    }
-                }
-            }
-            "#,
+fn main() {
+    while true {
+        if true {
+            foo();<|>
+
+            //comment
+            bar();
+        } else {
+            println!("bar");
+        }
+    }
+}
+"#,
         );
     }
 }
diff --git a/crates/assists/src/lib.rs b/crates/assists/src/lib.rs
index e8d81b33d..17e9312db 100644
--- a/crates/assists/src/lib.rs
+++ b/crates/assists/src/lib.rs
@@ -141,6 +141,7 @@ mod handlers {
     mod generate_function;
     mod generate_impl;
     mod generate_new;
+    mod ignore_test;
     mod infer_function_return_type;
     mod inline_local_variable;
     mod introduce_named_lifetime;
@@ -189,6 +190,7 @@ mod handlers {
             generate_function::generate_function,
             generate_impl::generate_impl,
             generate_new::generate_new,
+            ignore_test::ignore_test,
             infer_function_return_type::infer_function_return_type,
             inline_local_variable::inline_local_variable,
             introduce_named_lifetime::introduce_named_lifetime,
diff --git a/crates/assists/src/tests/generated.rs b/crates/assists/src/tests/generated.rs
index dbf4f21aa..5a9d1a01b 100644
--- a/crates/assists/src/tests/generated.rs
+++ b/crates/assists/src/tests/generated.rs
@@ -474,6 +474,26 @@ impl<T: Clone> Ctx<T> {
 }
 
 #[test]
+fn doctest_ignore_test() {
+    check_doc_test(
+        "ignore_test",
+        r#####"
+<|>#[test]
+fn arithmetics {
+    assert_eq!(2 + 2, 5);
+}
+"#####,
+        r#####"
+#[test]
+#[ignore]
+fn arithmetics {
+    assert_eq!(2 + 2, 5);
+}
+"#####,
+    )
+}
+
+#[test]
 fn doctest_infer_function_return_type() {
     check_doc_test(
         "infer_function_return_type",
diff --git a/crates/assists/src/utils.rs b/crates/assists/src/utils.rs
index caabc44de..66c0cdd5f 100644
--- a/crates/assists/src/utils.rs
+++ b/crates/assists/src/utils.rs
@@ -9,6 +9,7 @@ use ide_db::RootDatabase;
 use itertools::Itertools;
 use syntax::{
     ast::edit::AstNodeEdit,
+    ast::AttrsOwner,
     ast::NameOwner,
     ast::{self, edit, make, ArgListOwner},
     AstNode, Direction,
@@ -81,6 +82,23 @@ pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
     None
 }
 
+/// This is a method with a heuristics to support test methods annotated with custom test annotations, such as
+/// `#[test_case(...)]`, `#[tokio::test]` and similar.
+/// Also a regular `#[test]` annotation is supported.
+///
+/// It may produce false positives, for example, `#[wasm_bindgen_test]` requires a different command to run the test,
+/// but it's better than not to have the runnables for the tests at all.
+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
+        }
+    })
+}
+
 #[derive(Copy, Clone, PartialEq)]
 pub enum DefaultMethods {
     Only,