224 files changed, 4745 insertions, 3390 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 889ada401..ece1fd364 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -15,8 +15,8 @@ env:
  RUSTUP_MAX_RETRIES: 10
 jobs:
-  dist-windows:
+  dist-x86_64-pc-windows-msvc:
-    name: dist (Windows)
+    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:
+  dist-aarch64-pc-windows-msvc:
-    name: dist (Ubuntu 16.04)
+    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:
+  dist-x86_64-apple-darwin:
-    name: dist (MacOS latest)
+    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:
+  dist-aarch64-apple-darwin:
-    name: dist (MacOS 11.0)
+    name: dist (aarch64-apple-darwin)
-    runs-on: macos-11.0
+    runs-on: macos-latest
    env:
      RA_TARGET: aarch64-apple-darwin
@@ -133,18 +163,18 @@ jobs:
        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 1aa0c072d..57383491a 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",
 ]
@@ -132,7 +132,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345"
 dependencies = [
- "semver 0.11.0",
+ "semver",
 "serde",
 "serde_json",
 ]
@@ -168,9 +168,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 +180,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 +191,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,9 +204,9 @@ 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",
@@ -343,12 +343,6 @@ dependencies = [
 ]
 [[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-[[package]]
 name = "dissimilar"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -386,11 +380,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",
 ]
@@ -433,6 +427,7 @@ dependencies = [
 "jod-thread",
 "log",
 "serde_json",
+ "stdx",
 "toolchain",
 ]
@@ -488,19 +483,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"
@@ -834,19 +816,6 @@ dependencies = [
 ]
 [[package]]
-name = "loom"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
-dependencies = [
- "cfg-if 0.1.10",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
-]
-[[package]]
 name = "lsp-server"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1196,7 +1165,6 @@ name = "proc_macro_srv"
 version = "0.0.0"
 dependencies = [
 "cargo_metadata",
- "difference",
 "libloading",
 "mbe",
 "memmap",
@@ -1394,9 +1362,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",
 ]
@@ -1414,15 +1382,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"
@@ -1480,31 +1439,16 @@ 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"
-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"
@@ -1566,12 +1510,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]]
@@ -1582,9 +1525,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 [[package]]
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0"
 [[package]]
 name = "smol_str"
@@ -1615,9 +1558,9 @@ version = "0.0.0"
 [[package]]
 name = "syn"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72"
+checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1672,7 +1615,7 @@ dependencies = [
 name = "test_utils"
 version = "0.0.0"
 dependencies = [
- "difference",
+ "dissimilar",
 "rustc-hash",
 "serde_json",
 "stdx",
@@ -1826,15 +1769,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",
 ]
@@ -1854,9 +1798,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/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, SnippetCap};
-use ide_db::helpers::insert_use::MergeBehavior;
 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,
+    pub prefix_kind: hir::PrefixKind,
-}
-impl Default for InsertUseConfig {
-    fn default() -> Self {
-        InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain }
-    }
 }
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::{
+use crate::{assist_config::AssistConfig, Assist, AssistId, AssistKind, GroupLabel};
-    assist_config::{AssistConfig, SnippetCap},
-    Assist, AssistId, AssistKind, GroupLabel,
-};
 /// `AssistContext` allows to apply an assist or check if it could be applied.
 ///
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(
+        check_assist(add_explicit_type, "fn f() { let a$0: _ = 1; }", "fn f() { let a: i32 = 1; }");
-            add_explicit_type,
-            "fn f() { let a<|>: _ = 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, "$0fn foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "f<|>n foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "f$0n foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "<|>struct Foo {}", "pub(crate) struct Foo {}");
+        check_assist(change_visibility, "$0struct Foo {}", "pub(crate) struct Foo {}");
-        check_assist(change_visibility, "<|>mod foo {}", "pub(crate) mod foo {}");
+        check_assist(change_visibility, "$0mod foo {}", "pub(crate) mod foo {}");
-        check_assist(change_visibility, "<|>trait Foo {}", "pub(crate) trait Foo {}");
+        check_assist(change_visibility, "$0trait Foo {}", "pub(crate) trait Foo {}");
-        check_assist(change_visibility, "m<|>od {}", "pub(crate) mod {}");
+        check_assist(change_visibility, "m$0od {}", "pub(crate) mod {}");
-        check_assist(change_visibility, "unsafe f<|>n foo() {}", "pub(crate) unsafe fn foo() {}");
+        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, "$0fn foo() {}", "fn");
-        check_assist_target(change_visibility, "pub(crate)<|> fn foo() {}", "pub(crate)");
+        check_assist_target(change_visibility, "pub(crate)$0 fn foo() {}", "pub(crate)");
-        check_assist_target(change_visibility, "struct S { <|>field: u32 }", "field");
+        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..40028fc01 100644
--- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -21,7 +21,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Extracts a struct from enum variant.
 //
 // ```
-// enum A { <|>One(u32, u32) }
+// enum A { $0One(u32, u32) }
 // ```
 // ->
 // ```
@@ -117,10 +117,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,
+            hir::ScopeDef::ModuleDef(def) => matches!(
-                ModuleDef::Module(_) | ModuleDef::Adt(_) |
+                def,
-                ModuleDef::Variant(_) | ModuleDef::Trait(_) |
+                ModuleDef::Module(_)
-                ModuleDef::TypeAlias(_) | ModuleDef::BuiltinType(_)
+                    | ModuleDef::Adt(_)
+                    | ModuleDef::Variant(_)
+                    | ModuleDef::Trait(_)
+                    | ModuleDef::TypeAlias(_)
+                    | ModuleDef::BuiltinType(_)
            ),
            _ => false,
        })
@@ -247,7 +251,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 +262,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 +273,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 +285,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 +297,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 +319,7 @@ pub enum A { One(One) }"#,
        }
        pub enum MyEnum {
-            <|>MyField(u8, u8),
+            $0MyField(u8, u8),
        }
    }
 }
@@ -357,7 +361,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 +389,7 @@ fn f() {
            r#"
 //- /main.rs
 enum E {
-    <|>V(i32, i32)
+    $0V(i32, i32)
 }
 mod foo;
@@ -420,7 +424,7 @@ fn f() {
            r#"
 //- /main.rs
 enum E {
-    <|>V { i: i32, j: i32 }
+    $0V { i: i32, j: i32 }
 }
 mod foo;
@@ -453,7 +457,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 +487,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 f9a62b9fa..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
 //     }
 // }
 // ```
@@ -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_ => {}
                }
            }
            "#,
@@ -624,7 +624,7 @@ fn main() {
            fn main() {
                match X {
-                    <|>
+                    $0
                }
            }
            "#,
@@ -650,7 +650,7 @@ fn main() {
            enum A { One, Two }
            fn foo(a: A) {
                match a {
-                    // foo bar baz<|>
+                    // foo bar baz$0
                    A::One => {}
                    // This is where the rest should be
                }
@@ -678,7 +678,7 @@ fn main() {
            enum A { One, Two }
            fn foo(a: A) {
                match a {
-                    // foo bar baz<|>
+                    // foo bar baz$0
                }
            }
            "#,
@@ -702,7 +702,7 @@ fn main() {
            r#"
            enum A { One, Two, }
            fn foo(a: A) {
-                match a<|> {
+                match a$0 {
                    _ => (),
                }
            }
@@ -724,7 +724,7 @@ fn main() {
        mark::check!(option_order);
        let before = r#"
 fn foo(opt: Option<i32>) {
-    match opt<|> {
+    match opt$0 {
    }
 }
 "#;
diff --git a/crates/assists/src/handlers/fix_visibility.rs b/crates/assists/src/handlers/fix_visibility.rs
index de1e8f0bf..6c7824e55 100644
--- a/crates/assists/src/handlers/fix_visibility.rs
+++ b/crates/assists/src/handlers/fix_visibility.rs
@@ -18,7 +18,7 @@ use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
 //     fn frobnicate() {}
 // }
 // fn main() {
-//     m::frobnicate<|>() {}
+//     m::frobnicate$0() {}
 // }
 // ```
 // ->
@@ -97,7 +97,6 @@ fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext) ->
    let parent_name = parent.name(ctx.db());
    let target_module = parent.module(ctx.db());
-    #[allow(deprecated)]
    let in_file_source = record_field_def.source(ctx.db())?;
    let (offset, current_visibility, target) = match in_file_source.value {
        hir::FieldSource::Named(it) => {
@@ -219,14 +218,14 @@ mod tests {
        check_assist(
            fix_visibility,
            r"mod foo { fn foo() {} }
-              fn main() { foo::foo<|>() } ",
+              fn main() { foo::foo$0() } ",
            r"mod foo { $0pub(crate) fn foo() {} }
              fn main() { foo::foo() } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub fn foo() {} }
-              fn main() { foo::foo<|>() } ",
+              fn main() { foo::foo$0() } ",
        )
    }
@@ -235,38 +234,38 @@ mod tests {
        check_assist(
            fix_visibility,
            r"mod foo { struct Foo; }
-              fn main() { foo::Foo<|> } ",
+              fn main() { foo::Foo$0 } ",
            r"mod foo { $0pub(crate) struct Foo; }
              fn main() { foo::Foo } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub struct Foo; }
-              fn main() { foo::Foo<|> } ",
+              fn main() { foo::Foo$0 } ",
        );
        check_assist(
            fix_visibility,
            r"mod foo { enum Foo; }
-              fn main() { foo::Foo<|> } ",
+              fn main() { foo::Foo$0 } ",
            r"mod foo { $0pub(crate) enum Foo; }
              fn main() { foo::Foo } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub enum Foo; }
-              fn main() { foo::Foo<|> } ",
+              fn main() { foo::Foo$0 } ",
        );
        check_assist(
            fix_visibility,
            r"mod foo { union Foo; }
-              fn main() { foo::Foo<|> } ",
+              fn main() { foo::Foo$0 } ",
            r"mod foo { $0pub(crate) union Foo; }
              fn main() { foo::Foo } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub union Foo; }
-              fn main() { foo::Foo<|> } ",
+              fn main() { foo::Foo$0 } ",
        );
    }
@@ -277,7 +276,7 @@ mod tests {
            r"
 //- /main.rs
 mod foo;
-fn main() { foo::Foo<|> }
+fn main() { foo::Foo$0 }
 //- /foo.rs
 struct Foo;
@@ -292,7 +291,7 @@ struct Foo;
        check_assist(
            fix_visibility,
            r"mod foo { pub struct Foo { bar: (), } }
-              fn main() { foo::Foo { <|>bar: () }; } ",
+              fn main() { foo::Foo { $0bar: () }; } ",
            r"mod foo { pub struct Foo { $0pub(crate) bar: (), } }
              fn main() { foo::Foo { bar: () }; } ",
        );
@@ -301,7 +300,7 @@ struct Foo;
            r"
 //- /lib.rs
 mod foo;
-fn main() { foo::Foo { <|>bar: () }; }
+fn main() { foo::Foo { $0bar: () }; }
 //- /foo.rs
 pub struct Foo { bar: () }
 ",
@@ -311,14 +310,14 @@ pub struct Foo { bar: () }
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub struct Foo { pub bar: (), } }
-              fn main() { foo::Foo { <|>bar: () }; } ",
+              fn main() { foo::Foo { $0bar: () }; } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"
 //- /lib.rs
 mod foo;
-fn main() { foo::Foo { <|>bar: () }; }
+fn main() { foo::Foo { $0bar: () }; }
 //- /foo.rs
 pub struct Foo { pub bar: () }
 ",
@@ -332,14 +331,14 @@ pub struct Foo { pub bar: () }
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub enum Foo { Bar { bar: () } } }
-              fn main() { foo::Foo::Bar { <|>bar: () }; } ",
+              fn main() { foo::Foo::Bar { $0bar: () }; } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"
 //- /lib.rs
 mod foo;
-fn main() { foo::Foo::Bar { <|>bar: () }; }
+fn main() { foo::Foo::Bar { $0bar: () }; }
 //- /foo.rs
 pub enum Foo { Bar { bar: () } }
 ",
@@ -347,14 +346,14 @@ pub enum Foo { Bar { bar: () } }
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub struct Foo { pub bar: (), } }
-              fn main() { foo::Foo { <|>bar: () }; } ",
+              fn main() { foo::Foo { $0bar: () }; } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"
 //- /lib.rs
 mod foo;
-fn main() { foo::Foo { <|>bar: () }; }
+fn main() { foo::Foo { $0bar: () }; }
 //- /foo.rs
 pub struct Foo { pub bar: () }
 ",
@@ -368,7 +367,7 @@ pub struct Foo { pub bar: () }
        check_assist(
            fix_visibility,
            r"mod foo { pub union Foo { bar: (), } }
-              fn main() { foo::Foo { <|>bar: () }; } ",
+              fn main() { foo::Foo { $0bar: () }; } ",
            r"mod foo { pub union Foo { $0pub(crate) bar: (), } }
              fn main() { foo::Foo { bar: () }; } ",
        );
@@ -377,7 +376,7 @@ pub struct Foo { pub bar: () }
            r"
 //- /lib.rs
 mod foo;
-fn main() { foo::Foo { <|>bar: () }; }
+fn main() { foo::Foo { $0bar: () }; }
 //- /foo.rs
 pub union Foo { bar: () }
 ",
@@ -387,14 +386,14 @@ pub union Foo { bar: () }
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub union Foo { pub bar: (), } }
-              fn main() { foo::Foo { <|>bar: () }; } ",
+              fn main() { foo::Foo { $0bar: () }; } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"
 //- /lib.rs
 mod foo;
-fn main() { foo::Foo { <|>bar: () }; }
+fn main() { foo::Foo { $0bar: () }; }
 //- /foo.rs
 pub union Foo { pub bar: () }
 ",
@@ -406,14 +405,14 @@ pub union Foo { pub bar: () }
        check_assist(
            fix_visibility,
            r"mod foo { const FOO: () = (); }
-              fn main() { foo::FOO<|> } ",
+              fn main() { foo::FOO$0 } ",
            r"mod foo { $0pub(crate) const FOO: () = (); }
              fn main() { foo::FOO } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub const FOO: () = (); }
-              fn main() { foo::FOO<|> } ",
+              fn main() { foo::FOO$0 } ",
        );
    }
@@ -422,14 +421,14 @@ pub union Foo { pub bar: () }
        check_assist(
            fix_visibility,
            r"mod foo { static FOO: () = (); }
-              fn main() { foo::FOO<|> } ",
+              fn main() { foo::FOO$0 } ",
            r"mod foo { $0pub(crate) static FOO: () = (); }
              fn main() { foo::FOO } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub static FOO: () = (); }
-              fn main() { foo::FOO<|> } ",
+              fn main() { foo::FOO$0 } ",
        );
    }
@@ -438,14 +437,14 @@ pub union Foo { pub bar: () }
        check_assist(
            fix_visibility,
            r"mod foo { trait Foo { fn foo(&self) {} } }
-              fn main() { let x: &dyn foo::<|>Foo; } ",
+              fn main() { let x: &dyn foo::$0Foo; } ",
            r"mod foo { $0pub(crate) trait Foo { fn foo(&self) {} } }
              fn main() { let x: &dyn foo::Foo; } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub trait Foo { fn foo(&self) {} } }
-              fn main() { let x: &dyn foo::Foo<|>; } ",
+              fn main() { let x: &dyn foo::Foo$0; } ",
        );
    }
@@ -454,14 +453,14 @@ pub union Foo { pub bar: () }
        check_assist(
            fix_visibility,
            r"mod foo { type Foo = (); }
-              fn main() { let x: foo::Foo<|>; } ",
+              fn main() { let x: foo::Foo$0; } ",
            r"mod foo { $0pub(crate) type Foo = (); }
              fn main() { let x: foo::Foo; } ",
        );
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub type Foo = (); }
-              fn main() { let x: foo::Foo<|>; } ",
+              fn main() { let x: foo::Foo$0; } ",
        );
    }
@@ -470,7 +469,7 @@ pub union Foo { pub bar: () }
        check_assist(
            fix_visibility,
            r"mod foo { mod bar { fn bar() {} } }
-              fn main() { foo::bar<|>::bar(); } ",
+              fn main() { foo::bar$0::bar(); } ",
            r"mod foo { $0pub(crate) mod bar { fn bar() {} } }
              fn main() { foo::bar::bar(); } ",
        );
@@ -480,7 +479,7 @@ pub union Foo { pub bar: () }
            r"
 //- /main.rs
 mod foo;
-fn main() { foo::bar<|>::baz(); }
+fn main() { foo::bar$0::baz(); }
 //- /foo.rs
 mod bar {
@@ -496,7 +495,7 @@ mod bar {
        check_assist_not_applicable(
            fix_visibility,
            r"mod foo { pub mod bar { pub fn bar() {} } }
-              fn main() { foo::bar<|>::bar(); } ",
+              fn main() { foo::bar$0::bar(); } ",
        );
    }
@@ -507,7 +506,7 @@ mod bar {
            r"
 //- /main.rs
 mod foo;
-fn main() { foo::bar<|>::baz(); }
+fn main() { foo::bar$0::baz(); }
 //- /foo.rs
 mod bar;
@@ -526,7 +525,7 @@ pub fn baz() {}
            r"
 //- /main.rs
 mod foo;
-fn main() { foo::bar<|>>::baz(); }
+fn main() { foo::bar$0>::baz(); }
 //- /foo.rs
 mod bar {
@@ -546,7 +545,7 @@ mod bar {
            fix_visibility,
            r"
 //- /main.rs crate:a deps:foo
-foo::Bar<|>
+foo::Bar$0
 //- /lib.rs crate:foo
 struct Bar;
 ",
@@ -561,7 +560,7 @@ struct Bar;
            fix_visibility,
            r"
 //- /main.rs crate:a deps:foo
-foo::Bar<|>
+foo::Bar$0
 //- /lib.rs crate:foo
 pub(crate) struct Bar;
 ",
@@ -573,7 +572,7 @@ pub(crate) struct Bar;
            r"
 //- /main.rs crate:a deps:foo
 fn main() {
-    foo::Foo { <|>bar: () };
+    foo::Foo { $0bar: () };
 }
 //- /lib.rs crate:foo
 pub struct Foo { pub(crate) bar: () }
@@ -594,7 +593,7 @@ pub struct Foo { pub(crate) bar: () }
                use bar::Baz;
                mod bar { pub(super) struct Baz; }
            }
-            foo::Baz<|>
+            foo::Baz$0
            ",
            r"
            mod foo {
diff --git a/crates/assists/src/handlers/flip_binexpr.rs b/crates/assists/src/handlers/flip_binexpr.rs
index 404f06133..209e5d43c 100644
--- a/crates/assists/src/handlers/flip_binexpr.rs
+++ b/crates/assists/src/handlers/flip_binexpr.rs
@@ -8,7 +8,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     let _ = 90 +<|> 2;
+//     let _ = 90 +$0 2;
 // }
 // ```
 // ->
@@ -77,42 +77,34 @@ mod tests {
    #[test]
    fn flip_binexpr_target_is_the_op() {
-        check_assist_target(flip_binexpr, "fn f() { let res = 1 ==<|> 2; }", "==")
+        check_assist_target(flip_binexpr, "fn f() { let res = 1 ==$0 2; }", "==")
    }
    #[test]
    fn flip_binexpr_not_applicable_for_assignment() {
-        check_assist_not_applicable(flip_binexpr, "fn f() { let mut _x = 1; _x +=<|> 2 }")
+        check_assist_not_applicable(flip_binexpr, "fn f() { let mut _x = 1; _x +=$0 2 }")
    }
    #[test]
    fn flip_binexpr_works_for_eq() {
-        check_assist(
+        check_assist(flip_binexpr, "fn f() { let res = 1 ==$0 2; }", "fn f() { let res = 2 == 1; }")
-            flip_binexpr,
-            "fn f() { let res = 1 ==<|> 2; }",
-            "fn f() { let res = 2 == 1; }",
-        )
    }
    #[test]
    fn flip_binexpr_works_for_gt() {
-        check_assist(flip_binexpr, "fn f() { let res = 1 ><|> 2; }", "fn f() { let res = 2 < 1; }")
+        check_assist(flip_binexpr, "fn f() { let res = 1 >$0 2; }", "fn f() { let res = 2 < 1; }")
    }
    #[test]
    fn flip_binexpr_works_for_lteq() {
-        check_assist(
+        check_assist(flip_binexpr, "fn f() { let res = 1 <=$0 2; }", "fn f() { let res = 2 >= 1; }")
-            flip_binexpr,
-            "fn f() { let res = 1 <=<|> 2; }",
-            "fn f() { let res = 2 >= 1; }",
-        )
    }
    #[test]
    fn flip_binexpr_works_for_complex_expr() {
        check_assist(
            flip_binexpr,
-            "fn f() { let res = (1 + 1) ==<|> (2 + 2); }",
+            "fn f() { let res = (1 + 1) ==$0 (2 + 2); }",
            "fn f() { let res = (2 + 2) == (1 + 1); }",
        )
    }
@@ -125,7 +117,7 @@ mod tests {
            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
                match other.downcast_ref::<Self>() {
                    None => false,
-                    Some(it) => it ==<|> self,
+                    Some(it) => it ==$0 self,
                }
            }
            "#,
diff --git a/crates/assists/src/handlers/flip_comma.rs b/crates/assists/src/handlers/flip_comma.rs
index 64b4b1a76..18cf64a34 100644
--- a/crates/assists/src/handlers/flip_comma.rs
+++ b/crates/assists/src/handlers/flip_comma.rs
@@ -8,7 +8,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     ((1, 2),<|> (3, 4));
+//     ((1, 2),$0 (3, 4));
 // }
 // ```
 // ->
@@ -49,14 +49,14 @@ mod tests {
    fn flip_comma_works_for_function_parameters() {
        check_assist(
            flip_comma,
-            "fn foo(x: i32,<|> y: Result<(), ()>) {}",
+            r#"fn foo(x: i32,$0 y: Result<(), ()>) {}"#,
-            "fn foo(y: Result<(), ()>, x: i32) {}",
+            r#"fn foo(y: Result<(), ()>, x: i32) {}"#,
        )
    }
    #[test]
    fn flip_comma_target() {
-        check_assist_target(flip_comma, "fn foo(x: i32,<|> y: Result<(), ()>) {}", ",")
+        check_assist_target(flip_comma, r#"fn foo(x: i32,$0 y: Result<(), ()>) {}"#, ",")
    }
    #[test]
@@ -68,7 +68,7 @@ mod tests {
        check_assist_target(
            flip_comma,
            "pub enum Test { \
-             A,<|> \
+             A,$0 \
             }",
            ",",
        );
@@ -76,7 +76,7 @@ mod tests {
        check_assist_target(
            flip_comma,
            "pub struct Test { \
-             foo: usize,<|> \
+             foo: usize,$0 \
             }",
            ",",
        );
diff --git a/crates/assists/src/handlers/flip_trait_bound.rs b/crates/assists/src/handlers/flip_trait_bound.rs
index 92ee42181..d419d263e 100644
--- a/crates/assists/src/handlers/flip_trait_bound.rs
+++ b/crates/assists/src/handlers/flip_trait_bound.rs
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Flips two trait bounds.
 //
 // ```
-// fn foo<T: Clone +<|> Copy>() { }
+// fn foo<T: Clone +$0 Copy>() { }
 // ```
 // ->
 // ```
@@ -52,19 +52,19 @@ mod tests {
    #[test]
    fn flip_trait_bound_assist_available() {
-        check_assist_target(flip_trait_bound, "struct S<T> where T: A <|>+ B + C { }", "+")
+        check_assist_target(flip_trait_bound, "struct S<T> where T: A $0+ B + C { }", "+")
    }
    #[test]
    fn flip_trait_bound_not_applicable_for_single_trait_bound() {
-        check_assist_not_applicable(flip_trait_bound, "struct S<T> where T: <|>A { }")
+        check_assist_not_applicable(flip_trait_bound, "struct S<T> where T: $0A { }")
    }
    #[test]
    fn flip_trait_bound_works_for_struct() {
        check_assist(
            flip_trait_bound,
-            "struct S<T> where T: A <|>+ B { }",
+            "struct S<T> where T: A $0+ B { }",
            "struct S<T> where T: B + A { }",
        )
    }
@@ -73,21 +73,21 @@ mod tests {
    fn flip_trait_bound_works_for_trait_impl() {
        check_assist(
            flip_trait_bound,
-            "impl X for S<T> where T: A +<|> B { }",
+            "impl X for S<T> where T: A +$0 B { }",
            "impl X for S<T> where T: B + A { }",
        )
    }
    #[test]
    fn flip_trait_bound_works_for_fn() {
-        check_assist(flip_trait_bound, "fn f<T: A <|>+ B>(t: T) { }", "fn f<T: B + A>(t: T) { }")
+        check_assist(flip_trait_bound, "fn f<T: A $0+ B>(t: T) { }", "fn f<T: B + A>(t: T) { }")
    }
    #[test]
    fn flip_trait_bound_works_for_fn_where_clause() {
        check_assist(
            flip_trait_bound,
-            "fn f<T>(t: T) where T: A +<|> B { }",
+            "fn f<T>(t: T) where T: A +$0 B { }",
            "fn f<T>(t: T) where T: B + A { }",
        )
    }
@@ -96,7 +96,7 @@ mod tests {
    fn flip_trait_bound_works_for_lifetime() {
        check_assist(
            flip_trait_bound,
-            "fn f<T>(t: T) where T: A <|>+ 'static { }",
+            "fn f<T>(t: T) where T: A $0+ 'static { }",
            "fn f<T>(t: T) where T: 'static + A { }",
        )
    }
@@ -105,7 +105,7 @@ mod tests {
    fn flip_trait_bound_works_for_complex_bounds() {
        check_assist(
            flip_trait_bound,
-            "struct S<T> where T: A<T> <|>+ b_mod::B<T> + C<T> { }",
+            "struct S<T> where T: A<T> $0+ b_mod::B<T> + C<T> { }",
            "struct S<T> where T: b_mod::B<T> + A<T> + C<T> { }",
        )
    }
@@ -114,7 +114,7 @@ mod tests {
    fn flip_trait_bound_works_for_long_bounds() {
        check_assist(
            flip_trait_bound,
-            "struct S<T> where T: A + B + C + D + E + F +<|> G + H + I + J { }",
+            "struct S<T> where T: A + B + C + D + E + F +$0 G + H + I + J { }",
            "struct S<T> where T: A + B + C + D + E + G + F + H + I + J { }",
        )
    }
diff --git a/crates/assists/src/handlers/generate_default_from_enum_variant.rs b/crates/assists/src/handlers/generate_default_from_enum_variant.rs
index bcea46735..6a2ab9596 100644
--- a/crates/assists/src/handlers/generate_default_from_enum_variant.rs
+++ b/crates/assists/src/handlers/generate_default_from_enum_variant.rs
@@ -12,7 +12,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // enum Version {
 //  Undefined,
-//  Minor<|>,
+//  Minor$0,
 //  Major,
 // }
 // ```
@@ -108,7 +108,7 @@ mod tests {
            r#"
 enum Variant {
    Undefined,
-    Minor<|>,
+    Minor$0,
    Major,
 }"#,
            r#"enum Variant {
@@ -132,7 +132,7 @@ impl Default for Variant {
            r#"
 enum Variant {
    Undefined,
-    Minor<|>,
+    Minor$0,
    Major,
 }
@@ -151,7 +151,7 @@ impl Default for Variant {
            r#"
 enum Variant {
    Undefined,
-    Minor(u32)<|>,
+    Minor(u32)$0,
    Major,
 }"#,
        );
@@ -161,7 +161,7 @@ enum Variant {
    fn test_generate_default_from_variant_with_one_variant() {
        check_assist(
            generate_default_from_enum_variant,
-            r#"enum Variant { Undefi<|>ned }"#,
+            r#"enum Variant { Undefi$0ned }"#,
            r#"
 enum Variant { Undefined }
diff --git a/crates/assists/src/handlers/generate_derive.rs b/crates/assists/src/handlers/generate_derive.rs
index 314504e15..f876b7684 100644
--- a/crates/assists/src/handlers/generate_derive.rs
+++ b/crates/assists/src/handlers/generate_derive.rs
@@ -13,7 +13,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // struct Point {
 //     x: u32,
-//     y: u32,<|>
+//     y: u32,$0
 // }
 // ```
 // ->
@@ -76,12 +76,12 @@ mod tests {
    fn add_derive_new() {
        check_assist(
            generate_derive,
-            "struct Foo { a: i32, <|>}",
+            "struct Foo { a: i32, $0}",
            "#[derive($0)]\nstruct Foo { a: i32, }",
        );
        check_assist(
            generate_derive,
-            "struct Foo { <|> a: i32, }",
+            "struct Foo { $0 a: i32, }",
            "#[derive($0)]\nstruct Foo {  a: i32, }",
        );
    }
@@ -90,7 +90,7 @@ mod tests {
    fn add_derive_existing() {
        check_assist(
            generate_derive,
-            "#[derive(Clone)]\nstruct Foo { a: i32<|>, }",
+            "#[derive(Clone)]\nstruct Foo { a: i32$0, }",
            "#[derive(Clone$0)]\nstruct Foo { a: i32, }",
        );
    }
@@ -102,7 +102,7 @@ mod tests {
            "
 /// `Foo` is a pretty important struct.
 /// It does stuff.
-struct Foo { a: i32<|>, }
+struct Foo { a: i32$0, }
            ",
            "
 /// `Foo` is a pretty important struct.
@@ -121,7 +121,7 @@ struct Foo { a: i32, }
 struct SomeThingIrrelevant;
 /// `Foo` is a pretty important struct.
 /// It does stuff.
-struct Foo { a: i32<|>, }
+struct Foo { a: i32$0, }
 struct EvenMoreIrrelevant;
            ",
            "/// `Foo` is a pretty important struct.
diff --git a/crates/assists/src/handlers/generate_from_impl_for_enum.rs b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
index 3c374e5d9..d9af6ab11 100644
--- a/crates/assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
@@ -10,7 +10,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Adds a From impl for an enum variant with one tuple field.
 //
 // ```
-// enum A { <|>One(u32) }
+// enum A { $0One(u32) }
 // ```
 // ->
 // ```
@@ -101,7 +101,7 @@ mod tests {
    fn test_generate_from_impl_for_enum() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum A { <|>One(u32) }",
+            "enum A { $0One(u32) }",
            r#"enum A { One(u32) }
 impl From<u32> for A {
@@ -116,7 +116,7 @@ impl From<u32> for A {
    fn test_generate_from_impl_for_enum_complicated_path() {
        check_assist(
            generate_from_impl_for_enum,
-            r#"enum A { <|>One(foo::bar::baz::Boo) }"#,
+            r#"enum A { $0One(foo::bar::baz::Boo) }"#,
            r#"enum A { One(foo::bar::baz::Boo) }
 impl From<foo::bar::baz::Boo> for A {
@@ -135,17 +135,17 @@ impl From<foo::bar::baz::Boo> for A {
    #[test]
    fn test_add_from_impl_no_element() {
-        check_not_applicable("enum A { <|>One }");
+        check_not_applicable("enum A { $0One }");
    }
    #[test]
    fn test_add_from_impl_more_than_one_element_in_tuple() {
-        check_not_applicable("enum A { <|>One(u32, String) }");
+        check_not_applicable("enum A { $0One(u32, String) }");
    }
    #[test]
    fn test_add_from_impl_struct_variant() {
-        check_not_applicable("enum A { <|>One { x: u32 } }");
+        check_not_applicable("enum A { $0One { x: u32 } }");
    }
    #[test]
@@ -153,7 +153,7 @@ impl From<foo::bar::baz::Boo> for A {
        mark::check!(test_add_from_impl_already_exists);
        check_not_applicable(
            r#"
-enum A { <|>One(u32), }
+enum A { $0One(u32), }
 impl From<u32> for A {
    fn from(v: u32) -> Self {
@@ -168,7 +168,7 @@ impl From<u32> for A {
    fn test_add_from_impl_different_variant_impl_exists() {
        check_assist(
            generate_from_impl_for_enum,
-            r#"enum A { <|>One(u32), Two(String), }
+            r#"enum A { $0One(u32), Two(String), }
 impl From<String> for A {
    fn from(v: String) -> Self {
diff --git a/crates/assists/src/handlers/generate_function.rs b/crates/assists/src/handlers/generate_function.rs
index f4cf155b6..06ac85f67 100644
--- a/crates/assists/src/handlers/generate_function.rs
+++ b/crates/assists/src/handlers/generate_function.rs
@@ -1,5 +1,5 @@
 use hir::HirDisplay;
-use ide_db::base_db::FileId;
+use ide_db::{base_db::FileId, helpers::SnippetCap};
 use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::{
    ast::{
@@ -11,7 +11,6 @@ use syntax::{
 };
 use crate::{
-    assist_config::SnippetCap,
    utils::{render_snippet, Cursor},
    AssistContext, AssistId, AssistKind, Assists,
 };
@@ -24,7 +23,7 @@ use crate::{
 // struct Baz;
 // fn baz() -> Baz { Baz }
 // fn foo() {
-//     bar<|>("", baz());
+//     bar$0("", baz());
 // }
 //
 // ```
@@ -343,7 +342,7 @@ mod tests {
            generate_function,