325 files changed, 9669 insertions, 6005 deletions

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7b9fbe6b8..ece1fd364 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -15,8 +15,8 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
-  dist-windows:
-    name: dist (Windows)
+  dist-x86_64-pc-windows-msvc:
+    name: dist (x86_64-pc-windows-msvc)
     runs-on: windows-latest
     env:
       RA_TARGET: x86_64-pc-windows-msvc
@@ -45,11 +45,41 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: dist-windows-latest
+        name: dist-x86_64-pc-windows-msvc
         path: ./dist
 
-  dist-ubuntu:
-    name: dist (Ubuntu 16.04)
+  dist-aarch64-pc-windows-msvc:
+    name: dist (aarch64-pc-windows-msvc)
+    runs-on: windows-latest
+    env:
+      RA_TARGET: aarch64-pc-windows-msvc
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Rename existing rust toolchain
+      run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        target: aarch64-pc-windows-msvc
+        profile: minimal
+        override: true
+
+    - name: Dist
+      run: cargo xtask dist
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist-aarch64-pc-windows-msvc
+        path: ./dist
+
+  dist-x86_64-unknown-linux-gnu:
+    name: dist (x86_64-unknown-linux-gnu)
     runs-on: ubuntu-16.04
     env:
       RA_TARGET: x86_64-unknown-linux-gnu
@@ -85,11 +115,11 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: dist-ubuntu-16.04
+        name: dist-x86_64-unknown-linux-gnu
         path: ./dist
 
-  dist-macos-latest:
-    name: dist (MacOS latest)
+  dist-x86_64-apple-darwin:
+    name: dist (x86_64-apple-darwin)
     runs-on: macos-latest
     env:
       RA_TARGET: x86_64-apple-darwin
@@ -111,12 +141,12 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: dist-macos-latest
+        name: dist-x86_64-apple-darwin
         path: ./dist
 
-  dist-macos-11:
-    name: dist (MacOS 11.0)
-    runs-on: macos-11.0
+  dist-aarch64-apple-darwin:
+    name: dist (aarch64-apple-darwin)
+    runs-on: macos-latest
     env:
       RA_TARGET: aarch64-apple-darwin
 
@@ -124,27 +154,27 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    - name: Install Rust toolchain (beta)
+    - name: Install Rust toolchain
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: beta
+        toolchain: stable
         target: aarch64-apple-darwin
         profile: minimal
         override: true
 
     - name: Dist
-      run: cargo xtask dist
+      run: SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version) cargo xtask dist
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: dist-macos-11.0
+        name: dist-aarch64-apple-darwin
         path: ./dist
 
   publish:
     name: publish
     runs-on: ubuntu-16.04
-    needs: ['dist-windows', 'dist-ubuntu', 'dist-macos-latest', 'dist-macos-11']
+    needs: ['dist-x86_64-pc-windows-msvc', 'dist-aarch64-pc-windows-msvc', 'dist-x86_64-unknown-linux-gnu', 'dist-x86_64-apple-darwin', 'dist-aarch64-apple-darwin']
     steps:
     - name: Install Nodejs
       uses: actions/setup-node@v1
@@ -165,19 +195,23 @@ jobs:
 
     - uses: actions/download-artifact@v1
       with:
-        name: dist-macos-11.0
+        name: dist-aarch64-apple-darwin
+        path: dist
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-x86_64-apple-darwin
         path: dist
     - uses: actions/download-artifact@v1
       with:
-        name: dist-macos-latest
+        name: dist-x86_64-unknown-linux-gnu
         path: dist
     - uses: actions/download-artifact@v1
       with:
-        name: dist-ubuntu-16.04
+        name: dist-x86_64-pc-windows-msvc
         path: dist
     - uses: actions/download-artifact@v1
       with:
-        name: dist-windows-latest
+        name: dist-aarch64-pc-windows-msvc
         path: dist
     - run: ls -al ./dist
 
diff --git a/Cargo.lock b/Cargo.lock
index fd04ec3c5..7b175ec67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,9 +2,9 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addr2line"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
  "gimli",
 ]
@@ -26,9 +26,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.36"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479"
+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
 
 [[package]]
 name = "anymap"
@@ -53,7 +53,7 @@ dependencies = [
  "either",
  "hir",
  "ide_db",
- "itertools",
+ "itertools 0.10.0",
  "profile",
  "rustc-hash",
  "stdx",
@@ -122,17 +122,28 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.12.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
+checksum = "11a47b6286279a9998588ef7050d1ebc2500c69892a557c90fe5d071c64415dc"
 dependencies = [
- "semver 0.11.0",
+ "cargo-platform",
+ "semver",
+ "semver-parser",
  "serde",
  "serde_json",
 ]
@@ -168,9 +179,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chalk-derive"
-version = "0.45.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7dacf94958d1a930b95d049d9443860859af59eadc77849392093eb577bcee"
+checksum = "3f00f6342a387edc822002d36a381e117afcac9f744951ff75fbf4a218edea5c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -180,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-ir"
-version = "0.45.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a5b38ede247def17da87f4badb62396a5753db6048e2011d3089d8b3796c67"
+checksum = "c686e69913591ae753e5526e73cbee39db3d9b0a92cc9078ab780cabf1c70aa9"
 dependencies = [
  "bitflags",
  "chalk-derive",
@@ -191,9 +202,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-recursive"
-version = "0.45.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a18db146d7a023edc20ad094e8c2284451f7888719645004979617d1f17c041"
+checksum = "310fdcac0340dab4163b766baa8067266e3b909108d1ac1b5246c033bde63975"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
@@ -204,14 +215,14 @@ dependencies = [
 
 [[package]]
 name = "chalk-solve"
-version = "0.45.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f73e0de04a0f394e47ed8118e00541bcf681d7c3c2ef500fa743eb4cf3a4850"
+checksum = "c3c3252116111c3548f1164ab8d98c67c49848b3bde10dd11b650fd023e91c72"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
  "ena",
- "itertools",
+ "itertools 0.9.0",
  "petgraph",
  "rustc-hash",
  "tracing",
@@ -250,7 +261,7 @@ dependencies = [
  "expect-test",
  "hir",
  "ide_db",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "profile",
  "rustc-hash",
@@ -262,9 +273,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
+checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
 
 [[package]]
 name = "crc32fast"
@@ -343,10 +354,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "difference"
-version = "2.0.0"
+name = "dissimilar"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+checksum = "fc4b29f4b9bb94bf267d57269fd0706d343a160937108e9619fe380645428abb"
 
 [[package]]
 name = "drop_bomb"
@@ -380,11 +391,11 @@ dependencies = [
 
 [[package]]
 name = "expect-test"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab78d4c727fa879de40951ffc01ed781a231b28786b19d6bfbdc0d1ec92eb3e"
+checksum = "2300477aab3a378f2ca00a4fbd4dc713654ab7ed790e4017493cb33656280633"
 dependencies = [
- "difference",
+ "dissimilar",
  "once_cell",
 ]
 
@@ -427,6 +438,7 @@ dependencies = [
  "jod-thread",
  "log",
  "serde_json",
+ "stdx",
  "toolchain",
 ]
 
@@ -482,19 +494,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
-name = "generator"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustc_version",
- "winapi 0.3.9",
-]
-
-[[package]]
 name = "gimli"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -534,7 +533,7 @@ dependencies = [
  "hir_def",
  "hir_expand",
  "hir_ty",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "profile",
  "rustc-hash",
@@ -557,7 +556,7 @@ dependencies = [
  "fst",
  "hir_expand",
  "indexmap",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "mbe",
  "once_cell",
@@ -601,7 +600,7 @@ dependencies = [
  "expect-test",
  "hir_def",
  "hir_expand",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "once_cell",
  "profile",
@@ -637,7 +636,7 @@ dependencies = [
  "hir",
  "ide_db",
  "indexmap",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "oorandom",
  "profile",
@@ -661,7 +660,7 @@ dependencies = [
  "expect-test",
  "fst",
  "hir",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "once_cell",
  "profile",
@@ -742,10 +741,19 @@ dependencies = [
 ]
 
 [[package]]
+name = "itertools"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
+dependencies = [
+ "either",
+]
+
+[[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "jod-thread"
@@ -777,9 +785,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
 
 [[package]]
 name = "libloading"
@@ -811,24 +819,11 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
-dependencies = [
- "cfg-if 0.1.10",
-]
-
-[[package]]
-name = "loom"
-version = "0.3.6"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
+checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
 dependencies = [
  "cfg-if 0.1.10",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -1150,9 +1145,9 @@ checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
 
 [[package]]
 name = "proc-macro2"
@@ -1181,7 +1176,6 @@ name = "proc_macro_srv"
 version = "0.0.0"
 dependencies = [
  "cargo_metadata",
- "difference",
  "libloading",
  "mbe",
  "memmap",
@@ -1219,7 +1213,7 @@ dependencies = [
  "base_db",
  "cargo_metadata",
  "cfg",
- "itertools",
+ "itertools 0.10.0",
  "log",
  "paths",
  "proc_macro_api",
@@ -1292,9 +1286,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
 dependencies = [
  "regex-syntax",
 ]
@@ -1311,9 +1305,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
 
 [[package]]
 name = "rowan"
@@ -1334,6 +1328,7 @@ dependencies = [
  "anyhow",
  "cfg",
  "crossbeam-channel 0.5.0",
+ "dissimilar",
  "env_logger",
  "expect-test",
  "flycheck",
@@ -1342,7 +1337,7 @@ dependencies = [
  "hir_ty",
  "ide",
  "ide_db",
- "itertools",
+ "itertools 0.10.0",
  "jod-thread",
  "log",
  "lsp-server",
@@ -1378,9 +1373,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "695.0.0"
+version = "697.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390bad134705b0bff02cd9541ac66df751a91c3cc734c3369cd6151ca269caed"
+checksum = "67adbe260a0a11910624d6d28c0304fcf7b063e666682111005c83b09f73429d"
 dependencies = [
  "unicode-xid",
 ]
@@ -1398,15 +1393,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
 name = "ryu"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1464,34 +1450,19 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.1",
+ "semver-parser",
  "serde",
 ]
 
 [[package]]
 name = "semver-parser"
-version = "0.7.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
 dependencies = [
  "pest",
 ]
@@ -1518,9 +1489,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1550,12 +1521,11 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127"
+checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3"
 dependencies = [
  "lazy_static",
- "loom",
 ]
 
 [[package]]
@@ -1566,9 +1536,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "smol_str"
@@ -1586,7 +1556,7 @@ dependencies = [
  "expect-test",
  "hir",
  "ide_db",
- "itertools",
+ "itertools 0.10.0",
  "rustc-hash",
  "syntax",
  "test_utils",
@@ -1599,9 +1569,9 @@ version = "0.0.0"
 
 [[package]]
 name = "syn"
-version = "1.0.55"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
+checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1627,7 +1597,7 @@ dependencies = [
  "arrayvec",
  "expect-test",
  "indexmap",
- "itertools",
+ "itertools 0.10.0",
  "once_cell",
  "parser",
  "profile",
@@ -1656,7 +1626,7 @@ dependencies = [
 name = "test_utils"
 version = "0.0.0"
 dependencies = [
- "difference",
+ "dissimilar",
  "rustc-hash",
  "serde_json",
  "stdx",
@@ -1665,9 +1635,9 @@ dependencies = [
 
 [[package]]
 name = "text-size"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03e7efdedc3bc78cb2337f1e2785c39e45f5ef762d9e4ebb137fff7380a6d8a"
+checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
 
 [[package]]
 name = "text_edit"
@@ -1684,9 +1654,9 @@ checksum = "db3c46be180f1af9673ebb27bc1235396f61ef6965b3fe0dbb2e624deb604f0e"
 
 [[package]]
 name = "thread_local"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
 dependencies = [
  "lazy_static",
 ]
@@ -1810,15 +1780,16 @@ dependencies = [
 
 [[package]]
 name = "tracing-tree"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43aac8afb493b08e1e1904956f7407c1e671b9c83b26a17e1bd83d6a3520e350"
+checksum = "023e80cdb7c8468b7aade1d756afa2acbe2ae0a6142a25ec664b5239d6ef2794"
 dependencies = [
  "ansi_term",
  "atty",
  "chrono",
  "termcolor",
  "tracing",
+ "tracing-log",
  "tracing-subscriber",
 ]
 
@@ -1838,9 +1809,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
 [[package]]
 name = "ungrammar"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bffada52edc8f2a56160b286ea4640acf90ffcb21bded361ccb8ed43a1457"
+checksum = "f96cc1b6938f7c548fbcc630bac5c896ae77a130909829ab18b8eab78c51b7ee"
 
 [[package]]
 name = "unicase"
diff --git a/crates/assists/Cargo.toml b/crates/assists/Cargo.toml
index 3fd8327d6..ed8ad666f 100644
--- a/crates/assists/Cargo.toml
+++ b/crates/assists/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 
 [dependencies]
 rustc-hash = "1.1.0"
-itertools = "0.9.0"
+itertools = "0.10.0"
 either = "1.6.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }
diff --git a/crates/assists/src/assist_config.rs b/crates/assists/src/assist_config.rs
index c458d9054..4fe8ea761 100644
--- a/crates/assists/src/assist_config.rs
+++ b/crates/assists/src/assist_config.rs
@@ -4,8 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! assists if we are allowed to.
 
-use hir::PrefixKind;
-use ide_db::helpers::insert_use::MergeBehavior;
+use ide_db::helpers::{insert_use::MergeBehavior, SnippetCap};
 
 use crate::AssistKind;
 
@@ -16,35 +15,8 @@ pub struct AssistConfig {
     pub insert_use: InsertUseConfig,
 }
 
-impl AssistConfig {
-    pub fn allow_snippets(&mut self, yes: bool) {
-        self.snippet_cap = if yes { Some(SnippetCap { _private: () }) } else { None }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct SnippetCap {
-    _private: (),
-}
-
-impl Default for AssistConfig {
-    fn default() -> Self {
-        AssistConfig {
-            snippet_cap: Some(SnippetCap { _private: () }),
-            allowed: None,
-            insert_use: InsertUseConfig::default(),
-        }
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct InsertUseConfig {
     pub merge: Option<MergeBehavior>,
-    pub prefix_kind: PrefixKind,
-}
-
-impl Default for InsertUseConfig {
-    fn default() -> Self {
-        InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain }
-    }
+    pub prefix_kind: hir::PrefixKind,
 }
diff --git a/crates/assists/src/assist_context.rs b/crates/assists/src/assist_context.rs
index 4f59d39a9..91cc63427 100644
--- a/crates/assists/src/assist_context.rs
+++ b/crates/assists/src/assist_context.rs
@@ -4,7 +4,10 @@ use std::mem;
 
 use algo::find_covering_element;
 use hir::Semantics;
-use ide_db::base_db::{AnchoredPathBuf, FileId, FileRange};
+use ide_db::{
+    base_db::{AnchoredPathBuf, FileId, FileRange},
+    helpers::SnippetCap,
+};
 use ide_db::{
     label::Label,
     source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
@@ -17,10 +20,7 @@ use syntax::{
 };
 use text_edit::{TextEdit, TextEditBuilder};
 
-use crate::{
-    assist_config::{AssistConfig, SnippetCap},
-    Assist, AssistId, AssistKind, GroupLabel,
-};
+use crate::{assist_config::AssistConfig, Assist, AssistId, AssistKind, GroupLabel};
 
 /// `AssistContext` allows to apply an assist or check if it could be applied.
 ///
diff --git a/crates/assists/src/ast_transform.rs b/crates/assists/src/ast_transform.rs
index da94e9987..4a3ed7783 100644
--- a/crates/assists/src/ast_transform.rs
+++ b/crates/assists/src/ast_transform.rs
@@ -204,7 +204,8 @@ impl<'a> AstTransform<'a> for QualifyPaths<'a> {
             }
             PathResolution::Local(_)
             | PathResolution::TypeParam(_)
-            | PathResolution::SelfType(_) => None,
+            | PathResolution::SelfType(_)
+            | PathResolution::ConstParam(_) => None,
             PathResolution::Macro(_) => None,
             PathResolution::AssocItem(_) => None,
         }
diff --git a/crates/assists/src/handlers/add_explicit_type.rs b/crates/assists/src/handlers/add_explicit_type.rs
index 563cbf505..cb1548cef 100644
--- a/crates/assists/src/handlers/add_explicit_type.rs
+++ b/crates/assists/src/handlers/add_explicit_type.rs
@@ -12,7 +12,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     let x<|> = 92;
+//     let x$0 = 92;
 // }
 // ```
 // ->
@@ -81,21 +81,17 @@ mod tests {
 
     #[test]
     fn add_explicit_type_target() {
-        check_assist_target(add_explicit_type, "fn f() { let a<|> = 1; }", "a");
+        check_assist_target(add_explicit_type, "fn f() { let a$0 = 1; }", "a");
     }
 
     #[test]
     fn add_explicit_type_works_for_simple_expr() {
-        check_assist(add_explicit_type, "fn f() { let a<|> = 1; }", "fn f() { let a: i32 = 1; }");
+        check_assist(add_explicit_type, "fn f() { let a$0 = 1; }", "fn f() { let a: i32 = 1; }");
     }
 
     #[test]
     fn add_explicit_type_works_for_underscore() {
-        check_assist(
-            add_explicit_type,
-            "fn f() { let a<|>: _ = 1; }",
-            "fn f() { let a: i32 = 1; }",
-        );
+        check_assist(add_explicit_type, "fn f() { let a$0: _ = 1; }", "fn f() { let a: i32 = 1; }");
     }
 
     #[test]
@@ -109,7 +105,7 @@ mod tests {
             }
 
             fn f() {
-                let a<|>: Option<_> = Option::Some(1);
+                let a$0: Option<_> = Option::Some(1);
             }"#,
             r#"
             enum Option<T> {
@@ -127,7 +123,7 @@ mod tests {
     fn add_explicit_type_works_for_macro_call() {
         check_assist(
             add_explicit_type,
-            r"macro_rules! v { () => {0u64} } fn f() { let a<|> = v!(); }",
+            r"macro_rules! v { () => {0u64} } fn f() { let a$0 = v!(); }",
             r"macro_rules! v { () => {0u64} } fn f() { let a: u64 = v!(); }",
         );
     }
@@ -136,31 +132,31 @@ mod tests {
     fn add_explicit_type_works_for_macro_call_recursive() {
         check_assist(
             add_explicit_type,
-            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a<|> = v!(); }"#,
+            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a$0 = v!(); }"#,
             r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a: u64 = v!(); }"#,
         );
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_ty_not_inferred() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|> = None; }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0 = None; }");
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_ty_already_specified() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: i32 = 1; }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0: i32 = 1; }");
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_specified_ty_is_tuple() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: (i32, i32) = (3, 4); }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0: (i32, i32) = (3, 4); }");
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_cursor_after_equals() {
         check_assist_not_applicable(
             add_explicit_type,
-            "fn f() {let a =<|> match 1 {2 => 3, 3 => 5};}",
+            "fn f() {let a =$0 match 1 {2 => 3, 3 => 5};}",
         )
     }
 
@@ -168,7 +164,7 @@ mod tests {
     fn add_explicit_type_not_applicable_if_cursor_before_let() {
         check_assist_not_applicable(
             add_explicit_type,
-            "fn f() <|>{let a = match 1 {2 => 3, 3 => 5};}",
+            "fn f() $0{let a = match 1 {2 => 3, 3 => 5};}",
         )
     }
 
@@ -178,7 +174,7 @@ mod tests {
             add_explicit_type,
             r#"
 fn main() {
-    let multiply_by_two<|> = |i| i * 3;
+    let multiply_by_two$0 = |i| i * 3;
     let six = multiply_by_two(2);
 }"#,
         )
@@ -195,7 +191,7 @@ struct Test<K, T = u8> {
 }
 
 fn main() {
-    let test<|> = Test { t: 23u8, k: 33 };
+    let test$0 = Test { t: 23u8, k: 33 };
 }"#,
             r#"
 struct Test<K, T = u8> {
diff --git a/crates/assists/src/handlers/add_missing_impl_members.rs b/crates/assists/src/handlers/add_missing_impl_members.rs
index 7df05b841..63cea754d 100644
--- a/crates/assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/assists/src/handlers/add_missing_impl_members.rs
@@ -20,7 +20,7 @@ use crate::{
 //     fn bar(&self) {}
 // }
 //
-// impl Trait<u32> for () {<|>
+// impl Trait<u32> for () {$0
 //
 // }
 // ```
@@ -63,7 +63,7 @@ pub(crate) fn add_missing_impl_members(acc: &mut Assists, ctx: &AssistContext) -
 //
 // impl Trait for () {
 //     type X = ();
-//     fn foo(&self) {}<|>
+//     fn foo(&self) {}$0
 //
 // }
 // ```
@@ -166,7 +166,7 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-<|>
+$0
 }"#,
             r#"
 trait Foo {
@@ -214,7 +214,7 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-<|>
+$0
 }"#,
             r#"
 trait Foo {
@@ -242,7 +242,7 @@ impl Foo for S {
             r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
             r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -261,7 +261,7 @@ impl Foo for S {
             r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S<|>"#,
+impl Foo for S$0"#,
             r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -280,7 +280,7 @@ impl Foo for S {
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl Foo<u32> for S { <|> }"#,
+impl Foo<u32> for S { $0 }"#,
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
@@ -299,7 +299,7 @@ impl Foo<u32> for S {
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl<U> Foo<U> for S { <|> }"#,
+impl<U> Foo<U> for S { $0 }"#,
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
@@ -318,7 +318,7 @@ impl<U> Foo<U> for S {
             r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S {}<|>"#,
+impl Foo for S {}$0"#,
             r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -340,7 +340,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar;
@@ -370,7 +370,7 @@ mod foo {
 use foo::bar;
 
 struct S;
-impl bar::Foo for S { <|> }"#,
+impl bar::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub mod bar {
@@ -400,7 +400,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -425,7 +425,7 @@ mod foo {
     trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
-impl foo::Foo<u32> for S { <|> }"#,
+impl foo::Foo<u32> for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -452,7 +452,7 @@ mod foo {
 }
 struct Param;
 struct S;
-impl foo::Foo<Param> for S { <|> }"#,
+impl foo::Foo<Param> for S { $0 }"#,
             r#"
 mod foo {
     trait Foo<T> { fn foo(&self, bar: T); }
@@ -479,7 +479,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar<u32>::Assoc); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -506,7 +506,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar<Baz>); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -532,7 +532,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub trait Fn<Args> { type Output; }
@@ -554,7 +554,7 @@ impl foo::Foo for S {
             r#"
 trait Foo;
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
         )
     }
 
@@ -568,7 +568,7 @@ trait Foo {
     fn valid(some: u32) -> bool { false }
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
         )
     }
 
@@ -586,7 +586,7 @@ trait Foo {
     fn foo(&self);
 }
 struct S;
-impl Foo for S {}<|>"#,
+impl Foo for S {}$0"#,
             r#"
 #[doc(alias = "test alias")]
 trait Foo {
@@ -621,7 +621,7 @@ trait Foo {
     fn foo(some: u32) -> bool;
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
             r#"
 trait Foo {
     type Output;
@@ -648,7 +648,7 @@ trait Foo<T = Self> {
 }
 
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
             r#"
 trait Foo<T = Self> {
     fn bar(&self, other: &T);
@@ -673,7 +673,7 @@ trait Foo<T1, T2 = Self> {
 }
 
 struct S<T>;
-impl Foo<T> for S<T> { <|> }"#,
+impl Foo<T> for S<T> { $0 }"#,
             r#"
 trait Foo<T1, T2 = Self> {
     fn bar(&self, this: &T1, that: &T2);
@@ -697,7 +697,7 @@ trait Tr {
     type Ty: Copy + 'static;
 }
 
-impl Tr for ()<|> {
+impl Tr for ()$0 {
 }"#,
             r#"
 trait Tr {
@@ -719,7 +719,7 @@ trait Tr {
     fn foo();
 }
 
-impl Tr for ()<|> {
+impl Tr for ()$0 {
     +++
 }"#,
             r#"
@@ -745,7 +745,7 @@ trait Tr {
     fn foo();
 }
 
-impl Tr for ()<|> {
+impl Tr for ()$0 {
     // very important
 }"#,
             r#"
@@ -771,7 +771,7 @@ trait Test {
     fn foo(&self, x: crate)
 }
 impl Test for () {
-    <|>
+    $0
 }
 "#,
             r#"
@@ -796,7 +796,7 @@ trait Foo<BAR> {
     fn foo(&self, bar: BAR);
 }
 impl Foo for () {
-    <|>
+    $0
 }
 "#,
             r#"
diff --git a/crates/assists/src/handlers/add_turbo_fish.rs b/crates/assists/src/handlers/add_turbo_fish.rs
index 1f486c013..8e9ea4fad 100644
--- a/crates/assists/src/handlers/add_turbo_fish.rs
+++ b/crates/assists/src/handlers/add_turbo_fish.rs
@@ -14,7 +14,7 @@ use crate::{
 // ```
 // fn make<T>() -> T { todo!() }
 // fn main() {
-//     let x = make<|>();
+//     let x = make$0();
 // }
 // ```
 // ->
@@ -77,7 +77,7 @@ mod tests {
             r#"
 fn make<T>() -> T {}
 fn main() {
-    make<|>();
+    make$0();
 }
 "#,
             r#"
@@ -97,7 +97,7 @@ fn main() {
             r#"
 fn make<T>() -> T {}
 fn main() {
-    make()<|>;
+    make()$0;
 }
 "#,
             r#"
@@ -119,7 +119,7 @@ impl S {
     fn make<T>(&self) -> T {}
 }
 fn main() {
-    S.make<|>();
+    S.make$0();
 }
 "#,
             r#"
@@ -142,7 +142,7 @@ fn main() {
             r#"
 fn make<T>() -> T {}
 fn main() {
-    make<|>::<()>();
+    make$0::<()>();
 }
 "#,
         );
@@ -156,7 +156,7 @@ fn main() {
             r#"
 fn make() -> () {}
 fn main() {
-    make<|>();
+    make$0();
 }
 "#,
         );
diff --git a/crates/assists/src/handlers/apply_demorgan.rs b/crates/assists/src/handlers/apply_demorgan.rs
index 1a6fdafda..ed4d11455 100644
--- a/crates/assists/src/handlers/apply_demorgan.rs
+++ b/crates/assists/src/handlers/apply_demorgan.rs
@@ -12,7 +12,7 @@ use crate::{utils::invert_boolean_expression, AssistContext, AssistId, AssistKin
 //
 // ```
 // fn main() {
-//     if x != 4 ||<|> !y {}
+//     if x != 4 ||$0 !y {}
 // }
 // ```
 // ->
@@ -68,26 +68,26 @@ mod tests {
 
     #[test]
     fn demorgan_turns_and_into_or() {
-        check_assist(apply_demorgan, "fn f() { !x &&<|> !x }", "fn f() { !(x || x) }")
+        check_assist(apply_demorgan, "fn f() { !x &&$0 !x }", "fn f() { !(x || x) }")
     }
 
     #[test]
     fn demorgan_turns_or_into_and() {
-        check_assist(apply_demorgan, "fn f() { !x ||<|> !x }", "fn f() { !(x && x) }")
+        check_assist(apply_demorgan, "fn f() { !x ||$0 !x }", "fn f() { !(x && x) }")
     }
 
     #[test]
     fn demorgan_removes_inequality() {
-        check_assist(apply_demorgan, "fn f() { x != x ||<|> !x }", "fn f() { !(x == x && x) }")
+        check_assist(apply_demorgan, "fn f() { x != x ||$0 !x }", "fn f() { !(x == x && x) }")
     }
 
     #[test]
     fn demorgan_general_case() {
-        check_assist(apply_demorgan, "fn f() { x ||<|> x }", "fn f() { !(!x && !x) }")
+        check_assist(apply_demorgan, "fn f() { x ||$0 x }", "fn f() { !(!x && !x) }")
     }
 
     #[test]
     fn demorgan_doesnt_apply_with_cursor_not_on_op() {
-        check_assist_not_applicable(apply_demorgan, "fn f() { <|> !x || !x }")
+        check_assist_not_applicable(apply_demorgan, "fn f() { $0 !x || !x }")
     }
 }
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs
index bd5bba646..55620f0f3 100644
--- a/crates/assists/src/handlers/auto_import.rs
+++ b/crates/assists/src/handlers/auto_import.rs
@@ -70,7 +70,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     let map = HashMap<|>::new();
+//     let map = HashMap$0::new();
 // }
 // # pub mod std { pub mod collections { pub struct HashMap { } } }
 // ```
@@ -151,7 +151,7 @@ mod tests {
 
             use std::fmt;
 
-            <|>Formatter
+            $0Formatter
             ",
             r"
             mod std {
@@ -172,7 +172,7 @@ mod tests {
         check_assist(
             auto_import,
             r"
-            <|>PubStruct
+            $0PubStruct
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -198,7 +198,7 @@ mod tests {
             macro_rules! foo {
                 ($i:ident) => { fn foo(a: $i) {} }
             }
-            foo!(Pub<|>Struct);
+            foo!(Pub$0Struct);
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -227,7 +227,7 @@ mod tests {
             use PubMod::PubStruct1;
 
             struct Test {
-                test: Pub<|>Struct2<u8>,
+                test: Pub$0Struct2<u8>,
             }
 
             pub mod PubMod {
@@ -259,7 +259,7 @@ mod tests {
         check_assist(
             auto_import,
             r"
-            PubSt<|>ruct
+            PubSt$0ruct
 
             pub mod PubMod1 {
                 pub struct PubStruct;
@@ -296,7 +296,7 @@ mod tests {
             r"
             use PubMod::PubStruct;
 
-            PubStruct<|>
+            PubStruct$0
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -310,7 +310,7 @@ mod tests {
         check_assist_not_applicable(
             auto_import,
             r"
-            PrivateStruct<|>
+            PrivateStruct$0
 
             pub mod PubMod {
                 struct PrivateStruct;
@@ -324,7 +324,7 @@ mod tests {
         check_assist_not_applicable(
             auto_import,
             "
-            PubStruct<|>",
+            PubStruct$0",
         );
     }
 
@@ -333,7 +333,7 @@ mod tests {
         check_assist_not_applicable(
             auto_import,
             r"
-            use PubStruct<|>;
+            use PubStruct$0;
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -346,7 +346,7 @@ mod tests {
         check_assist(
             auto_import,
             r"
-            test_function<|>
+            test_function$0
 
             pub mod PubMod {
                 pub fn test_function() {};
@@ -377,7 +377,7 @@ macro_rules! foo {
 
 //- /main.rs crate:main deps:crate_with_macro
 fn main() {
-    foo<|>
+    foo$0
 }
 ",
             r"use crate_with_macro::foo;
@@ -395,7 +395,7 @@ fn main() {
             auto_import,
             r"
             struct AssistInfo {
-                group_label: Option<<|>GroupLabel>,
+                group_label: Option<$0GroupLabel>,
             }
 
             mod m { pub struct GroupLabel; }
@@ -419,7 +419,7 @@ fn main() {
 
             use mod1::mod2;
             fn main() {
-                mod2::mod3::TestStruct<|>
+                mod2::mod3::TestStruct$0
             }
             ",
         );
@@ -436,7 +436,7 @@ fn main() {
 
             use test_mod::test_function;
             fn main() {
-                test_function<|>
+                test_function$0
             }
             ",
         );
@@ -455,7 +455,7 @@ fn main() {
             }
 
             fn main() {
-                TestStruct::test_function<|>
+                TestStruct::test_function$0
             }
             ",
             r"
@@ -488,7 +488,7 @@ fn main() {
             }
 
             fn main() {
-                TestStruct::TEST_CONST<|>
+                TestStruct::TEST_CONST$0
             }
             ",
             r"
@@ -524,7 +524,7 @@ fn main() {
             }
 
             fn main() {
-                test_mod::TestStruct::test_function<|>
+                test_mod::TestStruct::test_function$0
             }
             ",
             r"
@@ -573,7 +573,7 @@ fn main() {
 
             use test_mod::TestTrait2;
             fn main() {
-                test_mod::TestEnum::test_function<|>;
+                test_mod::TestEnum::test_function$0;
             }
             ",
         )
@@ -595,7 +595,7 @@ fn main() {
             }
 
             fn main() {
-                test_mod::TestStruct::TEST_CONST<|>
+                test_mod::TestStruct::TEST_CONST$0
             }
             ",
             r"
@@ -644,7 +644,7 @@ fn main() {
 
             use test_mod::TestTrait2;
             fn main() {
-                test_mod::TestEnum::TEST_CONST<|>;
+                test_mod::TestEnum::TEST_CONST$0;
             }
             ",
         )
@@ -667,7 +667,7 @@ fn main() {
 
             fn main() {
                 let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             ",
             r"
@@ -699,7 +699,7 @@ fn main() {
             //- /main.rs crate:main deps:dep
             fn main() {
                 let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -730,7 +730,7 @@ fn main() {
             r"
             //- /main.rs crate:main deps:dep
             fn main() {
-                dep::test_mod::TestStruct::test_func<|>tion
+                dep::test_mod::TestStruct::test_func$0tion
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -760,7 +760,7 @@ fn main() {
             r"
             //- /main.rs crate:main deps:dep
             fn main() {
-                dep::test_mod::TestStruct::CONST<|>
+                dep::test_mod::TestStruct::CONST$0
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -791,7 +791,7 @@ fn main() {
             //- /main.rs crate:main deps:dep
             fn main() {
                 let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_func<|>tion()
+                test_struct.test_func$0tion()
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -815,7 +815,7 @@ fn main() {
             //- /main.rs crate:main deps:dep
             fn main() {
                 let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -858,7 +858,7 @@ fn main() {
             use test_mod::TestTrait2;
             fn main() {
                 let one = test_mod::TestEnum::One;
-                one.test<|>_method();
+                one.test$0_method();
             }
             ",
         )
@@ -874,7 +874,7 @@ pub struct Struct;
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    Struct<|>
+    Struct$0
 }
 ",
             r"use dep::Struct;
@@ -902,7 +902,7 @@ pub fn panic_fmt() {}
 //- /main.rs crate:main deps:dep
 struct S;
 
-impl f<|>mt::Display for S {}
+impl f$0mt::Display for S {}
 ",
             r"use dep::fmt;
 
@@ -930,7 +930,7 @@ mac!();
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    Cheese<|>;
+    Cheese$0;
 }
 ",
             r"use dep::Cheese;
@@ -954,7 +954,7 @@ pub struct fmt;
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    FMT<|>;
+    FMT$0;
 }
 ",
             r"use dep::FMT;
diff --git a/crates/assists/src/handlers/change_visibility.rs b/crates/assists/src/handlers/change_visibility.rs
index 22d7c95d9..ac8c44124 100644
--- a/crates/assists/src/handlers/change_visibility.rs
+++ b/crates/assists/src/handlers/change_visibility.rs
@@ -13,7 +13,7 @@ use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
 // Adds or changes existing visibility specifier.
 //
 // ```
-// <|>fn frobnicate() {}
+// $0fn frobnicate() {}
 // ```
 // ->
 // ```
@@ -118,23 +118,23 @@ mod tests {
 
     #[test]
     fn change_visibility_adds_pub_crate_to_items() {
-        check_assist(change_visibility, "<|>fn foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "f<|>n foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "<|>struct Foo {}", "pub(crate) struct Foo {}");
-        check_assist(change_visibility, "<|>mod foo {}", "pub(crate) mod foo {}");
-        check_assist(change_visibility, "<|>trait Foo {}", "pub(crate) trait Foo {}");
-        check_assist(change_visibility, "m<|>od {}", "pub(crate) mod {}");
-        check_assist(change_visibility, "unsafe f<|>n foo() {}", "pub(crate) unsafe fn foo() {}");
+        check_assist(change_visibility, "$0fn foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "f$0n foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "$0struct Foo {}", "pub(crate) struct Foo {}");
+        check_assist(change_visibility, "$0mod foo {}", "pub(crate) mod foo {}");
+        check_assist(change_visibility, "$0trait Foo {}", "pub(crate) trait Foo {}");
+        check_assist(change_visibility, "m$0od {}", "pub(crate) mod {}");
+        check_assist(change_visibility, "unsafe f$0n foo() {}", "pub(crate) unsafe fn foo() {}");
     }
 
     #[test]
     fn change_visibility_works_with_struct_fields() {
         check_assist(
             change_visibility,
-            r"struct S { <|>field: u32 }",
+            r"struct S { $0field: u32 }",
             r"struct S { pub(crate) field: u32 }",
         );
-        check_assist(change_visibility, r"struct S ( <|>u32 )", r"struct S ( pub(crate) u32 )");
+        check_assist(change_visibility, r"struct S ( $0u32 )", r"struct S ( pub(crate) u32 )");
     }
 
     #[test]
@@ -142,33 +142,33 @@ mod tests {
         mark::check!(change_visibility_field_false_positive);
         check_assist_not_applicable(
             change_visibility,
-            r"struct S { field: [(); { let <|>x = ();}] }",
+            r"struct S { field: [(); { let $0x = ();}] }",
         )
     }
 
     #[test]
     fn change_visibility_pub_to_pub_crate() {
-        check_assist(change_visibility, "<|>pub fn foo() {}", "pub(crate) fn foo() {}")
+        check_assist(change_visibility, "$0pub fn foo() {}", "pub(crate) fn foo() {}")
     }
 
     #[test]
     fn change_visibility_pub_crate_to_pub() {
-        check_assist(change_visibility, "<|>pub(crate) fn foo() {}", "pub fn foo() {}")
+        check_assist(change_visibility, "$0pub(crate) fn foo() {}", "pub fn foo() {}")
     }
 
     #[test]
     fn change_visibility_const() {
-        check_assist(change_visibility, "<|>const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
+        check_assist(change_visibility, "$0const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
     }
 
     #[test]
     fn change_visibility_static() {
-        check_assist(change_visibility, "<|>static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
+        check_assist(change_visibility, "$0static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
     }
 
     #[test]
     fn change_visibility_type_alias() {
-        check_assist(change_visibility, "<|>type T = ();", "pub(crate) type T = ();");
+        check_assist(change_visibility, "$0type T = ();", "pub(crate) type T = ();");
     }
 
     #[test]
@@ -181,7 +181,7 @@ mod tests {
             // comments
 
             #[derive(Debug)]
-            <|>struct Foo;
+            $0struct Foo;
             ",
             r"
             /// docs
@@ -199,14 +199,14 @@ mod tests {
         check_assist_not_applicable(
             change_visibility,
             r"mod foo { pub enum Foo {Foo1} }
-              fn main() { foo::Foo::Foo1<|> } ",
+              fn main() { foo::Foo::Foo1$0 } ",
         );
     }
 
     #[test]
     fn change_visibility_target() {
-        check_assist_target(change_visibility, "<|>fn foo() {}", "fn");
-        check_assist_target(change_visibility, "pub(crate)<|> fn foo() {}", "pub(crate)");
-        check_assist_target(change_visibility, "struct S { <|>field: u32 }", "field");
+        check_assist_target(change_visibility, "$0fn foo() {}", "fn");
+        check_assist_target(change_visibility, "pub(crate)$0 fn foo() {}", "pub(crate)");
+        check_assist_target(change_visibility, "struct S { $0field: u32 }", "field");
     }
 }
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs
index 667115382..a8a819cfc 100644
--- a/crates/assists/src/handlers/convert_integer_literal.rs
+++ b/crates/assists/src/handlers/convert_integer_literal.rs
@@ -7,7 +7,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel};
 // Converts the base of integer literals to other bases.
 //
 // ```
-// const _: i32 = 10<|>;
+// const _: i32 = 10$0;
 // ```
 // ->
 // ```
@@ -65,47 +65,47 @@ mod tests {
 
     #[test]
     fn binary_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0b1010<|>;", "0b1010");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0b1010$0;", "0b1010");
     }
 
     #[test]
     fn octal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0o12<|>;", "0o12");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0o12$0;", "0o12");
     }
 
     #[test]
     fn decimal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 10<|>;", "10");
+        check_assist_target(convert_integer_literal, "const _: i32 = 10$0;", "10");
     }
 
     #[test]
     fn hexadecimal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0xA<|>;", "0xA");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0xA$0;", "0xA");
     }
 
     #[test]
     fn binary_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0b10_10<|>;", "0b10_10");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0b10_10$0;", "0b10_10");
     }
 
     #[test]
     fn octal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0o1_2<|>;", "0o1_2");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0o1_2$0;", "0o1_2");
     }
 
     #[test]
     fn decimal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 1_0<|>;", "1_0");
+        check_assist_target(convert_integer_literal, "const _: i32 = 1_0$0;", "1_0");
     }
 
     #[test]
     fn hexadecimal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0x_A<|>;", "0x_A");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0x_A$0;", "0x_A");
     }
 
     #[test]
     fn convert_decimal_integer() {
-        let before = "const _: i32 = 1000<|>;";
+        let before = "const _: i32 = 1000$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -131,7 +131,7 @@ mod tests {
 
     #[test]
     fn convert_hexadecimal_integer() {
-        let before = "const _: i32 = 0xFF<|>;";
+        let before = "const _: i32 = 0xFF$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -157,7 +157,7 @@ mod tests {
 
     #[test]
     fn convert_binary_integer() {
-        let before = "const _: i32 = 0b11111111<|>;";
+        let before = "const _: i32 = 0b11111111$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -183,7 +183,7 @@ mod tests {
 
     #[test]
     fn convert_octal_integer() {
-        let before = "const _: i32 = 0o377<|>;";
+        let before = "const _: i32 = 0o377$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -209,7 +209,7 @@ mod tests {
 
     #[test]
     fn convert_integer_with_underscores() {
-        let before = "const _: i32 = 1_00_0<|>;";
+        let before = "const _: i32 = 1_00_0$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -235,7 +235,7 @@ mod tests {
 
     #[test]
     fn convert_integer_with_suffix() {
-        let before = "const _: i32 = 1000i32<|>;";
+        let before = "const _: i32 = 1000i32$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -262,7 +262,7 @@ mod tests {
     #[test]
     fn convert_overflowing_literal() {
         let before = "const _: i32 =
-            111111111111111111111111111111111111111111111111111111111111111111111111<|>;";
+            111111111111111111111111111111111111111111111111111111111111111111111111$0;";
         check_assist_not_applicable(convert_integer_literal, before);
     }
 }
diff --git a/crates/assists/src/handlers/early_return.rs b/crates/assists/src/handlers/early_return.rs
index 7bcc318a9..8bbbb7ed5 100644
--- a/crates/assists/src/handlers/early_return.rs
+++ b/crates/assists/src/handlers/early_return.rs
@@ -24,7 +24,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     <|>if cond {
+//     $0if cond {
 //         foo();
 //         bar();
 //     }
@@ -69,7 +69,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
 
     let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::BlockExpr::cast)?;
 
-    if parent_block.expr()? != if_expr.clone().into() {
+    if parent_block.tail_expr()? != if_expr.clone().into() {
         return None;
     }
 
@@ -200,7 +200,7 @@ mod tests {
             r#"
             fn main() {
                 bar();
-                if<|> true {
+                if$0 true {
                     foo();
 
                     //comment
@@ -230,7 +230,7 @@ mod tests {
             r#"
             fn main(n: Option<String>) {
                 bar();
-                if<|> let Some(n) = n {
+                if$0 let Some(n) = n {
                     foo(n);
 
                     //comment
@@ -260,7 +260,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> let Ok(x) = Err(92) {
+                if$0 let Ok(x) = Err(92) {
                     foo(x);
                 }
             }
@@ -284,7 +284,7 @@ mod tests {
             r#"
             fn main(n: Option<String>) {
                 bar();
-                if<|> let Ok(n) = n {
+                if$0 let Ok(n) = n {
                     foo(n);
 
                     //comment
@@ -315,7 +315,7 @@ mod tests {
             r#"
             fn main() {
                 while true {
-                    if<|> true {
+                    if$0 true {
                         foo();
                         bar();
                     }
@@ -343,7 +343,7 @@ mod tests {
             r#"
             fn main() {
                 while true {
-                    if<|> let Some(n) = n {
+                    if$0 let Some(n) = n {
                         foo(n);
                         bar();
                     }
@@ -372,7 +372,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if<|> true {
+                    if$0 true {
                         foo();
                         bar();
                     }
@@ -400,7 +400,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if<|> let Some(n) = n {
+                    if$0 let Some(n) = n {
                         foo(n);
                         bar();
                     }
@@ -428,7 +428,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     return;
                 }
             }
@@ -443,7 +443,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if<|> true {
+                    if$0 true {
                         continue;
                     }
                 }
@@ -458,7 +458,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     return
                 }
             }
@@ -472,7 +472,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     foo();
                 } else {
                     bar()
@@ -488,7 +488,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     foo();
                 }
                 bar();
@@ -504,7 +504,7 @@ mod tests {
             r#"
             fn main() {
                 if false {
-                    if<|> true {
+                    if$0 true {
                         foo();
                     }
                 }
diff --git a/crates/assists/src/handlers/expand_glob_import.rs b/crates/assists/src/handlers/expand_glob_import.rs
index f51a9a4ad..5fe617ba4 100644
--- a/crates/assists/src/handlers/expand_glob_import.rs
+++ b/crates/assists/src/handlers/expand_glob_import.rs
@@ -25,7 +25,7 @@ use crate::{
 //     pub struct Baz;
 // }
 //
-// use foo::*<|>;
+// use foo::*$0;
 //
 // fn qux(bar: Bar, baz: Baz) {}
 // ```
@@ -201,7 +201,7 @@ fn is_mod_visible_from(ctx: &AssistContext, module: Module, from: Module) -> boo
 // }
 //
 // ↓ ---------------
-// use foo::*<|>;
+// use foo::*$0;
 // use baz::Baz;
 // ↑ ---------------
 fn find_imported_defs(ctx: &AssistContext, star: SyntaxToken) -> Option<Vec<Def>> {
@@ -303,7 +303,7 @@ mod foo {
     pub fn f() {}
 }
 
-use foo::*<|>;
+use foo::*$0;
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -340,7 +340,7 @@ mod foo {
     pub fn f() {}
 }
 
-use foo::{*<|>, f};
+use foo::{*$0, f};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -378,7 +378,7 @@ mod foo {
 }
 
 use foo::Bar;
-use foo::{*<|>, f};
+use foo::{*$0, f};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -422,7 +422,7 @@ mod foo {
     }
 }
 
-use foo::{bar::{*<|>, f}, baz::*};
+use foo::{bar::{*$0, f}, baz::*};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -470,7 +470,7 @@ mod foo {
     }
 }
 
-use foo::{bar::{Bar, Baz, f}, baz::*<|>};
+use foo::{bar::{Bar, Baz, f}, baz::*$0};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -529,7 +529,7 @@ mod foo {
 
 use foo::{
     bar::{*, f},
-    baz::{g, qux::*<|>}
+    baz::{g, qux::*$0}
 };
 
 fn qux(bar: Bar, baz: Baz) {
@@ -605,7 +605,7 @@ mod foo {
 
 use foo::{
     bar::{*, f},
-    baz::{g, qux::{h, q::*<|>}}
+    baz::{g, qux::{h, q::*$0}}
 };
 
 fn qux(bar: Bar, baz: Baz) {
@@ -681,7 +681,7 @@ mod foo {
 
 use foo::{
     bar::{*, f},
-    baz::{g, qux::{q::j, *<|>}}
+    baz::{g, qux::{q::j, *$0}}
 };
 
 fn qux(bar: Bar, baz: Baz) {
@@ -747,7 +747,7 @@ fn qux(bar: Bar, baz: Baz) {
         // pub fn baz() {}
 
         // //- /main.rs crate:main deps:foo
-        // use foo::*<|>;
+        // use foo::*$0;
 
         // fn main() {
         //     bar!();
@@ -777,7 +777,7 @@ pub trait Tr {
 impl Tr for () {}
 
 //- /main.rs crate:main deps:foo
-use foo::*<|>;
+use foo::*$0;
 
 fn main() {
     ().method();
@@ -807,7 +807,7 @@ pub trait Tr2 {
 impl Tr2 for () {}
 
 //- /main.rs crate:main deps:foo
-use foo::*<|>;
+use foo::*$0;
 
 fn main() {
     ().method();
@@ -834,7 +834,7 @@ mod foo {
     }
 }
 
-use foo::bar::*<|>;
+use foo::bar::*$0;
 
 fn baz(bar: Bar) {}
 ",
@@ -851,7 +851,7 @@ mod foo {
     }
 }
 
-use foo::bar::baz::*<|>;
+use foo::bar::baz::*$0;
 
 fn qux(baz: Baz) {}
 ",
@@ -869,7 +869,7 @@ fn qux(baz: Baz) {}
         pub struct Qux;
     }
 
-    use foo::Bar<|>;
+    use foo::Bar$0;
 
     fn qux(bar: Bar, baz: Baz) {}
     ",
@@ -885,7 +885,7 @@ mod foo {
     pub struct Bar;
 }
 
-use foo::{*<|>};
+use foo::{*$0};
 
 struct Baz {
     bar: Bar
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
index 030b9cd0c..e3ef04932 100644
--- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -2,12 +2,16 @@ use std::iter;
 
 use either::Either;
 use hir::{AsName, Module, ModuleDef, Name, Variant};
-use ide_db::helpers::{
-    insert_use::{insert_use, ImportScope},
-    mod_path_to_ast,
+use ide_db::{
+    defs::Definition,
+    helpers::{
+        insert_use::{insert_use, ImportScope},
+        mod_path_to_ast,
+    },
+    search::FileReference,
+    RootDatabase,
 };
-use ide_db::{defs::Definition, search::Reference, RootDatabase};
-use rustc_hash::{FxHashMap, FxHashSet};
+use rustc_hash::FxHashSet;
 use syntax::{
     algo::{find_node_at_offset, SyntaxRewriter},
     ast::{self, edit::IndentLevel, make, AstNode, NameOwner, VisibilityOwner},
@@ -21,7 +25,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Extracts a struct from enum variant.
 //
 // ```
-// enum A { <|>One(u32, u32) }
+// enum A { $0One(u32, u32) }
 // ```
 // ->
 // ```
@@ -58,29 +62,29 @@ pub(crate) fn extract_struct_from_enum_variant(
             let mut visited_modules_set = FxHashSet::default();
             let current_module = enum_hir.module(ctx.db());
             visited_modules_set.insert(current_module);
-            let mut rewriters = FxHashMap::default();
-            for reference in usages {
-                let rewriter = rewriters
-                    .entry(reference.file_range.file_id)
-                    .or_insert_with(SyntaxRewriter::default);
-                let source_file = ctx.sema.parse(reference.file_range.file_id);
-                update_reference(
-                    ctx,
-                    rewriter,
-                    reference,
-                    &source_file,
-                    &enum_module_def,
-                    &variant_hir_name,
-                    &mut visited_modules_set,
-                );
-            }
-            let mut rewriter =
-                rewriters.remove(&ctx.frange.file_id).unwrap_or_else(SyntaxRewriter::default);
-            for (file_id, rewriter) in rewriters {
+            let mut def_rewriter = None;
+            for (file_id, references) in usages {
+                let mut rewriter = SyntaxRewriter::default();
+                let source_file = ctx.sema.parse(file_id);
+                for reference in references {
+                    update_reference(
+                        ctx,
+                        &mut rewriter,
+                        reference,
+                        &source_file,
+                        &enum_module_def,
+                        &variant_hir_name,
+                        &mut visited_modules_set,
+                    );
+                }
+                if file_id == ctx.frange.file_id {
+                    def_rewriter = Some(rewriter);
+                    continue;
+                }
                 builder.edit_file(file_id);
                 builder.rewrite(rewriter);
             }
-            builder.edit_file(ctx.frange.file_id);
+            let mut rewriter = def_rewriter.unwrap_or_default();
             update_variant(&mut rewriter, &variant);
             extract_struct_def(
                 &mut rewriter,
@@ -90,6 +94,7 @@ pub(crate) fn extract_struct_from_enum_variant(
                 &variant.parent_enum().syntax().clone().into(),
                 enum_ast.visibility(),
             );
+            builder.edit_file(ctx.frange.file_id);
             builder.rewrite(rewriter);
         },
     )
@@ -117,10 +122,14 @@ fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &Va
         .into_iter()
         .filter(|(_, def)| match def {
             // only check type-namespace
-            hir::ScopeDef::ModuleDef(def) => matches!(def,
-                ModuleDef::Module(_) | ModuleDef::Adt(_) |
-                ModuleDef::Variant(_) | ModuleDef::Trait(_) |
-                ModuleDef::TypeAlias(_) | ModuleDef::BuiltinType(_)
+            hir::ScopeDef::ModuleDef(def) => matches!(
+                def,
+                ModuleDef::Module(_)
+                    | ModuleDef::Adt(_)
+                    | ModuleDef::Variant(_)
+                    | ModuleDef::Trait(_)
+                    | ModuleDef::TypeAlias(_)
+                    | ModuleDef::BuiltinType(_)
             ),
             _ => false,
         })
@@ -201,13 +210,13 @@ fn update_variant(rewriter: &mut SyntaxRewriter, variant: &ast::Variant) -> Opti
 fn update_reference(
     ctx: &AssistContext,
     rewriter: &mut SyntaxRewriter,
-    reference: Reference,
+    reference: FileReference,
     source_file: &SourceFile,
     enum_module_def: &ModuleDef,
     variant_hir_name: &Name,
     visited_modules_set: &mut FxHashSet<Module>,
 ) -> Option<()> {
-    let offset = reference.file_range.range.start();
+    let offset = reference.range.start();
     let (segment, expr) = if let Some(path_expr) =
         find_node_at_offset::<ast::PathExpr>(source_file.syntax(), offset)
     {
@@ -247,7 +256,7 @@ mod tests {
     fn test_extract_struct_several_fields_tuple() {
         check_assist(
             extract_struct_from_enum_variant,
-            "enum A { <|>One(u32, u32) }",
+            "enum A { $0One(u32, u32) }",
             r#"struct One(pub u32, pub u32);
 
 enum A { One(One) }"#,
@@ -258,7 +267,7 @@ enum A { One(One) }"#,
     fn test_extract_struct_several_fields_named() {
         check_assist(
             extract_struct_from_enum_variant,
-            "enum A { <|>One { foo: u32, bar: u32 } }",
+            "enum A { $0One { foo: u32, bar: u32 } }",
             r#"struct One{ pub foo: u32, pub bar: u32 }
 
 enum A { One(One) }"#,
@@ -269,7 +278,7 @@ enum A { One(One) }"#,
     fn test_extract_struct_one_field_named() {
         check_assist(
             extract_struct_from_enum_variant,
-            "enum A { <|>One { foo: u32 } }",
+            "enum A { $0One { foo: u32 } }",
             r#"struct One{ pub foo: u32 }
 
 enum A { One(One) }"#,
@@ -281,7 +290,7 @@ enum A { One(One) }"#,
         check_assist(
             extract_struct_from_enum_variant,
             r#"const One: () = ();
-enum A { <|>One(u32, u32) }"#,
+enum A { $0One(u32, u32) }"#,
             r#"const One: () = ();
 struct One(pub u32, pub u32);
 
@@ -293,7 +302,7 @@ enum A { One(One) }"#,
     fn test_extract_struct_pub_visibility() {
         check_assist(
             extract_struct_from_enum_variant,
-            "pub enum A { <|>One(u32, u32) }",
+            "pub enum A { $0One(u32, u32) }",
             r#"pub struct One(pub u32, pub u32);
 
 pub enum A { One(One) }"#,
@@ -315,7 +324,7 @@ pub enum A { One(One) }"#,
         }
 
         pub enum MyEnum {
-            <|>MyField(u8, u8),
+            $0MyField(u8, u8),
         }
     }
 }
@@ -357,7 +366,7 @@ fn another_fn() {
             extract_struct_from_enum_variant,
             r#"
 enum E {
-    <|>V { i: i32, j: i32 }
+    $0V { i: i32, j: i32 }
 }
 
 fn f() {
@@ -385,7 +394,7 @@ fn f() {
             r#"
 //- /main.rs
 enum E {
-    <|>V(i32, i32)
+    $0V(i32, i32)
 }
 mod foo;
 
@@ -420,7 +429,7 @@ fn f() {
             r#"
 //- /main.rs
 enum E {
-    <|>V { i: i32, j: i32 }
+    $0V { i: i32, j: i32 }
 }
 mod foo;
 
@@ -453,7 +462,7 @@ fn f() {
         check_assist(
             extract_struct_from_enum_variant,
             r#"
-enum A { <|>One { a: u32, b: u32 } }
+enum A { $0One { a: u32, b: u32 } }
 
 struct B(A);
 
@@ -483,29 +492,29 @@ fn foo() {
 
     #[test]
     fn test_extract_enum_not_applicable_for_element_with_no_fields() {
-        check_not_applicable("enum A { <|>One }");
+        check_not_applicable("enum A { $0One }");
     }
 
     #[test]
     fn test_extract_enum_not_applicable_if_struct_exists() {
         check_not_applicable(
             r#"struct One;
-        enum A { <|>One(u8, u32) }"#,
+        enum A { $0One(u8, u32) }"#,
         );
     }
 
     #[test]
     fn test_extract_not_applicable_one_field() {
-        check_not_applicable(r"enum A { <|>One(u32) }");
+        check_not_applicable(r"enum A { $0One(u32) }");
     }
 
     #[test]
     fn test_extract_not_applicable_no_field_tuple() {
-        check_not_applicable(r"enum A { <|>None() }");
+        check_not_applicable(r"enum A { $0None() }");
     }
 
     #[test]
     fn test_extract_not_applicable_no_field_named() {
-        check_not_applicable(r"enum A { <|>None {} }");
+        check_not_applicable(r"enum A { $0None {} }");
     }
 }
diff --git a/crates/assists/src/handlers/extract_variable.rs b/crates/assists/src/handlers/extract_variable.rs
index 9957012fe..98f3dc6ca 100644
--- a/crates/assists/src/handlers/extract_variable.rs
+++ b/crates/assists/src/handlers/extract_variable.rs
@@ -16,7 +16,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     <|>(1 + 2)<|> * 4;
+//     $0(1 + 2)$0 * 4;
 // }
 // ```
 // ->
@@ -139,7 +139,7 @@ impl Anchor {
     fn from(to_extract: &ast::Expr) -> Option<Anchor> {
         to_extract.syntax().ancestors().find_map(|node| {
             if let Some(expr) =
-                node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.expr())
+                node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.tail_expr())
             {
                 if expr.syntax() == &node {
                     mark::hit!(test_extract_var_last_expr);
@@ -187,7 +187,7 @@ mod tests {
             extract_variable,
             r#"
 fn foo() {
-    foo(<|>1 + 1<|>);
+    foo($01 + 1$0);
 }"#,
             r#"
 fn foo() {
@@ -200,7 +200,7 @@ fn foo() {
     #[test]
     fn extract_var_in_comment_is_not_applicable() {
         mark::check!(extract_var_in_comment_is_not_applicable);
-        check_assist_not_applicable(extract_variable, "fn main() { 1 + /* <|>comment<|> */ 1; }");
+        check_assist_not_applicable(extract_variable, "fn main() { 1 + /* $0comment$0 */ 1; }");
     }
 
     #[test]
@@ -210,7 +210,7 @@ fn foo() {
             extract_variable,
             r#"
 fn foo() {
-    <|>1 + 1<|>;
+    $01 + 1$0;
 }"#,
             r#"
 fn foo() {
@@ -221,7 +221,7 @@ fn foo() {
             extract_variable,
             "
 fn foo() {
-    <|>{ let x = 0; x }<|>
+    $0{ let x = 0; x }$0
     something_else();
 }",
             "
@@ -238,7 +238,7 @@ fn foo() {
             extract_variable,
             "
 fn foo() {
-    <|>1<|> + 1;
+    $01$0 + 1;
 }",
             "
 fn foo() {
@@ -255,7 +255,7 @@ fn foo() {
             extract_variable,
             r#"
 fn foo() {
-    bar(<|>1 + 1<|>)
+    bar($01 + 1$0)
 }
 "#,
             r#"
@@ -269,7 +269,7 @@ fn foo() {
             extract_variable,
             r#"
 fn foo() {
-    <|>bar(1 + 1)<|>
+    $0bar(1 + 1)$0
 }
 "#,
             r#"
@@ -289,7 +289,7 @@ fn foo() {
 fn main() {
     let x = true;
     let tuple = match x {
-        true => (<|>2 + 2<|>, true)
+        true => ($02 + 2$0, true)
         _ => (0, false)
     };
 }
@@ -316,7 +316,7 @@ fn main() {
     let tuple = match x {
         true => {
             let y = 1;
-            (<|>2 + y<|>, true)
+            ($02 + y$0, true)
         }
         _ => (0, false)
     };
@@ -344,7 +344,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let lambda = |x: u32| <|>x * 2<|>;
+    let lambda = |x: u32| $0x * 2$0;
 }
 ",
             "
@@ -361,7 +361,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let lambda = |x: u32| { <|>x * 2<|> };
+    let lambda = |x: u32| { $0x * 2$0 };
 }
 ",
             "
@@ -378,7 +378,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let o = <|>Some(true)<|>;
+    let o = $0Some(true)$0;
 }
 ",
             "
@@ -396,7 +396,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let v = <|>bar.foo()<|>;
+    let v = $0bar.foo()$0;
 }
 ",
             "
@@ -414,7 +414,7 @@ fn main() {
             extract_variable,
             "
 fn foo() -> u32 {
-    <|>return 2 + 2<|>;
+    $0return 2 + 2$0;
 }
 ",
             "
@@ -434,7 +434,7 @@ fn foo() -> u32 {
 fn foo() -> u32 {
 
 
-    <|>return 2 + 2<|>;
+    $0return 2 + 2$0;
 }
 ",
             "
@@ -452,7 +452,7 @@ fn foo() -> u32 {
             "
 fn foo() -> u32 {
 
-        <|>return 2 + 2<|>;
+        $0return 2 + 2$0;
 }
 ",
             "
@@ -473,7 +473,7 @@ fn foo() -> u32 {
     // bar
 
 
-    <|>return 2 + 2<|>;
+    $0return 2 + 2$0;
 }
 ",
             "
@@ -497,7 +497,7 @@ fn foo() -> u32 {
             "
 fn main() {
     let result = loop {
-        <|>break 2 + 2<|>;
+        $0break 2 + 2$0;
     };
 }
 ",
@@ -518,7 +518,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let v = <|>0f32 as u32<|>;
+    let v = $00f32 as u32$0;
 }
 ",
             "
@@ -540,7 +540,7 @@ struct S {
 }
 
 fn main() {
-    S { foo: <|>1 + 1<|> }
+    S { foo: $01 + 1$0 }
 }
 "#,
             r#"
@@ -558,18 +558,18 @@ fn main() {
 
     #[test]
     fn test_extract_var_for_return_not_applicable() {
-        check_assist_not_applicable(extract_variable, "fn foo() { <|>return<|>; } ");
+        check_assist_not_applicable(extract_variable, "fn foo() { $0return$0; } ");
     }
 
     #[test]
     fn test_extract_var_for_break_not_applicable() {
-        check_assist_not_applicable(extract_variable, "fn main() { loop { <|>break<|>; }; }");
+        check_assist_not_applicable(extract_variable, "fn main() { loop { $0break$0; }; }");
     }
 
     // FIXME: This is not quite correct, but good enough(tm) for the sorting heuristic
     #[test]
     fn extract_var_target() {
-        check_assist_target(extract_variable, "fn foo() -> u32 { <|>return 2 + 2<|>; }", "2 + 2");
+        check_assist_target(extract_variable, "fn foo() -> u32 { $0return 2 + 2$0; }", "2 + 2");
 
         check_assist_target(
             extract_variable,
@@ -577,7 +577,7 @@ fn main() {
 fn main() {
     let x = true;
     let tuple = match x {
-        true => (<|>2 + 2<|>, true)
+        true => ($02 + 2$0, true)
         _ => (0, false)
     };
 }
diff --git a/crates/assists/src/handlers/fill_match_arms.rs b/crates/assists/src/handlers/fill_match_arms.rs
index cb60a3128..da47187e4 100644
--- a/crates/assists/src/handlers/fill_match_arms.rs
+++ b/crates/assists/src/handlers/fill_match_arms.rs
@@ -21,7 +21,7 @@ use crate::{
 //
 // fn handle(action: Action) {
 //     match action {
-//         <|>
+//         $0
 //     }
 // }
 // ```
@@ -196,7 +196,7 @@ fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::Variant) -> Optio
     let path = mod_path_to_ast(&module.find_use_path(db, ModuleDef::from(var))?);
 
     // FIXME: use HIR for this; it doesn't currently expose struct vs. tuple vs. unit variants though
-    let pat: ast::Pat = match var.source(db).value.kind() {
+    let pat: ast::Pat = match var.source(db)?.value.kind() {
         ast::StructKind::Tuple(field_list) => {
             let pats = iter::repeat(make::wildcard_pat().into()).take(field_list.fields().count());
             make::tuple_struct_pat(path, pats).into()
@@ -231,7 +231,7 @@ mod tests {
                 Cs(i32, Option<i32>),
             }
             fn main() {
-                match A::As<|> {
+                match A::As$0 {
                     A::As,
                     A::Bs{x,y:Some(_)} => {}
                     A::Cs(_, Some(_)) => {}
@@ -249,7 +249,7 @@ mod tests {
             fill_match_arms,
             r#"
             fn main() {
-                match (0, false)<|> {
+                match (0, false)$0 {
                 }
             }
             "#,
@@ -267,7 +267,7 @@ mod tests {
                 Cs(i32, Option<i32>),
             }
             fn main() {
-                match A::As<|> {
+                match A::As$0 {
                     A::Bs { x, y: Some(_) } => {}
                     A::Cs(_, Some(_)) => {}
                 }
@@ -297,7 +297,7 @@ mod tests {
             r#"
 enum A { As, Bs, Cs(Option<i32>) }
 fn main() {
-    match A::As<|> {
+    match A::As$0 {
         A::Cs(_) | A::Bs => {}
     }
 }
@@ -322,7 +322,7 @@ fn main() {
 enum A { As, Bs, Cs, Ds(String), Es(B) }
 enum B { Xs, Ys }
 fn main() {
-    match A::As<|> {
+    match A::As$0 {
         A::Bs if 0 < 1 => {}
         A::Ds(_value) => { let x = 1; }
         A::Es(B::Xs) => (),
@@ -352,7 +352,7 @@ fn main() {
             r#"
 enum A { As, Bs, Cs(Option<i32>) }
 fn main() {
-    match A::As<|> {
+    match A::As$0 {
         A::As(_) => {}
         a @ A::Bs(_) => {}
     }
@@ -380,7 +380,7 @@ enum A { As, Bs, Cs(String), Ds(String, String), Es { x: usize, y: usize } }
 
 fn main() {
     let a = A::As;
-    match a<|> {}
+    match a$0 {}
 }
 "#,
             r#"
@@ -411,7 +411,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (a<|>, b) {}
+                match (a$0, b) {}
             }
             "#,
             r#"
@@ -443,7 +443,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (&a<|>, &b) {}
+                match (&a$0, &b) {}
             }
             "#,
             r#"
@@ -475,7 +475,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (a<|>, b) {
+                match (a$0, b) {
                     (A::Two, B::One) => {}
                 }
             }
@@ -494,7 +494,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (a<|>, b) {
+                match (a$0, b) {
                     (A::Two, B::One) => {}
                     (A::One, B::One) => {}
                     (A::One, B::Two) => {}
@@ -517,7 +517,7 @@ fn main() {
 
             fn main() {
                 let a = A::One;
-                match (a<|>, ) {
+                match (a$0, ) {
                 }
             }
             "#,
@@ -532,7 +532,7 @@ fn main() {
             enum A { As }
 
             fn foo(a: &A) {
-                match a<|> {
+                match a$0 {
                 }
             }
             "#,
@@ -555,7 +555,7 @@ fn main() {
             }
 
             fn foo(a: &mut A) {
-                match a<|> {
+                match a$0 {
                 }
             }
             "#,
@@ -581,7 +581,7 @@ fn main() {
             enum E { X, Y }
 
             fn main() {
-                match E::X<|> {}
+                match E::X$0 {}
             }
             "#,
             "match E::X {}",
@@ -597,7 +597,7 @@ fn main() {
 
             fn main() {
                 match E::X {
-                    <|>_ => {}
+                    $0_ => {}