2 files changed, 32 insertions, 3 deletions

diff --git a/docs/user/README.md b/docs/user/README.md
index 1b4d13d0f..affb96939 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -64,7 +64,7 @@ for details.
 * `rust-analyzer.showWorkspaceLoadedNotification`: to ease troubleshooting, a
   notification is shown by default when a workspace is loaded
 * `rust-analyzer.enableEnhancedTyping`: by default, rust-analyzer intercepts
-  `Enter` key to make it easier to continue comments
+  `Enter` key to make it easier to continue comments. Note that it may conflict with VIM emulation plugin.
 * `rust-analyzer.raLspServerPath`: path to `ra_lsp_server` executable
 * `rust-analyzer.enableCargoWatchOnStartup`: prompt to install & enable `cargo
   watch` for live error highlighting (note, this **does not** use rust-analyzer)
diff --git a/docs/user/features.md b/docs/user/features.md
index a714574fb..22470bc56 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -390,14 +390,14 @@ fn foo() {
 
 - Move guard expression to match arm body
 ```rust
-//before:
+// before:
 fn f() {
     match x {
         <|>y @ 4 | y @ 5    if y > 5 => true,
         _ => false
     }
 }
-//after:
+// after:
 fn f() {
     match x {
         y @ 4 | y @ 5 => if y > 5 { <|>true },
@@ -406,6 +406,35 @@ fn f() {
 }
 ```
 
+- Move if condition to match arm guard
+```rust
+// before:
+fn f() {
+    let mut t = 'a';
+    let chars = "abcd";
+    match t {
+        '\r' => if chars.clone().next().is_some() {
+            t = 'e';<|>
+            false
+        },
+        _ => true
+    }
+}
+
+// after:
+fn f() {
+    let mut t = 'a';
+    let chars = "abcd";
+    match t {
+        '\r' <|>if chars.clone().next().is_some() => {
+            t = 'e';
+            false
+        },
+        _ => true
+    }
+}
+```
+
 ### Magic Completions
 
 In addition to usual reference completion, rust-analyzer provides some ✨magic✨