Merge #11481

[rust.git] / crates / ide_assists / src / handlers / convert_while_to_loop.rs

diff --git a/crates/ide_assists/src/handlers/convert_while_to_loop.rs b/crates/ide_assists/src/handlers/convert_while_to_loop.rs
index 2ecf64625232d6ff5ebb5ae838acdee988c944b6..0fa2dcfbde1f7bea4a6f898631697e47b548316a 100644 (file)
--- a/crates/ide_assists/src/handlers/convert_while_to_loop.rs
+++ b/crates/ide_assists/src/handlers/convert_while_to_loop.rs
@@ -1,5 +1,6 @@
 use std::iter::once;
 
+use ide_db::helpers::node_ext::is_pattern_cond;
 use syntax::{
     ast::{
         self,
@@ -39,16 +40,9 @@
 // ```
 pub(crate) fn convert_while_to_loop(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let while_kw = ctx.find_token_syntax_at_offset(T![while])?;
-    let while_expr: ast::WhileExpr = while_kw.parent().and_then(ast::WhileExpr::cast)?;
+    let while_expr = while_kw.parent().and_then(ast::WhileExpr::cast)?;
     let while_body = while_expr.loop_body()?;
-    let cond = while_expr.condition()?;
-
-    // Don't handle while let
-    if let Some(_) = cond.pat() {
-        return None;
-    };
-
-    let cond_expr = cond.expr()?;
+    let while_cond = while_expr.condition()?;
 
     let target = while_expr.syntax().text_range();
     acc.add(
@@ -58,27 +52,21 @@ pub(crate) fn convert_while_to_loop(acc: &mut Assists, ctx: &AssistContext) -> O
         |edit| {
             let while_indent_level = IndentLevel::from_node(while_expr.syntax());
 
-            let replacement = {
-                let if_expr = {
-                    let cond = invert_boolean_expression(cond_expr);
-                    let then_branch = make::block_expr(
-                        once(make::expr_stmt(make::expr_break(None)).into()),
-                        None,
-                    );
-
-                    make::expr_if(make::condition(cond, None), then_branch, None)
-                };
-
-                let if_expr = if_expr.indent(while_indent_level);
+            let break_block =
+                make::block_expr(once(make::expr_stmt(make::expr_break(None)).into()), None)
+                    .indent(while_indent_level);
+            let block_expr = if is_pattern_cond(while_cond.clone()) {
+                let if_expr = make::expr_if(while_cond, while_body, Some(break_block.into()));
+                let stmts = once(make::expr_stmt(if_expr).into());
+                make::block_expr(stmts, None)
+            } else {
+                let if_cond = invert_boolean_expression(while_cond);
+                let if_expr = make::expr_if(if_cond, break_block, None);
                 let stmts = once(make::expr_stmt(if_expr).into()).chain(while_body.statements());
-
-                let block_expr = make::block_expr(stmts, while_body.tail_expr());
-
-                let block_expr = block_expr.indent(while_indent_level);
-
-                make::expr_loop(block_expr)
+                make::block_expr(stmts, while_body.tail_expr())
             };
 
+            let replacement = make::expr_loop(block_expr.indent(while_indent_level));
             edit.replace(target, replacement.syntax().text())
         },
     )
@@ -160,8 +148,8 @@ fn main() {
     }
 
     #[test]
-    fn ignore_while_let() {
-        check_assist_not_applicable(
+    fn convert_while_let() {
+        check_assist(
             convert_while_to_loop,
             r#"
 fn main() {
@@ -169,6 +157,17 @@ fn main() {
         bar();
     }
 }
+"#,
+            r#"
+fn main() {
+    loop {
+        if let Some(_) = foo() {
+            bar();
+        } else {
+            break;
+        }
+    }
+}
 "#,
         );
     }