2 files changed, 47 insertions, 13 deletions

diff --git a/crates/ra_assists/src/move_guard_to_arm_body.rs b/crates/ra_assists/src/move_guard_to_arm_body.rs
index d6240527f..a8ca19f5d 100644
--- a/crates/ra_assists/src/move_guard_to_arm_body.rs
+++ b/crates/ra_assists/src/move_guard_to_arm_body.rs
@@ -1,6 +1,4 @@
-use hir::{
-    db::HirDatabase,
-};
+use hir::db::HirDatabase;
 use ra_syntax::{
     TextUnit,
     SyntaxElement,
@@ -17,9 +15,7 @@ pub(crate) fn move_guard_to_arm_body(mut ctx: AssistCtx<impl HirDatabase>) -> Op
 
     let guard_conditions = guard.expr()?;
     let arm_expr = match_arm.expr()?;
-    let buf = format!("if {} {{ {} }}",
-                          guard_conditions.syntax().text(),
-                          arm_expr.syntax().text());
+    let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text());
 
     ctx.add_action(AssistId("move_guard_to_arm_body"), "move guard to arm body", |edit| {
         edit.target(guard.syntax().range());
@@ -32,16 +28,13 @@ pub(crate) fn move_guard_to_arm_body(mut ctx: AssistCtx<impl HirDatabase>) -> Op
                 } else {
                     TextUnit::from(0)
                 }
-            },
-            _ => TextUnit::from(0)
+            }
+            _ => TextUnit::from(0),
         };
 
         edit.delete(guard.syntax().range());
         edit.replace_node_and_indent(arm_expr.syntax(), buf);
-        edit.set_cursor(
-            arm_expr.syntax().range().start() +
-            TextUnit::from(3) -
-            offseting_amount);
+        edit.set_cursor(arm_expr.syntax().range().start() + TextUnit::from(3) - offseting_amount);
     });
     ctx.build()
 }
@@ -93,7 +86,30 @@ mod tests {
                     _ => true
                 }
             }
-            "#
+            "#,
+        );
+    }
+
+    #[test]
+    fn move_guard_to_arm_body_works_complex_match() {
+        check_assist(
+            move_guard_to_arm_body,
+            r#"
+            fn f() {
+                match x {
+                    <|>y @ 4 | y @ 5    if y > 5 => true,
+                    _ => false
+                }
+            }
+            "#,
+            r#"
+            fn f() {
+                match x {
+                    y @ 4 | y @ 5 => if y > 5 { <|>true },
+                    _ => false
+                }
+            }
+            "#,
         );
     }
 }
diff --git a/docs/user/features.md b/docs/user/features.md
index cbfc491b2..a714574fb 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -388,6 +388,24 @@ fn foo() {
 }
 ```
 
+- Move guard expression to match arm body
+```rust
+//before:
+fn f() {
+    match x {
+        <|>y @ 4 | y @ 5    if y > 5 => true,
+        _ => false
+    }
+}
+//after:
+fn f() {
+    match x {
+        y @ 4 | y @ 5 => if y > 5 { <|>true },
+        _ => false
+    }
+}
+```
+
 ### Magic Completions
 
 In addition to usual reference completion, rust-analyzer provides some ✨magic✨