Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

2 files changed, 24 insertions, 0 deletions

diff --git a/docs/user/README.md b/docs/user/README.md
index 235676850..1b2d98608 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -141,6 +141,11 @@ to load path and require it in `init.el`
 
 ## Vim and NeoVim
 
+Neovim 0.5 has a built in language server. For a quick start configuration of
+rust-analyzer, use [neovim/nvim-lsp](https://github.com/neovim/nvim-lsp#rust_analyzer).
+Once `neovim/nvim-lsp` is installed, you can use `call nvim_lsp#setup("rust_analyzer", {})`
+or `lua require'nvim_lsp'.rust_analyzer.setup({})` to quickly get set up.
+
 * Install coc.nvim by following the instructions at [coc.nvim]
   - You will need nodejs installed.
   - You may want to include some of the sample vim configurations [from here][coc-vim-conf]
diff --git a/docs/user/assists.md b/docs/user/assists.md
index 8da7578e2..6f4c30bee 100644
--- a/docs/user/assists.md
+++ b/docs/user/assists.md
@@ -329,6 +329,25 @@ fn main() {
 }
 ```
 
+## `invert_if`
+
+Apply invert_if
+This transforms if expressions of the form `if !x {A} else {B}` into `if x {B} else {A}`
+This also works with `!=`. This assist can only be applied with the cursor
+on `if`.
+
+```rust
+// BEFORE
+fn main() {
+    if┃ !y { A } else { B }
+}
+
+// AFTER
+fn main() {
+    if y { B } else { A }
+}
+```
+
 ## `make_raw_string`
 
 Adds `r#` to a plain string literal.