212 files changed, 4433 insertions, 3147 deletions

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/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..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,
-                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,
         })
@@ -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(
-            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_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(
-            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_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<(), ()>) {}",
-            "fn foo(y: Result<(), ()>, x: i32) {}",
+            r#"fn foo(x: i32,$0 y: Result<(), ()>) {}"#,
+            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,
             r"
 fn foo() {
-    bar<|>();
+    bar$0();
 }
 ",
             r"
@@ -367,7 +366,7 @@ fn bar() ${0:-> ()} {
             r"
 impl Foo {
     fn foo() {
-        bar<|>();
+        bar$0();
     }
 }
 ",
@@ -392,7 +391,7 @@ fn bar() ${0:-> ()} {
             generate_function,
             r"
 fn foo1() {
-    bar<|>();
+    bar$0();
 }
 
 fn foo2() {}
@@ -418,7 +417,7 @@ fn foo2() {}
             r"
 mod baz {
     fn foo() {
-        bar<|>();
+        bar$0();
     }
 }
 ",
@@ -444,7 +443,7 @@ mod baz {
 struct Baz;
 fn baz() -> Baz { todo!() }
 fn foo() {
-    bar<|>(baz());
+    bar$0(baz());
 }
 ",
             r"
@@ -469,7 +468,7 @@ fn bar(baz: Baz) ${0:-> ()} {
 struct Baz;
 impl Baz {
     fn foo(&self) -> Baz {
-        ba<|>r(self.baz())
+        ba$0r(self.baz())
     }
     fn baz(&self) -> Baz {
         Baz
@@ -500,7 +499,7 @@ fn bar(baz: Baz) ${0:-> ()} {
             generate_function,
             r#"
 fn foo() {
-    <|>bar("bar")
+    $0bar("bar")
 }
 "#,
             r#"
@@ -521,7 +520,7 @@ fn bar(arg: &str) ${0:-> ()} {
             generate_function,
             r#"
 fn foo() {
-    <|>bar('x')
+    $0bar('x')
 }
 "#,
             r#"
@@ -542,7 +541,7 @@ fn bar(arg: char) ${0:-> ()} {
             generate_function,
             r"
 fn foo() {
-    <|>bar(42)
+    $0bar(42)
 }
 ",
             r"
@@ -563,7 +562,7 @@ fn bar(arg: i32) ${0:-> ()} {
             generate_function,
             r"
 fn foo() {
-    <|>bar(42 as u8)
+    $0bar(42 as u8)
 }
 ",
             r"
@@ -587,7 +586,7 @@ fn bar(arg: u8) ${0:-> ()} {
             r"
 fn foo() {
     let x = 42;
-    bar<|>(x as u8)
+    bar$0(x as u8)
 }
 ",
             r"
@@ -610,7 +609,7 @@ fn bar(x: u8) ${0:-> ()} {
             r"
 fn foo() {
     let worble = ();
-    <|>bar(worble)
+    $0bar(worble)
 }
 ",
             r"
@@ -636,7 +635,7 @@ fn foo() -> impl Foo {
     todo!()
 }
 fn baz() {
-    <|>bar(foo())
+    $0bar(foo())
 }
 ",
             r"
@@ -664,7 +663,7 @@ struct Baz;
 fn baz() -> Baz { todo!() }
 
 fn foo() {
-    bar<|>(&baz())
+    bar$0(&baz())
 }
 ",
             r"
@@ -692,7 +691,7 @@ mod Baz {
     pub fn baz() -> Bof { Bof }
 }
 fn foo() {
-    <|>bar(Baz::baz())
+    $0bar(Baz::baz())
 }
 ",
             r"
@@ -719,7 +718,7 @@ fn bar(baz: Baz::Bof) ${0:-> ()} {
             generate_function,
             r"
 fn foo<T>(t: T) {
-    <|>bar(t)
+    $0bar(t)
 }
 ",
             r"
@@ -746,7 +745,7 @@ impl Baz {
     fn new() -> Self { Baz }
 }
 fn foo() {
-    <|>bar(Baz::new);
+    $0bar(Baz::new);
 }
 ",
             r"
@@ -774,7 +773,7 @@ fn bar(arg: fn() -> Baz) ${0:-> ()} {
             r"
 fn foo() {
     let closure = |x: i64| x - 1;
-    <|>bar(closure)
+    $0bar(closure)
 }
 ",
             r"
@@ -796,7 +795,7 @@ fn bar(closure: impl Fn(i64) -> i64) ${0:-> ()} {
             generate_function,
             r"
 fn foo() {
-    <|>bar(baz)
+    $0bar(baz)
 }
 ",
             r"
@@ -819,7 +818,7 @@ fn bar(baz: ()) ${0:-> ()} {
 struct Baz;
 fn baz() -> Baz { Baz }
 fn foo() {
-    <|>bar(baz(), baz())
+    $0bar(baz(), baz())
 }
 ",
             r"
@@ -844,7 +843,7 @@ fn bar(baz_1: Baz, baz_2: Baz) ${0:-> ()} {
 struct Baz;
 fn baz() -> Baz { Baz }
 fn foo() {
-    <|>bar(baz(), baz(), "foo", "bar")
+    $0bar(baz(), baz(), "foo", "bar")
 }
 "#,
             r#"
@@ -869,7 +868,7 @@ fn bar(baz_1: Baz, baz_2: Baz, arg_1: &str, arg_2: &str) ${0:-> ()} {
 mod bar {}
 
 fn foo() {
-    bar::my_fn<|>()
+    bar::my_fn$0()
 }
 ",
             r"
@@ -900,7 +899,7 @@ mod foo {
 fn bar() {
     use foo::Foo;
     let foo = Foo;
-    baz<|>(foo)
+    baz$0(foo)
 }
 ",
             "
@@ -930,7 +929,7 @@ mod bar {
 }
 
 fn foo() {
-    bar::my_fn<|>()
+    bar::my_fn$0()
 }
 ",
             r"
@@ -959,7 +958,7 @@ mod bar {
 }
 
 fn foo() {
-    bar::baz::my_fn<|>()
+    bar::baz::my_fn$0()
 }
 ",
             r"
@@ -987,7 +986,7 @@ fn foo() {
 mod foo;
 
 fn main() {
-    foo::bar<|>()
+    foo::bar$0()
 }
 //- /foo.rs
 ",
@@ -1006,7 +1005,7 @@ pub(crate) fn bar() ${0:-> ()} {
             generate_function,
             r"
 fn foo() {
-    bar<|>();
+    bar$0();
 }
 
 fn bar() {}
@@ -1023,7 +1022,7 @@ fn bar() {}
             generate_function,
             r"
 fn foo() {
-    bar(b<|>az);
+    bar(b$0az);
 }
 
 fn bar(baz: ()) {}
@@ -1040,7 +1039,7 @@ fn bar(baz: ()) {}
 struct Foo;
 impl Foo {
     fn foo(&self) {
-        self.bar()<|>;
+        self.bar()$0;
     }
 }
         ",
diff --git a/crates/assists/src/handlers/generate_impl.rs b/crates/assists/src/handlers/generate_impl.rs
index 960af5ab3..9af45192b 100644
--- a/crates/assists/src/handlers/generate_impl.rs
+++ b/crates/assists/src/handlers/generate_impl.rs
@@ -10,7 +10,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // struct Ctx<T: Clone> {
-//     data: T,<|>
+//     data: T,$0
 // }
 // ```
 // ->
@@ -87,24 +87,24 @@ mod tests {
     fn test_add_impl() {
         check_assist(
             generate_impl,
-            "struct Foo {<|>}\n",
+            "struct Foo {$0}\n",
             "struct Foo {}\n\nimpl Foo {\n    $0\n}\n",
         );
         check_assist(
             generate_impl,
-            "struct Foo<T: Clone> {<|>}",
+            "struct Foo<T: Clone> {$0}",
             "struct Foo<T: Clone> {}\n\nimpl<T: Clone> Foo<T> {\n    $0\n}",
         );
         check_assist(
             generate_impl,
-            "struct Foo<'a, T: Foo<'a>> {<|>}",
+            "struct Foo<'a, T: Foo<'a>> {$0}",
             "struct Foo<'a, T: Foo<'a>> {}\n\nimpl<'a, T: Foo<'a>> Foo<'a, T> {\n    $0\n}",
         );
         check_assist(
             generate_impl,
             r#"
             #[cfg(feature = "foo")]
-            struct Foo<'a, T: Foo<'a>> {<|>}"#,
+            struct Foo<'a, T: Foo<'a>> {$0}"#,
             r#"
             #[cfg(feature = "foo")]
             struct Foo<'a, T: Foo<'a>> {}
@@ -119,7 +119,7 @@ mod tests {
             generate_impl,
             r#"
             #[cfg(not(feature = "foo"))]
-            struct Foo<'a, T: Foo<'a>> {<|>}"#,
+            struct Foo<'a, T: Foo<'a>> {$0}"#,
             r#"
             #[cfg(not(feature = "foo"))]
             struct Foo<'a, T: Foo<'a>> {}
@@ -138,7 +138,7 @@ mod tests {
             "
 struct SomeThingIrrelevant;
 /// Has a lifetime parameter
-struct Foo<'a, T: Foo<'a>> {<|>}
+struct Foo<'a, T: Foo<'a>> {$0}
 struct EvenMoreIrrelevant;
 ",
             "/// Has a lifetime parameter
diff --git a/crates/assists/src/handlers/generate_new.rs b/crates/assists/src/handlers/generate_new.rs
index c5fec4e0a..5c52b2bc8 100644
--- a/crates/assists/src/handlers/generate_new.rs
+++ b/crates/assists/src/handlers/generate_new.rs
@@ -14,7 +14,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // struct Ctx<T: Clone> {
-//      data: T,<|>
+//      data: T,$0
 // }
 // ```
 // ->
@@ -182,7 +182,7 @@ mod tests {
         // Check output of generation
         check_assist(
             generate_new,
-"struct Foo {<|>}",
+"struct Foo {$0}",
 "struct Foo {}
 
 impl Foo {
@@ -192,7 +192,7 @@ impl Foo {
         );
         check_assist(
             generate_new,
-"struct Foo<T: Clone> {<|>}",
+"struct Foo<T: Clone> {$0}",
 "struct Foo<T: Clone> {}
 
 impl<T: Clone> Foo<T> {
@@ -202,7 +202,7 @@ impl<T: Clone> Foo<T> {
         );
         check_assist(
             generate_new,
-"struct Foo<'a, T: Foo<'a>> {<|>}",
+"struct Foo<'a, T: Foo<'a>> {$0}",
 "struct Foo<'a, T: Foo<'a>> {}
 
 impl<'a, T: Foo<'a>> Foo<'a, T> {
@@ -212,7 +212,7 @@ impl<'a, T: Foo<'a>> Foo<'a, T> {
         );
         check_assist(
             generate_new,
-"struct Foo { baz: String <|>}",
+"struct Foo { baz: String $0}",
 "struct Foo { baz: String }
 
 impl Foo {
@@ -222,7 +222,7 @@ impl Foo {
         );
         check_assist(
             generate_new,
-"struct Foo { baz: String, qux: Vec<i32> <|>}",
+"struct Foo { baz: String, qux: Vec<i32> $0}",
 "struct Foo { baz: String, qux: Vec<i32> }
 
 impl Foo {
@@ -234,7 +234,7 @@ impl Foo {
         // Check that visibility modifiers don't get brought in for fields
         check_assist(
             generate_new,
-"struct Foo { pub baz: String, pub qux: Vec<i32> <|>}",
+"struct Foo { pub baz: String, pub qux: Vec<i32> $0}",
 "struct Foo { pub baz: String, pub qux: Vec<i32> }
 
 impl Foo {
@@ -246,7 +246,7 @@ impl Foo {
         // Check that it reuses existing impls
         check_assist(
             generate_new,
-"struct Foo {<|>}
+"struct Foo {$0}
 
 impl Foo {}
 ",
@@ -259,7 +259,7 @@ impl Foo {
         );
         check_assist(
             generate_new,
-"struct Foo {<|>}
+"struct Foo {$0}
 
 impl Foo {
     fn qux(&self) {}
@@ -277,7 +277,7 @@ impl Foo {
 
         check_assist(
             generate_new,
-"struct Foo {<|>}
+"struct Foo {$0}
 
 impl Foo {
     fn qux(&self) {}
@@ -302,7 +302,7 @@ impl Foo {
         // Check visibility of new fn based on struct
         check_assist(
             generate_new,
-"pub struct Foo {<|>}",
+"pub struct Foo {$0}",
 "pub struct Foo {}
 
 impl Foo {
@@ -312,7 +312,7 @@ impl Foo {
         );
         check_assist(
             generate_new,
-"pub(crate) struct Foo {<|>}",
+"pub(crate) struct Foo {$0}",
 "pub(crate) struct Foo {}
 
 impl Foo {
@@ -327,7 +327,7 @@ impl Foo {
         check_assist_not_applicable(
             generate_new,
             "
-struct Foo {<|>}
+struct Foo {$0}
 
 impl Foo {
     fn new() -> Self {
@@ -339,7 +339,7 @@ impl Foo {
         check_assist_not_applicable(
             generate_new,
             "
-struct Foo {<|>}
+struct Foo {$0}
 
 impl Foo {
     fn New() -> Self {
@@ -356,7 +356,7 @@ impl Foo {
             "
 struct SomeThingIrrelevant;
 /// Has a lifetime parameter
-struct Foo<'a, T: Foo<'a>> {<|>}
+struct Foo<'a, T: Foo<'a>> {$0}
 struct EvenMoreIrrelevant;
 ",
             "/// Has a lifetime parameter
@@ -381,7 +381,7 @@ impl<N: AstNode> AstId<N> {
 }
 
 pub struct Source<T> {
-    pub file_id: HirFileId,<|>
+    pub file_id: HirFileId,$0
     pub ast: T,
 }
 
diff --git a/crates/assists/src/handlers/infer_function_return_type.rs b/crates/assists/src/handlers/infer_function_return_type.rs
index aa584eb03..5279af1f3 100644
--- a/crates/assists/src/handlers/infer_function_return_type.rs
+++ b/crates/assists/src/handlers/infer_function_return_type.rs
@@ -10,7 +10,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // type specified. This assists is useable in a functions or closures tail expression or return type position.
 //
 // ```
-// fn foo() { 4<|>2i32 }
+// fn foo() { 4$02i32 }
 // ```
 // ->
 // ```
@@ -89,7 +89,7 @@ fn extract_tail(ctx: &AssistContext) -> Option<(FnType, ast::Expr, InsertOrRepla
             let body = closure.body()?;
             let body_start = body.syntax().first_token()?.text_range().start();
             let (tail_expr, wrap_expr) = match body {
-                ast::Expr::BlockExpr(block) => (block.expr()?, false),
+                ast::Expr::BlockExpr(block) => (block.tail_expr()?, false),
                 body => (body, true),
             };
 
@@ -101,7 +101,7 @@ fn extract_tail(ctx: &AssistContext) -> Option<(FnType, ast::Expr, InsertOrRepla
             let action = ret_ty_to_action(func.ret_type(), rparen_pos)?;
 
             let body = func.body()?;
-            let tail_expr = body.expr()?;
+            let tail_expr = body.tail_expr()?;
 
             let ret_range_end = body.l_curly_token()?.text_range().start();
             let ret_range = TextRange::new(rparen_pos, ret_range_end);
@@ -131,7 +131,7 @@ mod tests {
         mark::check!(existing_infer_ret_type);
         check_assist(
             infer_function_return_type,
-            r#"fn foo() -> <|>_ {
+            r#"fn foo() -> $0_ {
     45
 }"#,
             r#"fn foo() -> i32 {
@@ -146,7 +146,7 @@ mod tests {
         check_assist(
             infer_function_return_type,
             r#"fn foo() {
-    || -> _ {<|>45};
+    || -> _ {$045};
 }"#,
             r#"fn foo() {
     || -> i32 {45};
@@ -159,7 +159,7 @@ mod tests {
         mark::check!(cursor_in_ret_position);
         check_assist(
             infer_function_return_type,
-            r#"fn foo() <|>{
+            r#"fn foo() $0{
     45
 }"#,
             r#"fn foo() -> i32 {
@@ -174,7 +174,7 @@ mod tests {
         check_assist(
             infer_function_return_type,
             r#"fn foo() {
-    || <|>45
+    || $045
 }"#,
             r#"fn foo() {
     || -> i32 {45}
@@ -188,7 +188,7 @@ mod tests {
         check_assist(
             infer_function_return_type,
             r#"fn foo() {
-    45<|>
+    45$0
 }"#,
             r#"fn foo() -> i32 {
     45
@@ -202,7 +202,7 @@ mod tests {
             infer_function_return_type,
             r#"fn foo() {
     if true {
-        3<|>
+        3$0
     } else {
         5
     }
@@ -223,7 +223,7 @@ mod tests {
         check_assist_not_applicable(
             infer_function_return_type,
             r#"fn foo() -> i32 {
-    ( 45<|> + 32 ) * 123
+    ( 45$0 + 32 ) * 123
 }"#,
         );
     }
@@ -233,7 +233,7 @@ mod tests {
         check_assist_not_applicable(
             infer_function_return_type,
             r#"fn foo() {
-    let x = <|>3;
+    let x = $03;
     ( 45 + 32 ) * 123
 }"#,
         );
@@ -244,7 +244,7 @@ mod tests {
         check_assist_not_applicable(
             infer_function_return_type,
             r#"fn foo() {
-    (<|>)
+    ($0)
 }"#,
         );
     }
@@ -256,7 +256,7 @@ mod tests {
             infer_function_return_type,
             r#"fn foo() {
     |x: i32| {
-        x<|>
+        x$0
     };
 }"#,
             r#"fn foo() {
@@ -272,7 +272,7 @@ mod tests {
         check_assist(
             infer_function_return_type,
             r#"fn foo() {
-    |x: i32| { x<|> };
+    |x: i32| { x$0 };
 }"#,
             r#"fn foo() {
     |x: i32| -> i32 { x };
@@ -286,7 +286,7 @@ mod tests {
         check_assist(
             infer_function_return_type,
             r#"fn foo() {
-    |x: i32| x<|>;
+    |x: i32| x$0;
 }"#,
             r#"fn foo() {
     |x: i32| -> i32 {x};
@@ -301,7 +301,7 @@ mod tests {
             r#"fn foo() {
     || {
         if true {
-            3<|>
+            3$0
         } else {
             5
         }
@@ -325,7 +325,7 @@ mod tests {
         check_assist_not_applicable(
             infer_function_return_type,
             r#"fn foo() {
-    || -> i32 { 3<|> }
+    || -> i32 { 3$0 }
 }"#,
         );
     }
@@ -336,7 +336,7 @@ mod tests {
             infer_function_return_type,
             r#"fn foo() {
     || -> i32 {
-        let x = 3<|>;
+        let x = 3$0;
         6
     }
 }"#,
diff --git a/crates/assists/src/handlers/inline_function.rs b/crates/assists/src/handlers/inline_function.rs
new file mode 100644
index 000000000..6ec99b09b
--- /dev/null
+++ b/crates/assists/src/handlers/inline_function.rs
@@ -0,0 +1,202 @@
+use ast::make;
+use hir::{HasSource, PathResolution};
+use syntax::{
+    ast::{self, edit::AstNodeEdit, ArgListOwner},
+    AstNode,
+};
+use test_utils::mark;
+
+use crate::{
+    assist_context::{AssistContext, Assists},
+    AssistId, AssistKind,
+};
+
+// Assist: inline_function
+//
+// Inlines a function body.
+//
+// ```
+// fn add(a: u32, b: u32) -> u32 { a + b }
+// fn main() {
+//     let x = add$0(1, 2);
+// }
+// ```
+// ->
+// ```
+// fn add(a: u32, b: u32) -> u32 { a + b }
+// fn main() {
+//     let x = {
+//         let a = 1;
+//         let b = 2;
+//         a + b
+//     };
+// }
+// ```
+pub(crate) fn inline_function(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+    let path_expr: ast::PathExpr = ctx.find_node_at_offset()?;
+    let call = path_expr.syntax().parent().and_then(ast::CallExpr::cast)?;
+    let path = path_expr.path()?;
+
+    let function = match ctx.sema.resolve_path(&path)? {
+        PathResolution::Def(hir::ModuleDef::Function(f)) => f,
+        _ => return None,
+    };
+
+    let function_source = function.source(ctx.db())?;
+    let arguments: Vec<_> = call.arg_list()?.args().collect();
+    let parameters = function_parameter_patterns(&function_source.value)?;
+
+    if arguments.len() != parameters.len() {
+        // Can't inline the function because they've passed the wrong number of
+        // arguments to this function
+        mark::hit!(inline_function_incorrect_number_of_arguments);
+        return None;
+    }
+
+    let new_bindings = parameters.into_iter().zip(arguments);
+
+    let body = function_source.value.body()?;
+
+    acc.add(
+        AssistId("inline_function", AssistKind::RefactorInline),
+        format!("Inline `{}`", path),
+        call.syntax().text_range(),
+        |builder| {
+            let mut statements: Vec<ast::Stmt> = Vec::new();
+
+            for (pattern, value) in new_bindings {
+                statements.push(make::let_stmt(pattern, Some(value)).into());
+            }
+
+            statements.extend(body.statements());
+
+            let original_indentation = call.indent_level();
+            let replacement = make::block_expr(statements, body.tail_expr())
+                .reset_indent()
+                .indent(original_indentation);
+
+            builder.replace_ast(ast::Expr::CallExpr(call), ast::Expr::BlockExpr(replacement));
+        },
+    )
+}
+
+fn function_parameter_patterns(value: &ast::Fn) -> Option<Vec<ast::Pat>> {
+    let mut patterns = Vec::new();
+
+    for param in value.param_list()?.params() {
+        let pattern = param.pat()?;
+        patterns.push(pattern);
+    }
+
+    Some(patterns)
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::tests::{check_assist, check_assist_not_applicable};
+
+    use super::*;
+
+    #[test]
+    fn no_args_or_return_value_gets_inlined_without_block() {
+        check_assist(
+            inline_function,
+            r#"
+fn foo() { println!("Hello, World!"); }
+fn main() {
+    fo$0o();
+}
+"#,
+            r#"
+fn foo() { println!("Hello, World!"); }
+fn main() {
+    {
+        println!("Hello, World!");
+    };
+}
+"#,
+        );
+    }
+
+    #[test]
+    fn args_with_side_effects() {
+        check_assist(
+            inline_function,
+            r#"
+fn foo(name: String) { println!("Hello, {}!", name); }
+fn main() {
+    foo$0(String::from("Michael"));
+}
+"#,
+            r#"
+fn foo(name: String) { println!("Hello, {}!", name); }
+fn main() {
+    {
+        let name = String::from("Michael");
+        println!("Hello, {}!", name);
+    };
+}
+"#,
+        );
+    }
+
+    #[test]
+    fn method_inlining_isnt_supported() {
+        check_assist_not_applicable(
+            inline_function,
+            r"
+struct Foo;
+impl Foo { fn bar(&self) {} }
+
+fn main() { Foo.bar$0(); }
+",
+        );
+    }
+
+    #[test]
+    fn not_applicable_when_incorrect_number_of_parameters_are_provided() {
+        mark::check!(inline_function_incorrect_number_of_arguments);
+        check_assist_not_applicable(
+            inline_function,
+            r#"
+fn add(a: u32, b: u32) -> u32 { a + b }
+fn main() { let x = add$0(42); }
+"#,
+        );
+    }
+
+    #[test]
+    fn function_with_multiple_statements() {
+        check_assist(
+            inline_function,
+            r#"
+fn foo(a: u32, b: u32) -> u32 {
+    let x = a + b;
+    let y = x - b;
+    x * y
+}
+
+fn main() {
+    let x = foo$0(1, 2);
+}
+"#,
+            r#"
+fn foo(a: u32, b: u32) -> u32 {
+    let x = a + b;
+    let y = x - b;
+    x * y
+}
+
+fn main() {
+    let x = {
+        let a = 1;
+        let b = 2;
+        let x = a + b;
+        let y = x - b;
+        x * y
+    };
+}
+"#,
+        );
+    }
+}
diff --git a/crates/assists/src/handlers/inline_local_variable.rs b/crates/assists/src/handlers/inline_local_variable.rs
index 587eb5feb..d559be9cb 100644
--- a/crates/assists/src/handlers/inline_local_variable.rs
+++ b/crates/assists/src/handlers/inline_local_variable.rs
@@ -16,7 +16,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     let x<|> = 1 + 2;
+//     let x$0 = 1 + 2;
 //     x * 4;
 // }
 // ```
@@ -146,7 +146,7 @@ mod tests {
             r"
 fn bar(a: usize) {}
 fn foo() {
-    let a<|> = 1;
+    let a$0 = 1;
     a + 1;
     if a > 10 {
     }
@@ -180,7 +180,7 @@ fn foo() {
             r"
 fn bar(a: usize) {}
 fn foo() {
-    let a<|> = 1 + 1;
+    let a$0 = 1 + 1;
     a + 1;
     if a > 10 {
     }
@@ -214,7 +214,7 @@ fn foo() {
             r"
 fn bar(a: usize) {}
 fn foo() {
-    let a<|> = bar(1);
+    let a$0 = bar(1);
     a + 1;
     if a > 10 {
     }
@@ -248,7 +248,7 @@ fn foo() {
             r"
 fn bar(a: usize): usize { a }
 fn foo() {
-    let a<|> = bar(1) as u64;
+    let a$0 = bar(1) as u64;
     a + 1;
     if a > 10 {
     }
@@ -281,7 +281,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = { 10 + 1 };
+    let a$0 = { 10 + 1 };
     a + 1;
     if a > 10 {
     }
@@ -313,7 +313,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = ( 10 + 1 );
+    let a$0 = ( 10 + 1 );
     a + 1;
     if a > 10 {
     }
@@ -346,7 +346,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let mut a<|> = 1 + 1;
+    let mut a$0 = 1 + 1;
     a + 1;
 }",
         );
@@ -358,7 +358,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = bar(10 + 1);
+    let a$0 = bar(10 + 1);
     let b = a * 10;
     let c = a as usize;
 }",
@@ -377,7 +377,7 @@ fn foo() {
             r"
 fn foo() {
     let x = vec![1, 2, 3];
-    let a<|> = x[0];
+    let a$0 = x[0];
     let b = a * 10;
     let c = a as usize;
 }",
@@ -397,7 +397,7 @@ fn foo() {
             r"
 fn foo() {
     let bar = vec![1];
-    let a<|> = bar.len();
+    let a$0 = bar.len();
     let b = a * 10;
     let c = a as usize;
 }",
@@ -421,7 +421,7 @@ struct Bar {
 
 fn foo() {
     let bar = Bar { foo: 1 };
-    let a<|> = bar.foo;
+    let a$0 = bar.foo;
     let b = a * 10;
     let c = a as usize;
 }",
@@ -445,7 +445,7 @@ fn foo() {
             r"
 fn foo() -> Option<usize> {
     let bar = Some(1);
-    let a<|> = bar?;
+    let a$0 = bar?;
     let b = a * 10;
     let c = a as usize;
     None
@@ -467,7 +467,7 @@ fn foo() -> Option<usize> {
             r"
 fn foo() {
     let bar = 10;
-    let a<|> = &bar;
+    let a$0 = &bar;
     let b = a * 10;
 }",
             r"
@@ -484,7 +484,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = (10, 20);
+    let a$0 = (10, 20);
     let b = a[0];
 }",
             r"
@@ -500,7 +500,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = [1, 2, 3];
+    let a$0 = [1, 2, 3];
     let b = a.len();
 }",
             r"
@@ -516,7 +516,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = (10 + 20);
+    let a$0 = (10 + 20);
     let b = a * 10;
     let c = a as usize;
 }",
@@ -535,7 +535,7 @@ fn foo() {
             r"
 fn foo() {
     let d = 10;
-    let a<|> = d;
+    let a$0 = d;
     let b = a * 10;
     let c = a as usize;
 }",
@@ -554,7 +554,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = { 10 };
+    let a$0 = { 10 };
     let b = a * 10;
     let c = a as usize;
 }",
@@ -572,7 +572,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 10 + 20;
+    let a$0 = 10 + 20;
     let b = a * 10;
     let c = (a, 20);
     let d = [a, 10];
@@ -594,7 +594,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = vec![10, 20];
+    let a$0 = vec![10, 20];
     for i in a {}
 }",
             r"
@@ -610,7 +610,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 > 0;
+    let a$0 = 1 > 0;
     while a {}
 }",
             r"
@@ -626,7 +626,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 + 1;
+    let a$0 = 1 + 1;
     loop {
         break a;
     }
@@ -646,7 +646,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 > 0;
+    let a$0 = 1 > 0;
     return a;
 }",
             r"
@@ -662,7 +662,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 > 0;
+    let a$0 = 1 > 0;
     match a {}
 }",
             r"
@@ -680,7 +680,7 @@ fn foo() {
             r"
 struct S { foo: i32}
 fn main() {
-    let <|>foo = 92;
+    let $0foo = 92;
     S { foo }
 }
 ",
@@ -700,7 +700,7 @@ fn main() {
             inline_local_variable,
             r"
 fn foo() {
-    let <|>a = 0;
+    let $0a = 0;
 }
             ",
         )
@@ -713,7 +713,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn main() {
-    let x = <|>1 + 2;
+    let x = $01 + 2;
     x * 4;
 }
 ",
diff --git a/crates/assists/src/handlers/introduce_named_lifetime.rs b/crates/assists/src/handlers/introduce_named_lifetime.rs
index ab8fe3ea9..3f5f44d69 100644
--- a/crates/assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/assists/src/handlers/introduce_named_lifetime.rs
@@ -14,7 +14,7 @@ static ASSIST_LABEL: &str = "Introduce named lifetime";
 // Change an anonymous lifetime to a named lifetime.
 //
 // ```
-// impl Cursor<'_<|>> {
+// impl Cursor<'_$0> {
 //     fn node(self) -> &SyntaxNode {
 //         match self {
 //             Cursor::Replace(node) | Cursor::Before(node) => node,
@@ -33,7 +33,7 @@ static ASSIST_LABEL: &str = "Introduce named lifetime";
 // }
 // ```
 // FIXME: How can we handle renaming any one of multiple anonymous lifetimes?
-// FIXME: should also add support for the case fun(f: &Foo) -> &<|>Foo
+// FIXME: should also add support for the case fun(f: &Foo) -> &$0Foo
 pub(crate) fn introduce_named_lifetime(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let lifetime =
         ctx.find_node_at_offset::<ast::Lifetime>().filter(|lifetime| lifetime.text() == "'_")?;
@@ -150,7 +150,7 @@ mod tests {
     fn test_example_case() {
         check_assist(
             introduce_named_lifetime,
-            r#"impl Cursor<'_<|>> {
+            r#"impl Cursor<'_$0> {
                 fn node(self) -> &SyntaxNode {
                     match self {
                         Cursor::Replace(node) | Cursor::Before(node) => node,
@@ -171,7 +171,7 @@ mod tests {
     fn test_example_case_simplified() {
         check_assist(
             introduce_named_lifetime,
-            r#"impl Cursor<'_<|>> {"#,
+            r#"impl Cursor<'_$0> {"#,
             r#"impl<'a> Cursor<'a> {"#,
         );
     }
@@ -180,7 +180,7 @@ mod tests {
     fn test_example_case_cursor_after_tick() {
         check_assist(
             introduce_named_lifetime,
-            r#"impl Cursor<'<|>_> {"#,
+            r#"impl Cursor<'$0_> {"#,
             r#"impl<'a> Cursor<'a> {"#,
         );
     }
@@ -189,7 +189,7 @@ mod tests {
     fn test_impl_with_other_type_param() {
         check_assist(
             introduce_named_lifetime,
-            "impl<I> fmt::Display for SepByBuilder<'_<|>, I>
+            "impl<I> fmt::Display for SepByBuilder<'_$0, I>
         where
             I: Iterator,
             I::Item: fmt::Display,
@@ -206,28 +206,28 @@ mod tests {
     fn test_example_case_cursor_before_tick() {
         check_assist(
             introduce_named_lifetime,
-            r#"impl Cursor<<|>'_> {"#,
+            r#"impl Cursor<$0'_> {"#,
             r#"impl<'a> Cursor<'a> {"#,
         );
     }
 
     #[test]
     fn test_not_applicable_cursor_position() {
-        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor<'_><|> {"#);
-        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor<|><'_> {"#);
+        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor<'_>$0 {"#);
+        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor$0<'_> {"#);
     }
 
     #[test]
     fn test_not_applicable_lifetime_already_name() {
-        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor<'a<|>> {"#);
-        check_assist_not_applicable(introduce_named_lifetime, r#"fn my_fun<'a>() -> X<'a<|>>"#);
+        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor<'a$0> {"#);
+        check_assist_not_applicable(introduce_named_lifetime, r#"fn my_fun<'a>() -> X<'a$0>"#);
     }
 
     #[test]
     fn test_with_type_parameter() {
         check_assist(
             introduce_named_lifetime,
-            r#"impl<T> Cursor<T, '_<|>>"#,
+            r#"impl<T> Cursor<T, '_$0>"#,
             r#"impl<T, 'a> Cursor<T, 'a>"#,
         );
     }
@@ -236,7 +236,7 @@ mod tests {
     fn test_with_existing_lifetime_name_conflict() {
         check_assist(
             introduce_named_lifetime,
-            r#"impl<'a, 'b> Cursor<'a, 'b, '_<|>>"#,
+            r#"impl<'a, 'b> Cursor<'a, 'b, '_$0>"#,
             r#"impl<'a, 'b, 'c> Cursor<'a, 'b, 'c>"#,
         );
     }
@@ -245,7 +245,7 @@ mod tests {
     fn test_function_return_value_anon_lifetime_param() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun() -> X<'_<|>>"#,
+            r#"fn my_fun() -> X<'_$0>"#,
             r#"fn my_fun<'a>() -> X<'a>"#,
         );
     }
@@ -254,7 +254,7 @@ mod tests {
     fn test_function_return_value_anon_reference_lifetime() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun() -> &'_<|> X"#,
+            r#"fn my_fun() -> &'_$0 X"#,
             r#"fn my_fun<'a>() -> &'a X"#,
         );
     }
@@ -263,7 +263,7 @@ mod tests {
     fn test_function_param_anon_lifetime() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun(x: X<'_<|>>)"#,
+            r#"fn my_fun(x: X<'_$0>)"#,
             r#"fn my_fun<'a>(x: X<'a>)"#,
         );
     }
@@ -272,7 +272,7 @@ mod tests {
     fn test_function_add_lifetime_to_params() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun(f: &Foo) -> X<'_<|>>"#,
+            r#"fn my_fun(f: &Foo) -> X<'_$0>"#,
             r#"fn my_fun<'a>(f: &'a Foo) -> X<'a>"#,
         );
     }
@@ -281,7 +281,7 @@ mod tests {
     fn test_function_add_lifetime_to_params_in_presence_of_other_lifetime() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun<'other>(f: &Foo, b: &'other Bar) -> X<'_<|>>"#,
+            r#"fn my_fun<'other>(f: &Foo, b: &'other Bar) -> X<'_$0>"#,
             r#"fn my_fun<'other, 'a>(f: &'a Foo, b: &'other Bar) -> X<'a>"#,
         );
     }
@@ -291,7 +291,7 @@ mod tests {
         // this is not permitted under lifetime elision rules
         check_assist_not_applicable(
             introduce_named_lifetime,
-            r#"fn my_fun(f: &Foo, b: &Bar) -> X<'_<|>>"#,
+            r#"fn my_fun(f: &Foo, b: &Bar) -> X<'_$0>"#,
         );
     }
 
@@ -299,7 +299,7 @@ mod tests {
     fn test_function_add_lifetime_to_self_ref_param() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun<'other>(&self, f: &Foo, b: &'other Bar) -> X<'_<|>>"#,
+            r#"fn my_fun<'other>(&self, f: &Foo, b: &'other Bar) -> X<'_$0>"#,
             r#"fn my_fun<'other, 'a>(&'a self, f: &Foo, b: &'other Bar) -> X<'a>"#,
         );
     }
@@ -308,7 +308,7 @@ mod tests {
     fn test_function_add_lifetime_to_param_with_non_ref_self() {
         check_assist(
             introduce_named_lifetime,
-            r#"fn my_fun<'other>(self, f: &Foo, b: &'other Bar) -> X<'_<|>>"#,
+            r#"fn my_fun<'other>(self, f: &Foo, b: &'other Bar) -> X<'_$0>"#,
             r#"fn my_fun<'other, 'a>(self, f: &'a Foo, b: &'other Bar) -> X<'a>"#,
         );
     }
diff --git a/crates/assists/src/handlers/invert_if.rs b/crates/assists/src/handlers/invert_if.rs
index f9c33b3f7..5b69dafd4 100644
--- a/crates/assists/src/handlers/invert_if.rs
+++ b/crates/assists/src/handlers/invert_if.rs
@@ -18,7 +18,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     if<|> !y { A } else { B }
+//     if$0 !y { A } else { B }
 // }
 // ```
 // ->
@@ -72,7 +72,7 @@ mod tests {
     fn invert_if_composite_condition() {
         check_assist(
             invert_if,
-            "fn f() { i<|>f x == 3 || x == 4 || x == 5 { 1 } else { 3 * 2 } }",
+            "fn f() { i$0f x == 3 || x == 4 || x == 5 { 1 } else { 3 * 2 } }",
             "fn f() { if !(x == 3 || x == 4 || x == 5) { 3 * 2 } else { 1 } }",
         )
     }
@@ -81,7 +81,7 @@ mod tests {
     fn invert_if_remove_not_parentheses() {
         check_assist(
             invert_if,
-            "fn f() { i<|>f !(x == 3 || x == 4 || x == 5) { 3 * 2 } else { 1 } }",
+            "fn f() { i$0f !(x == 3 || x == 4 || x == 5) { 3 * 2 } else { 1 } }",
             "fn f() { if x == 3 || x == 4 || x == 5 { 1 } else { 3 * 2 } }",
         )
     }
@@ -90,7 +90,7 @@ mod tests {
     fn invert_if_remove_inequality() {
         check_assist(
             invert_if,
-            "fn f() { i<|>f x != 3 { 1 } else { 3 + 2 } }",
+            "fn f() { i$0f x != 3 { 1 } else { 3 + 2 } }",
             "fn f() { if x == 3 { 3 + 2 } else { 1 } }",
         )
     }
@@ -99,7 +99,7 @@ mod tests {
     fn invert_if_remove_not() {
         check_assist(
             invert_if,
-            "fn f() { <|>if !cond { 3 * 2 } else { 1 } }",
+            "fn f() { $0if !cond { 3 * 2 } else { 1 } }",
             "fn f() { if cond { 1 } else { 3 * 2 } }",
         )
     }
@@ -108,21 +108,21 @@ mod tests {
     fn invert_if_general_case() {
         check_assist(
             invert_if,
-            "fn f() { i<|>f cond { 3 * 2 } else { 1 } }",
+            "fn f() { i$0f cond { 3 * 2 } else { 1 } }",
             "fn f() { if !cond { 1 } else { 3 * 2 } }",
         )
     }
 
     #[test]
     fn invert_if_doesnt_apply_with_cursor_not_on_if() {
-        check_assist_not_applicable(invert_if, "fn f() { if !<|>cond { 3 * 2 } else { 1 } }")
+        check_assist_not_applicable(invert_if, "fn f() { if !$0cond { 3 * 2 } else { 1 } }")
     }
 
     #[test]
     fn invert_if_doesnt_apply_with_if_let() {
         check_assist_not_applicable(
             invert_if,
-            "fn f() { i<|>f let Some(_) = Some(1) { 1 } else { 0 } }",
+            "fn f() { i$0f let Some(_) = Some(1) { 1 } else { 0 } }",
         )
     }
 
@@ -130,7 +130,7 @@ mod tests {
     fn invert_if_option_case() {
         check_assist(
             invert_if,
-            "fn f() { if<|> doc_style.is_some() { Class::DocComment } else { Class::Comment } }",
+            "fn f() { if$0 doc_style.is_some() { Class::DocComment } else { Class::Comment } }",
             "fn f() { if doc_style.is_none() { Class::Comment } else { Class::DocComment } }",
         )
     }
@@ -139,7 +139,7 @@ mod tests {
     fn invert_if_result_case() {
         check_assist(
             invert_if,
-            "fn f() { i<|>f doc_style.is_err() { Class::Err } else { Class::Ok } }",
+            "fn f() { i$0f doc_style.is_err() { Class::Err } else { Class::Ok } }",
             "fn f() { if doc_style.is_ok() { Class::Ok } else { Class::Err } }",
         )
     }
diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs
index 2f0dc7831..7bd7e1e36 100644
--- a/crates/assists/src/handlers/merge_imports.rs
+++ b/crates/assists/src/handlers/merge_imports.rs
@@ -15,7 +15,7 @@ use crate::{
 // Merges two imports with a common prefix.
 //
 // ```
-// use std::<|>fmt::Formatter;
+// use std::$0fmt::Formatter;
 // use std::io;
 // ```
 // ->
@@ -75,7 +75,7 @@ mod tests {
         check_assist(
             merge_imports,
             r"
-use std::fmt<|>::{Display, Debug};
+use std::fmt$0::{Display, Debug};
 use std::fmt::{Display, Debug};
 ",
             r"
@@ -89,7 +89,7 @@ use std::fmt::{Debug, Display};
         check_assist(
             merge_imports,
             r"
-use std::fmt<|>::Debug;
+use std::fmt$0::Debug;
 use std::fmt::Display;
 ",
             r"
@@ -104,7 +104,7 @@ use std::fmt::{Debug, Display};
             merge_imports,
             r"
 use std::fmt::Debug;
-use std::fmt<|>::Display;
+use std::fmt$0::Display;
 ",
             r"
 use std::fmt::{Debug, Display};
@@ -117,7 +117,7 @@ use std::fmt::{Debug, Display};
         check_assist(
             merge_imports,
             r"
-use std::fmt<|>;
+use std::fmt$0;
 use std::fmt::Display;
 ",
             r"
@@ -131,7 +131,7 @@ use std::fmt::{self, Display};
         check_assist(
             merge_imports,
             r"
-use std::{fmt, <|>fmt::Display};
+use std::{fmt, $0fmt::Display};
 ",
             r"
 use std::{fmt::{self, Display}};
@@ -144,7 +144,7 @@ use std::{fmt::{self, Display}};
         check_assist_not_applicable(
             merge_imports,
             r"
-pub use std::fmt<|>::Debug;
+pub use std::fmt$0::Debug;
 use std::fmt::Display;
 ",
         );
@@ -155,7 +155,7 @@ use std::fmt::Display;
         check_assist_not_applicable(
             merge_imports,
             r"
-use std::fmt<|>::Debug;
+use std::fmt$0::Debug;
 pub use std::fmt::Display;
 ",
         );
@@ -166,7 +166,7 @@ pub use std::fmt::Display;
         check_assist_not_applicable(
             merge_imports,
             r"
-pub(crate) use std::fmt<|>::Debug;
+pub(crate) use std::fmt$0::Debug;
 pub use std::fmt::Display;
 ",
         );
@@ -177,7 +177,7 @@ pub use std::fmt::Display;
         check_assist_not_applicable(
             merge_imports,
             r"
-pub use std::fmt<|>::Debug;
+pub use std::fmt$0::Debug;
 pub(crate) use std::fmt::Display;
 ",
         );
@@ -188,7 +188,7 @@ pub(crate) use std::fmt::Display;
         check_assist(
             merge_imports,
             r"
-pub use std::fmt<|>::Debug;
+pub use std::fmt$0::Debug;
 pub use std::fmt::Display;
 ",
             r"
@@ -202,7 +202,7 @@ pub use std::fmt::{Debug, Display};
         check_assist(
             merge_imports,
             r"
-pub(crate) use std::fmt<|>::Debug;
+pub(crate) use std::fmt$0::Debug;
 pub(crate) use std::fmt::Display;
 ",
             r"
@@ -216,7 +216,7 @@ pub(crate) use std::fmt::{Debug, Display};
         check_assist(
             merge_imports,
             r"
-use std::{fmt<|>::Debug, fmt::Display};
+use std::{fmt$0::Debug, fmt::Display};
 ",
             r"
 use std::{fmt::{Debug, Display}};
@@ -229,7 +229,7 @@ use std::{fmt::{Debug, Display}};
         check_assist(
             merge_imports,
             r"
-use std::{fmt::Debug, fmt<|>::Display};
+use std::{fmt::Debug, fmt$0::Display};
 ",
             r"
 use std::{fmt::{Debug, Display}};
@@ -242,7 +242,7 @@ use std::{fmt::{Debug, Display}};
         check_assist(
             merge_imports,
             r"
-use std<|>::cell::*;
+use std$0::cell::*;
 use std::str;
 ",
             r"
@@ -256,7 +256,7 @@ use std::{cell::*, str};
         check_assist(
             merge_imports,
             r"
-use std<|>::cell::*;
+use std$0::cell::*;
 use std::str::*;
 ",
             r"
@@ -270,7 +270,7 @@ use std::{cell::*, str::*};
         check_assist(
             merge_imports,
             r"
-use foo<|>::bar;
+use foo$0::bar;
 use foo::baz;
 
 /// Doc comment
@@ -289,7 +289,7 @@ use foo::{bar, baz};
             merge_imports,
             r"
 use {
-    foo<|>::bar,
+    foo$0::bar,
     foo::baz,
 };
 ",
@@ -304,7 +304,7 @@ use {
             r"
 use {
     foo::baz,
-    foo<|>::bar,
+    foo$0::bar,
 };
 ",
             r"
@@ -321,7 +321,7 @@ use {
             merge_imports,
             r"
 use foo::bar::baz;
-use foo::<|>{
+use foo::$0{
     FooBar,
 };
 ",
@@ -336,7 +336,7 @@ use foo::{FooBar, bar::baz};
         check_assist_not_applicable(
             merge_imports,
             r"
-use std::<|>
+use std::$0
 fn main() {}",
         );
     }
diff --git a/crates/assists/src/handlers/merge_match_arms.rs b/crates/assists/src/handlers/merge_match_arms.rs
index c347eb40e..9bf076cb9 100644
--- a/crates/assists/src/handlers/merge_match_arms.rs
+++ b/crates/assists/src/handlers/merge_match_arms.rs
@@ -17,7 +17,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, TextRange};
 //
 // fn handle(action: Action) {
 //     match action {
-//         <|>Action::Move(..) => foo(),
+//         $0Action::Move(..) => foo(),
 //         Action::Stop => foo(),
 //     }
 // }
@@ -106,7 +106,7 @@ mod tests {
             fn main() {
                 let x = X::A;
                 let y = match x {
-                    X::A => { 1i32<|> }
+                    X::A => { 1i32$0 }
                     X::B => { 1i32 }
                     X::C => { 2i32 }
                 }
@@ -138,7 +138,7 @@ mod tests {
             fn main() {
                 let x = X::A;
                 let y = match x {
-                    X::A | X::B => {<|> 1i32 },
+                    X::A | X::B => {$0 1i32 },
                     X::C | X::D => { 1i32 },
                     X::E => { 2i32 },
                 }
@@ -171,7 +171,7 @@ mod tests {
                 let x = X::A;
                 let y = match x {
                     X::A => { 1i32 },
-                    X::B => { 2i<|>32 },
+                    X::B => { 2i$032 },
                     _ => { 2i32 }
                 }
             }
@@ -200,7 +200,7 @@ mod tests {
 
             fn main() {
                 match X::A {
-                    X::A<|> => 92,
+                    X::A$0 => 92,
                     X::B => 92,
                     X::C => 92,
                     X::D => 62,
@@ -237,7 +237,7 @@ mod tests {
             fn main() {
                 let x = X::A;
                 let y = match x {
-                    X::A(a) if a > 5 => { <|>1i32 },
+                    X::A(a) if a > 5 => { $01i32 },
                     X::B => { 1i32 },
                     X::C => { 2i32 }
                 }
diff --git a/crates/assists/src/handlers/move_bounds.rs b/crates/assists/src/handlers/move_bounds.rs
index e2e461520..cf260c6f8 100644
--- a/crates/assists/src/handlers/move_bounds.rs
+++ b/crates/assists/src/handlers/move_bounds.rs
@@ -12,7 +12,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Moves inline type bounds to a where clause.
 //
 // ```
-// fn apply<T, U, <|>F: FnOnce(T) -> U>(f: F, x: T) -> U {
+// fn apply<T, U, $0F: FnOnce(T) -> U>(f: F, x: T) -> U {
 //     f(x)
 // }
 // ```
@@ -103,7 +103,7 @@ mod tests {
         check_assist(
             move_bounds_to_where_clause,
             r#"
-            fn foo<T: u32, <|>F: FnOnce(T) -> T>() {}
+            fn foo<T: u32, $0F: FnOnce(T) -> T>() {}
             "#,
             r#"
             fn foo<T, F>() where T: u32, F: FnOnce(T) -> T {}
@@ -116,7 +116,7 @@ mod tests {
         check_assist(
             move_bounds_to_where_clause,
             r#"
-            impl<U: u32, <|>T> A<U, T> {}
+            impl<U: u32, $0T> A<U, T> {}
             "#,
             r#"
             impl<U, T> A<U, T> where U: u32 {}
@@ -129,7 +129,7 @@ mod tests {
         check_assist(
             move_bounds_to_where_clause,
             r#"
-            struct A<<|>T: Iterator<Item = u32>> {}
+            struct A<$0T: Iterator<Item = u32>> {}
             "#,
             r#"
             struct A<T> where T: Iterator<Item = u32> {}
@@ -142,7 +142,7 @@ mod tests {
         check_assist(
             move_bounds_to_where_clause,
             r#"
-            struct Pair<<|>T: u32>(T, T);
+            struct Pair<$0T: u32>(T, T);
             "#,
             r#"
             struct Pair<T>(T, T) where T: u32;
diff --git a/crates/assists/src/handlers/move_guard.rs b/crates/assists/src/handlers/move_guard.rs
index eaffd80ce..3f22302a9 100644
--- a/crates/assists/src/handlers/move_guard.rs
+++ b/crates/assists/src/handlers/move_guard.rs
@@ -14,7 +14,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // fn handle(action: Action) {
 //     match action {
-//         Action::Move { distance } <|>if distance > 10 => foo(),
+//         Action::Move { distance } $0if distance > 10 => foo(),
 //         _ => (),
 //     }
 // }
@@ -74,7 +74,7 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) ->
 //
 // fn handle(action: Action) {
 //     match action {
-//         Action::Move { distance } => <|>if distance > 10 { foo() },
+//         Action::Move { distance } => $0if distance > 10 { foo() },
 //         _ => (),
 //     }
 // }
@@ -98,7 +98,7 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex
     let mut replace_node = None;
     let if_expr: IfExpr = IfExpr::cast(arm_body.syntax().clone()).or_else(|| {
         let block_expr = BlockExpr::cast(arm_body.syntax().clone())?;
-        if let Expr::IfExpr(e) = block_expr.expr()? {
+        if let Expr::IfExpr(e) = block_expr.tail_expr()? {
             replace_node = Some(block_expr.syntax().clone());
             Some(e)
         } else {
@@ -128,7 +128,7 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex
         |edit| {
             let then_only_expr = then_block.statements().next().is_none();
 
-            match &then_block.expr() {
+            match &then_block.tail_expr() {
                 Some(then_expr) if then_only_expr => {
                     edit.replace(replace_node.text_range(), then_expr.syntax().text())
                 }
@@ -158,7 +158,7 @@ mod tests {
             r#"
 fn main() {
     match 92 {
-        x <|>if x > 10 => false,
+        x $0if x > 10 => false,
         _ => true
     }
 }
@@ -174,7 +174,7 @@ fn main() {
             r#"
 fn main() {
     match 92 {
-        x <|>if x > 10 => false,
+        x $0if x > 10 => false,
         _ => true
     }
 }
@@ -199,7 +199,7 @@ fn main() {
             r#"
 fn main() {
     match 92 {
-        <|>x @ 4 | x @ 5    if x > 5 => true,
+        $0x @ 4 | x @ 5    if x > 5 => true,
         _ => false
     }
 }
@@ -224,7 +224,7 @@ fn main() {
             r#"
 fn main() {
     match 92 {
-        x => if x > 10 { <|>false },
+        x => if x > 10 { $0false },
         _ => true
     }
 }
@@ -248,7 +248,7 @@ fn main() {
 fn main() {
     match 92 {
         x => {
-            <|>if x > 10 {
+            $0if x > 10 {
                 false
             }
         },
@@ -274,7 +274,7 @@ fn main() {
             r#"
 fn main() {
     match 92 {
-        x => if let 62 = x { <|>false },
+        x => if let 62 = x { $0false },
         _ => true
     }
 }
@@ -289,7 +289,7 @@ fn main() {
             r#"
 fn main() {
     match 92 {
-        x => if x > 10 { <|> },
+        x => if x > 10 { $0 },
         _ => true
     }
 }
@@ -313,7 +313,7 @@ fn main() {
 fn main() {
     match 92 {
         x => if x > 10 {
-            92;<|>
+            92;$0
             false
         },
         _ => true
@@ -343,7 +343,7 @@ fn main() {
     match 92 {
         x => {
             if x > 10 {
-                92;<|>
+                92;$0
                 false
             }
         }
diff --git a/crates/assists/src/handlers/extract_module_to_file.rs b/crates/assists/src/handlers/move_module_to_file.rs
index 50bf67ef7..9d8579f47 100644
--- a/crates/assists/src/handlers/extract_module_to_file.rs
+++ b/crates/assists/src/handlers/move_module_to_file.rs
@@ -2,17 +2,18 @@ use ast::edit::IndentLevel;
 use ide_db::base_db::AnchoredPathBuf;
 use syntax::{
     ast::{self, edit::AstNodeEdit, NameOwner},
-    AstNode,
+    AstNode, TextRange,
 };
+use test_utils::mark;
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
-// Assist: extract_module_to_file
+// Assist: move_module_to_file
 //
-// This assist extract module to file.
+// Moves inline module's contents to a separate file.
 //
 // ```
-// mod foo {<|>
+// mod $0foo {
 //     fn t() {}
 // }
 // ```
@@ -20,19 +21,24 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // mod foo;
 // ```
-pub(crate) fn extract_module_to_file(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn move_module_to_file(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let module_ast = ctx.find_node_at_offset::<ast::Module>()?;
+    let module_items = module_ast.item_list()?;
+
+    let l_curly_offset = module_items.syntax().text_range().start();
+    if l_curly_offset <= ctx.offset() {
+        mark::hit!(available_before_curly);
+        return None;
+    }
+    let target = TextRange::new(module_ast.syntax().text_range().start(), l_curly_offset);
+
     let module_name = module_ast.name()?;
 
     let module_def = ctx.sema.to_def(&module_ast)?;
     let parent_module = module_def.parent(ctx.db())?;
 
-    let module_items = module_ast.item_list()?;
-    let target = module_ast.syntax().text_range();
-    let anchor_file_id = ctx.frange.file_id;
-
     acc.add(
-        AssistId("extract_module_to_file", AssistKind::RefactorExtract),
+        AssistId("move_module_to_file", AssistKind::RefactorExtract),
         "Extract module to file",
         target,
         |builder| {
@@ -53,9 +59,9 @@ pub(crate) fn extract_module_to_file(acc: &mut Assists, ctx: &AssistContext) ->
                 items
             };
 
-            builder.replace(target, format!("mod {};", module_name));
+            builder.replace(module_ast.syntax().text_range(), format!("mod {};", module_name));
 
-            let dst = AnchoredPathBuf { anchor: anchor_file_id, path };
+            let dst = AnchoredPathBuf { anchor: ctx.frange.file_id, path };
             builder.create_file(dst, contents);
         },
     )
@@ -63,16 +69,16 @@ pub(crate) fn extract_module_to_file(acc: &mut Assists, ctx: &AssistContext) ->
 
 #[cfg(test)]
 mod tests {
-    use crate::tests::check_assist;
+    use crate::tests::{check_assist, check_assist_not_applicable};
 
     use super::*;
 
     #[test]
     fn extract_from_root() {
         check_assist(
-            extract_module_to_file,
+            move_module_to_file,
             r#"
-mod tests {<|>
+mod $0tests {
     #[test] fn t() {}
 }
 "#,
@@ -88,12 +94,12 @@ mod tests;
     #[test]
     fn extract_from_submodule() {
         check_assist(
-            extract_module_to_file,
+            move_module_to_file,
             r#"
 //- /main.rs
 mod submod;
 //- /submod.rs
-mod inner<|> {
+$0mod inner {
     fn f() {}
 }
 fn g() {}
@@ -111,12 +117,12 @@ fn f() {}
     #[test]
     fn extract_from_mod_rs() {
         check_assist(
-            extract_module_to_file,
+            move_module_to_file,
             r#"
 //- /main.rs
 mod submodule;
 //- /submodule/mod.rs
-mod inner<|> {
+mod inner$0 {
     fn f() {}
 }
 fn g() {}
@@ -130,4 +136,10 @@ fn f() {}
 "#,
         );
     }
+
+    #[test]
+    fn available_before_curly() {
+        mark::check!(available_before_curly);
+        check_assist_not_applicable(move_module_to_file, r#"mod m { $0 }"#);
+    }
 }
diff --git a/crates/assists/src/handlers/extract_assignment.rs b/crates/assists/src/handlers/pull_assignment_up.rs
index 281cf5d24..13e1cb754 100644
--- a/crates/assists/src/handlers/extract_assignment.rs
+++ b/crates/assists/src/handlers/pull_assignment_up.rs
@@ -1,4 +1,3 @@
-use hir::AsName;
 use syntax::{
     ast::{self, edit::AstNodeEdit, make},
     AstNode,
@@ -10,16 +9,16 @@ use crate::{
     AssistId, AssistKind,
 };
 
-// Assist: extract_assignment
+// Assist: pull_assignment_up
 //
-// Extracts variable assigment to outside an if or match statement.
+// Extracts variable assignment to outside an if or match statement.
 //
 // ```
 // fn main() {
 //     let mut foo = 6;
 //
 //     if true {
-//         <|>foo = 5;
+//         $0foo = 5;
 //     } else {
 //         foo = 4;
 //     }
@@ -37,16 +36,24 @@ use crate::{
 //     };
 // }
 // ```
-pub(crate) fn extract_assigment(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let name = ctx.find_node_at_offset::<ast::NameRef>()?.as_name();
+pub(crate) fn pull_assignment_up(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+    let assign_expr = ctx.find_node_at_offset::<ast::BinExpr>()?;
+    let name_expr = if assign_expr.op_kind()? == ast::BinOp::Assignment {
+        assign_expr.lhs()?
+    } else {
+        return None;
+    };
 
     let (old_stmt, new_stmt) = if let Some(if_expr) = ctx.find_node_at_offset::<ast::IfExpr>() {
         (
             ast::Expr::cast(if_expr.syntax().to_owned())?,
-            exprify_if(&if_expr, &name)?.indent(if_expr.indent_level()),
+            exprify_if(&if_expr, &ctx.sema, &name_expr)?.indent(if_expr.indent_level()),
         )
     } else if let Some(match_expr) = ctx.find_node_at_offset::<ast::MatchExpr>() {
-        (ast::Expr::cast(match_expr.syntax().to_owned())?, exprify_match(&match_expr, &name)?)
+        (
+            ast::Expr::cast(match_expr.syntax().to_owned())?,
+            exprify_match(&match_expr, &ctx.sema, &name_expr)?,
+        )
     } else {
         return None;
     };
@@ -54,22 +61,26 @@ pub(crate) fn extract_assigment(acc: &mut Assists, ctx: &AssistContext) -> Optio
     let expr_stmt = make::expr_stmt(new_stmt);
 
     acc.add(
-        AssistId("extract_assignment", AssistKind::RefactorExtract),
-        "Extract assignment",
+        AssistId("pull_assignment_up", AssistKind::RefactorExtract),
+        "Pull assignment up",
         old_stmt.syntax().text_range(),
         move |edit| {
-            edit.replace(old_stmt.syntax().text_range(), format!("{} = {};", name, expr_stmt));
+            edit.replace(old_stmt.syntax().text_range(), format!("{} = {};", name_expr, expr_stmt));
         },
     )
 }
 
-fn exprify_match(match_expr: &ast::MatchExpr, name: &hir::Name) -> Option<ast::Expr> {
+fn exprify_match(
+    match_expr: &ast::MatchExpr,
+    sema: &hir::Semantics<ide_db::RootDatabase>,
+    name: &ast::Expr,
+) -> Option<ast::Expr> {
     let new_arm_list = match_expr
         .match_arm_list()?
         .arms()
         .map(|arm| {
             if let ast::Expr::BlockExpr(block) = arm.expr()? {
-                let new_block = exprify_block(&block, name)?.indent(block.indent_level());
+                let new_block = exprify_block(&block, sema, name)?.indent(block.indent_level());
                 Some(arm.replace_descendant(block, new_block))
             } else {
                 None
@@ -82,22 +93,32 @@ fn exprify_match(match_expr: &ast::MatchExpr, name: &hir::Name) -> Option<ast::E
     Some(make::expr_match(match_expr.expr()?, new_arm_list))
 }
 
-fn exprify_if(statement: &ast::IfExpr, name: &hir::Name) -> Option<ast::Expr> {
-    let then_branch = exprify_block(&statement.then_branch()?, name)?;
+fn exprify_if(
+    statement: &ast::IfExpr,
+    sema: &hir::Semantics<ide_db::RootDatabase>,
+    name: &ast::Expr,
+) -> Option<ast::Expr> {
+    let then_branch = exprify_block(&statement.then_branch()?, sema, name)?;
     let else_branch = match statement.else_branch()? {
-        ast::ElseBranch::Block(ref block) => ast::ElseBranch::Block(exprify_block(block, name)?),
+        ast::ElseBranch::Block(ref block) => {
+            ast::ElseBranch::Block(exprify_block(block, sema, name)?)
+        }
         ast::ElseBranch::IfExpr(expr) => {
-            mark::hit!(test_extract_assigment_chained_if);
+            mark::hit!(test_pull_assignment_up_chained_if);
             ast::ElseBranch::IfExpr(ast::IfExpr::cast(
-                exprify_if(&expr, name)?.syntax().to_owned(),
+                exprify_if(&expr, sema, name)?.syntax().to_owned(),
             )?)
         }
     };
     Some(make::expr_if(statement.condition()?, then_branch, Some(else_branch)))
 }
 
-fn exprify_block(block: &ast::BlockExpr, name: &hir::Name) -> Option<ast::BlockExpr> {
-    if block.expr().is_some() {
+fn exprify_block(
+    block: &ast::BlockExpr,
+    sema: &hir::Semantics<ide_db::RootDatabase>,
+    name: &ast::Expr,
+) -> Option<ast::BlockExpr> {
+    if block.tail_expr().is_some() {
         return None;
     }
 
@@ -106,8 +127,7 @@ fn exprify_block(block: &ast::BlockExpr, name: &hir::Name) -> Option<ast::BlockE
 
     if let ast::Stmt::ExprStmt(stmt) = stmt {
         if let ast::Expr::BinExpr(expr) = stmt.expr()? {
-            if expr.op_kind()? == ast::BinOp::Assignment
-                && &expr.lhs()?.name_ref()?.as_name() == name
+            if expr.op_kind()? == ast::BinOp::Assignment && is_equivalent(sema, &expr.lhs()?, name)
             {
                 // The last statement in the block is an assignment to the name we want
                 return Some(make::block_expr(stmts, Some(expr.rhs()?)));
@@ -117,6 +137,29 @@ fn exprify_block(block: &ast::BlockExpr, name: &hir::Name) -> Option<ast::BlockE
     None
 }
 
+fn is_equivalent(
+    sema: &hir::Semantics<ide_db::RootDatabase>,
+    expr0: &ast::Expr,
+    expr1: &ast::Expr,
+) -> bool {
+    match (expr0, expr1) {
+        (ast::Expr::FieldExpr(field_expr0), ast::Expr::FieldExpr(field_expr1)) => {
+            mark::hit!(test_pull_assignment_up_field_assignment);
+            sema.resolve_field(field_expr0) == sema.resolve_field(field_expr1)
+        }
+        (ast::Expr::PathExpr(path0), ast::Expr::PathExpr(path1)) => {
+            let path0 = path0.path();
+            let path1 = path1.path();
+            if let (Some(path0), Some(path1)) = (path0, path1) {
+                sema.resolve_path(&path0) == sema.resolve_path(&path1)
+            } else {
+                false
+            }
+        }
+        _ => false,
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -124,15 +167,15 @@ mod tests {
     use crate::tests::{check_assist, check_assist_not_applicable};
 
     #[test]
-    fn test_extract_assignment_if() {
+    fn test_pull_assignment_up_if() {
         check_assist(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     if true {
-        <|>a = 2;
+        $0a = 2;
     } else {
         a = 3;
     }
@@ -151,16 +194,16 @@ fn foo() {
     }
 
     #[test]
-    fn test_extract_assignment_match() {
+    fn test_pull_assignment_up_match() {
         check_assist(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     match 1 {
         1 => {
-            <|>a = 2;
+            $0a = 2;
         },
         2 => {
             a = 3;
@@ -190,15 +233,15 @@ fn foo() {
     }
 
     #[test]
-    fn test_extract_assignment_not_last_not_applicable() {
+    fn test_pull_assignment_up_not_last_not_applicable() {
         check_assist_not_applicable(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     if true {
-        <|>a = 2;
+        $0a = 2;
         b = a;
     } else {
         a = 3;
@@ -208,16 +251,16 @@ fn foo() {
     }
 
     #[test]
-    fn test_extract_assignment_chained_if() {
-        mark::check!(test_extract_assigment_chained_if);
+    fn test_pull_assignment_up_chained_if() {
+        mark::check!(test_pull_assignment_up_chained_if);
         check_assist(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     if true {
-        <|>a = 2;
+        $0a = 2;
     } else if false {
         a = 3;
     } else {
@@ -240,16 +283,16 @@ fn foo() {
     }
 
     #[test]
-    fn test_extract_assigment_retains_stmts() {
+    fn test_pull_assignment_up_retains_stmts() {
         check_assist(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     if true {
         let b = 2;
-        <|>a = 2;
+        $0a = 2;
     } else {
         let b = 3;
         a = 3;
@@ -271,15 +314,15 @@ fn foo() {
     }
 
     #[test]
-    fn extract_assignment_let_stmt_not_applicable() {
+    fn pull_assignment_up_let_stmt_not_applicable() {
         check_assist_not_applicable(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     let b = if true {
-        <|>a = 2
+        $0a = 2
     } else {
         a = 3
     };
@@ -288,31 +331,31 @@ fn foo() {
     }
 
     #[test]
-    fn extract_assignment_if_missing_assigment_not_applicable() {
+    fn pull_assignment_up_if_missing_assigment_not_applicable() {
         check_assist_not_applicable(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     if true {
-        <|>a = 2;
+        $0a = 2;
     } else {}
 }"#,
         )
     }
 
     #[test]
-    fn extract_assignment_match_missing_assigment_not_applicable() {
+    fn pull_assignment_up_match_missing_assigment_not_applicable() {
         check_assist_not_applicable(
-            extract_assigment,
+            pull_assignment_up,
             r#"
 fn foo() {
     let mut a = 1;
 
     match 1 {
         1 => {
-            <|>a = 2;
+            $0a = 2;
         },
         2 => {
             a = 3;
@@ -322,4 +365,36 @@ fn foo() {
 }"#,
         )
     }
+
+    #[test]
+    fn test_pull_assignment_up_field_assignment() {
+        mark::check!(test_pull_assignment_up_field_assignment);
+        check_assist(
+            pull_assignment_up,
+            r#"
+struct A(usize);
+
+fn foo() {
+    let mut a = A(1);
+
+    if true {
+        $0a.0 = 2;
+    } else {
+        a.0 = 3;
+    }
+}"#,
+            r#"
+struct A(usize);
+
+fn foo() {
+    let mut a = A(1);
+
+    a.0 = if true {
+        2
+    } else {
+        3
+    };
+}"#,
+        )
+    }
 }
diff --git a/crates/assists/src/handlers/qualify_path.rs b/crates/assists/src/handlers/qualify_path.rs
index 98cb09214..f7fbf37f4 100644
--- a/crates/assists/src/handlers/qualify_path.rs
+++ b/crates/assists/src/handlers/qualify_path.rs
@@ -22,7 +22,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     let map = HashMap<|>::new();
+//     let map = HashMap$0::new();
 // }
 // # pub mod std { pub mod collections { pub struct HashMap { } } }
 // ```
@@ -221,7 +221,7 @@ mod tests {
 
             use std::fmt;
 
-            <|>Formatter
+            $0Formatter
             ",
             r"
             mod std {
@@ -242,7 +242,7 @@ mod tests {
         check_assist(
             qualify_path,
             r"
-            <|>PubStruct
+            $0PubStruct
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -266,7 +266,7 @@ mod tests {
             macro_rules! foo {
                 ($i:ident) => { fn foo(a: $i) {} }
             }
-            foo!(Pub<|>Struct);
+            foo!(Pub$0Struct);
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -290,7 +290,7 @@ mod tests {
         check_assist(
             qualify_path,
             r"
-            PubSt<|>ruct
+            PubSt$0ruct
 
             pub mod PubMod1 {
                 pub struct PubStruct;
@@ -325,7 +325,7 @@ mod tests {
             r"
             use PubMod::PubStruct;
 
-            PubStruct<|>
+            PubStruct$0
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -339,7 +339,7 @@ mod tests {
         check_assist_not_applicable(
             qualify_path,
             r"
-            PrivateStruct<|>
+            PrivateStruct$0
 
             pub mod PubMod {
                 struct PrivateStruct;
@@ -353,7 +353,7 @@ mod tests {
         check_assist_not_applicable(
             qualify_path,
             "
-            PubStruct<|>",
+            PubStruct$0",
         );
     }
 
@@ -362,7 +362,7 @@ mod tests {
         check_assist_not_applicable(
             qualify_path,
             r"
-            use PubStruct<|>;
+            use PubStruct$0;
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -375,7 +375,7 @@ mod tests {
         check_assist(
             qualify_path,
             r"
-            test_function<|>
+            test_function$0
 
             pub mod PubMod {
                 pub fn test_function() {};
@@ -404,7 +404,7 @@ macro_rules! foo {
 
 //- /main.rs crate:main deps:crate_with_macro
 fn main() {
-    foo<|>
+    foo$0
 }
 ",
             r"
@@ -421,7 +421,7 @@ fn main() {
             qualify_path,
             r"
             struct AssistInfo {
-                group_label: Option<<|>GroupLabel>,
+                group_label: Option<$0GroupLabel>,
             }
 
             mod m { pub struct GroupLabel; }
@@ -445,7 +445,7 @@ fn main() {
 
             use mod1::mod2;
             fn main() {
-                mod2::mod3::TestStruct<|>
+                mod2::mod3::TestStruct$0
             }
             ",
         );
@@ -462,7 +462,7 @@ fn main() {
 
             use test_mod::test_function;
             fn main() {
-                test_function<|>
+                test_function$0
             }
             ",
         );
@@ -481,7 +481,7 @@ fn main() {
             }
 
             fn main() {
-                TestStruct::test_function<|>
+                TestStruct::test_function$0
             }
             ",
             r"
@@ -513,7 +513,7 @@ fn main() {
             }
 
             fn main() {
-                TestStruct::TEST_CONST<|>
+                TestStruct::TEST_CONST$0
             }
             ",
             r"
@@ -547,7 +547,7 @@ fn main() {
             }
 
             fn main() {
-                test_mod::TestStruct::test_function<|>
+                test_mod::TestStruct::test_function$0
             }
             ",
             r"
@@ -594,7 +594,7 @@ fn main() {
 
             use test_mod::TestTrait2;
             fn main() {
-                test_mod::TestEnum::test_function<|>;
+                test_mod::TestEnum::test_function$0;
             }
             ",
         )
@@ -617,7 +617,7 @@ fn main() {
             }
 
             fn main() {
-                test_mod::TestStruct::TEST_CONST<|>
+                test_mod::TestStruct::TEST_CONST$0
             }
             ",
             r"
@@ -664,7 +664,7 @@ fn main() {
 
             use test_mod::TestTrait2;
             fn main() {
-                test_mod::TestEnum::TEST_CONST<|>;
+                test_mod::TestEnum::TEST_CONST$0;
             }
             ",
         )
@@ -688,7 +688,7 @@ fn main() {
 
             fn main() {
                 let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             ",
             r"
@@ -727,7 +727,7 @@ fn main() {
 
             fn main() {
                 let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od(42)
+                test_struct.test_meth$0od(42)
             }
             ",
             r"
@@ -766,7 +766,7 @@ fn main() {
 
             fn main() {
                 let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             ",
             r"
@@ -796,7 +796,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 {
@@ -825,7 +825,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 {
@@ -853,7 +853,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 {
@@ -882,7 +882,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 {
@@ -906,7 +906,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 {
@@ -949,7 +949,7 @@ fn main() {
             use test_mod::TestTrait2;
             fn main() {
                 let one = test_mod::TestEnum::One;
-                one.test<|>_method();
+                one.test$0_method();
             }
             ",
         )
@@ -965,7 +965,7 @@ pub struct Struct;
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    Struct<|>
+    Struct$0
 }
 ",
             r"
@@ -992,7 +992,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"
 struct S;
@@ -1019,7 +1019,7 @@ mac!();
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    Cheese<|>;
+    Cheese$0;
 }
 ",
             r"
@@ -1042,7 +1042,7 @@ pub struct fmt;
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    FMT<|>;
+    FMT$0;
 }
 ",
             r"
@@ -1062,7 +1062,7 @@ fn main() {
 pub mod generic { pub struct Thing<'a, T>(&'a T); }
 
 //- /main.rs crate:main deps:dep
-fn foo() -> Thin<|>g<'static, ()> {}
+fn foo() -> Thin$0g<'static, ()> {}
 
 fn main() {}
 ",
@@ -1083,7 +1083,7 @@ fn main() {}
 pub mod generic { pub struct Thing<'a, T>(&'a T); }
 
 //- /main.rs crate:main deps:dep
-fn foo() -> Thin<|>g::<'static, ()> {}
+fn foo() -> Thin$0g::<'static, ()> {}
 
 fn main() {}
 ",
@@ -1108,7 +1108,7 @@ fn main() {}
             }
 
             fn main() {
-                TestStruct::<()>::TEST_CONST<|>
+                TestStruct::<()>::TEST_CONST$0
             }
             ",
             r"
@@ -1142,7 +1142,7 @@ fn main() {}
             }
 
             fn main() {
-                test_mod::TestStruct::<()>::TEST_CONST<|>
+                test_mod::TestStruct::<()>::TEST_CONST$0
             }
             ",
             r"
@@ -1180,7 +1180,7 @@ fn main() {}
 
             fn main() {
                 let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od::<()>()
+                test_struct.test_meth$0od::<()>()
             }
             ",
             r"
diff --git a/crates/assists/src/handlers/raw_string.rs b/crates/assists/src/handlers/raw_string.rs
index 4c759cc25..be963f162 100644
--- a/crates/assists/src/handlers/raw_string.rs
+++ b/crates/assists/src/handlers/raw_string.rs
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     "Hello,<|> World!";
+//     "Hello,$0 World!";
 // }
 // ```
 // ->
@@ -53,7 +53,7 @@ pub(crate) fn make_raw_string(acc: &mut Assists, ctx: &AssistContext) -> Option<
 //
 // ```
 // fn main() {
-//     r#"Hello,<|> "World!""#;
+//     r#"Hello,$0 "World!""#;
 // }
 // ```
 // ->
@@ -95,7 +95,7 @@ pub(crate) fn make_usual_string(acc: &mut Assists, ctx: &AssistContext) -> Optio
 //
 // ```
 // fn main() {
-//     r#"Hello,<|> World!"#;
+//     r#"Hello,$0 World!"#;
 // }
 // ```
 // ->
@@ -123,7 +123,7 @@ pub(crate) fn add_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
 //
 // ```
 // fn main() {
-//     r#"Hello,<|> World!"#;
+//     r#"Hello,$0 World!"#;
 // }
 // ```
 // ->
@@ -194,7 +194,7 @@ mod tests {
             make_raw_string,
             r#"
             fn f() {
-                let s = <|>"random\nstring";
+                let s = $0"random\nstring";
             }
             "#,
             r#""random\nstring""#,
@@ -207,7 +207,7 @@ mod tests {
             make_raw_string,
             r#"
 fn f() {
-    let s = <|>"random\nstring";
+    let s = $0"random\nstring";
 }
 "#,
             r##"
@@ -225,7 +225,7 @@ string"#;
             make_raw_string,
             r#"
             fn f() {
-                format!(<|>"x = {}", 92)
+                format!($0"x = {}", 92)
             }
             "#,
             r##"
@@ -242,7 +242,7 @@ string"#;
             make_raw_string,
             r###"
 fn f() {
-    let s = <|>"#random##\nstring";
+    let s = $0"#random##\nstring";
 }
 "###,
             r####"
@@ -260,7 +260,7 @@ string"#;
             make_raw_string,
             r###"
 fn f() {
-    let s = <|>"#random\"##\nstring";
+    let s = $0"#random\"##\nstring";
 }
 "###,
             r####"
@@ -278,7 +278,7 @@ string"###;
             make_raw_string,
             r#"
             fn f() {
-                let s = <|>"random string";
+                let s = $0"random string";
             }
             "#,
             r##"
@@ -295,7 +295,7 @@ string"###;
             make_raw_string,
             r#"
             fn f() {
-                let s = "foo<|>
+                let s = "foo$0
             }
             "#,
         )
@@ -307,7 +307,7 @@ string"###;
             make_usual_string,
             r#"
             fn main() {
-                let s = r#"bar<|>
+                let s = r#"bar$0
             }
             "#,
         )
@@ -319,7 +319,7 @@ string"###;
             add_hash,
             r#"
             fn f() {
-                let s = <|>r"random string";
+                let s = $0r"random string";
             }
             "#,
             r#"r"random string""#,
@@ -332,7 +332,7 @@ string"###;
             add_hash,
             r#"
             fn f() {
-                let s = <|>r"random string";
+                let s = $0r"random string";
             }
             "#,
             r##"
@@ -349,7 +349,7 @@ string"###;
             add_hash,
             r##"
             fn f() {
-                let s = <|>r#"random"string"#;
+                let s = $0r#"random"string"#;
             }
             "##,
             r###"
@@ -366,7 +366,7 @@ string"###;
             add_hash,
             r#"
             fn f() {
-                let s = <|>"random string";
+                let s = $0"random string";
             }
             "#,
         );
@@ -378,7 +378,7 @@ string"###;
             remove_hash,
             r##"
             fn f() {
-                let s = <|>r#"random string"#;
+                let s = $0r#"random string"#;
             }
             "##,
             r##"r#"random string"#"##,
@@ -389,7 +389,7 @@ string"###;
     fn remove_hash_works() {
         check_assist(
             remove_hash,
-            r##"fn f() { let s = <|>r#"random string"#; }"##,
+            r##"fn f() { let s = $0r#"random string"#; }"##,
             r#"fn f() { let s = r"random string"; }"#,
         )
     }
@@ -401,7 +401,7 @@ string"###;
             remove_hash,
             r##"
             fn f() {
-                let s = <|>r#"random"str"ing"#;
+                let s = $0r#"random"str"ing"#;
             }
             "##,
         )
@@ -413,7 +413,7 @@ string"###;
             remove_hash,
             r###"
             fn f() {
-                let s = <|>r##"random string"##;
+                let s = $0r##"random string"##;
             }
             "###,
             r##"
@@ -426,12 +426,12 @@ string"###;
 
     #[test]
     fn remove_hash_doesnt_work() {
-        check_assist_not_applicable(remove_hash, r#"fn f() { let s = <|>"random string"; }"#);
+        check_assist_not_applicable(remove_hash, r#"fn f() { let s = $0"random string"; }"#);
     }
 
     #[test]
     fn remove_hash_no_hash_doesnt_work() {
-        check_assist_not_applicable(remove_hash, r#"fn f() { let s = <|>r"random string"; }"#);
+        check_assist_not_applicable(remove_hash, r#"fn f() { let s = $0r"random string"; }"#);
     }
 
     #[test]
@@ -440,7 +440,7 @@ string"###;
             make_usual_string,
             r##"
             fn f() {
-                let s = <|>r#"random string"#;
+                let s = $0r#"random string"#;
             }
             "##,
             r##"r#"random string"#"##,
@@ -453,7 +453,7 @@ string"###;
             make_usual_string,
             r##"
             fn f() {
-                let s = <|>r#"random string"#;
+                let s = $0r#"random string"#;
             }
             "##,
             r#"
@@ -470,7 +470,7 @@ string"###;
             make_usual_string,
             r##"
             fn f() {
-                let s = <|>r#"random"str"ing"#;
+                let s = $0r#"random"str"ing"#;
             }
             "##,
             r#"
@@ -487,7 +487,7 @@ string"###;
             make_usual_string,
             r###"
             fn f() {
-                let s = <|>r##"random string"##;
+                let s = $0r##"random string"##;
             }
             "###,
             r##"
@@ -504,7 +504,7 @@ string"###;
             make_usual_string,
             r#"
             fn f() {
-                let s = <|>"random string";
+                let s = $0"random string";
             }
             "#,
         );
diff --git a/crates/assists/src/handlers/remove_dbg.rs b/crates/assists/src/handlers/remove_dbg.rs
index eae6367c1..0320c2f12 100644
--- a/crates/assists/src/handlers/remove_dbg.rs
+++ b/crates/assists/src/handlers/remove_dbg.rs
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     <|>dbg!(92);
+//     $0dbg!(92);
 // }
 // ```
 // ->
@@ -161,19 +161,19 @@ mod tests {
 
     #[test]
     fn test_remove_dbg() {
-        check_assist(remove_dbg, "<|>dbg!(1 + 1)", "1 + 1");
+        check_assist(remove_dbg, "$0dbg!(1 + 1)", "1 + 1");
 
-        check_assist(remove_dbg, "dbg!<|>((1 + 1))", "(1 + 1)");
+        check_assist(remove_dbg, "dbg!$0((1 + 1))", "(1 + 1)");
 
-        check_assist(remove_dbg, "dbg!(1 <|>+ 1)", "1 + 1");
+        check_assist(remove_dbg, "dbg!(1 $0+ 1)", "1 + 1");
 
-        check_assist(remove_dbg, "let _ = <|>dbg!(1 + 1)", "let _ = 1 + 1");
+        check_assist(remove_dbg, "let _ = $0dbg!(1 + 1)", "let _ = 1 + 1");
 
         check_assist(
             remove_dbg,
             "
 fn foo(n: usize) {
-    if let Some(_) = dbg!(n.<|>checked_sub(4)) {
+    if let Some(_) = dbg!(n.$0checked_sub(4)) {
         // ...
     }
 }
@@ -187,20 +187,20 @@ fn foo(n: usize) {
 ",
         );
 
-        check_assist(remove_dbg, "<|>dbg!(Foo::foo_test()).bar()", "Foo::foo_test().bar()");
+        check_assist(remove_dbg, "$0dbg!(Foo::foo_test()).bar()", "Foo::foo_test().bar()");
     }
 
     #[test]
     fn test_remove_dbg_with_brackets_and_braces() {
-        check_assist(remove_dbg, "dbg![<|>1 + 1]", "1 + 1");
-        check_assist(remove_dbg, "dbg!{<|>1 + 1}", "1 + 1");
+        check_assist(remove_dbg, "dbg![$01 + 1]", "1 + 1");
+        check_assist(remove_dbg, "dbg!{$01 + 1}", "1 + 1");
     }
 
     #[test]
     fn test_remove_dbg_not_applicable() {
-        check_assist_not_applicable(remove_dbg, "<|>vec![1, 2, 3]");
-        check_assist_not_applicable(remove_dbg, "<|>dbg(5, 6, 7)");
-        check_assist_not_applicable(remove_dbg, "<|>dbg!(5, 6, 7");
+        check_assist_not_applicable(remove_dbg, "$0vec![1, 2, 3]");
+        check_assist_not_applicable(remove_dbg, "$0dbg(5, 6, 7)");
+        check_assist_not_applicable(remove_dbg, "$0dbg!(5, 6, 7");
     }
 
     #[test]
@@ -209,7 +209,7 @@ fn foo(n: usize) {
             remove_dbg,
             "
 fn foo(n: usize) {
-    if let Some(_) = dbg!(n.<|>checked_sub(4)) {
+    if let Some(_) = dbg!(n.$0checked_sub(4)) {
         // ...
     }
 }
@@ -226,7 +226,7 @@ fn foo(n: usize) {
         // the ast::MacroCall to include the semicolon at the end
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(1 * 20); // needless comment"#,
+            r#"let res = $0dbg!(1 * 20); // needless comment"#,
             r#"let res = 1 * 20; // needless comment"#,
         );
     }
@@ -238,7 +238,7 @@ fn foo(n: usize) {
             "
 fn main() {
     let mut a = 1;
-    while dbg!<|>(a) < 10000 {
+    while dbg!$0(a) < 10000 {
         a += 1;
     }
 }
@@ -258,31 +258,31 @@ fn main() {
     fn test_remove_dbg_keep_expression() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(a + b).foo();"#,
+            r#"let res = $0dbg!(a + b).foo();"#,
             r#"let res = (a + b).foo();"#,
         );
 
-        check_assist(remove_dbg, r#"let res = <|>dbg!(2 + 2) * 5"#, r#"let res = (2 + 2) * 5"#);
-        check_assist(remove_dbg, r#"let res = <|>dbg![2 + 2] * 5"#, r#"let res = (2 + 2) * 5"#);
+        check_assist(remove_dbg, r#"let res = $0dbg!(2 + 2) * 5"#, r#"let res = (2 + 2) * 5"#);
+        check_assist(remove_dbg, r#"let res = $0dbg![2 + 2] * 5"#, r#"let res = (2 + 2) * 5"#);
     }
 
     #[test]
     fn test_remove_dbg_method_chaining() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(foo().bar()).baz();"#,
+            r#"let res = $0dbg!(foo().bar()).baz();"#,
             r#"let res = foo().bar().baz();"#,
         );
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(foo.bar()).baz();"#,
+            r#"let res = $0dbg!(foo.bar()).baz();"#,
             r#"let res = foo.bar().baz();"#,
         );
     }
 
     #[test]
     fn test_remove_dbg_field_chaining() {
-        check_assist(remove_dbg, r#"let res = <|>dbg!(foo.bar).baz;"#, r#"let res = foo.bar.baz;"#);
+        check_assist(remove_dbg, r#"let res = $0dbg!(foo.bar).baz;"#, r#"let res = foo.bar.baz;"#);
     }
 
     #[test]
@@ -295,7 +295,7 @@ fn square(x: u32) -> u32 {
 }
 
 fn main() {
-    let x = square(dbg<|>!(5 + 10));
+    let x = square(dbg$0!(5 + 10));
     println!("{}", x);
 }"#,
             "dbg!(5 + 10)",
@@ -309,7 +309,7 @@ fn square(x: u32) -> u32 {
 }
 
 fn main() {
-    let x = square(dbg<|>!(5 + 10));
+    let x = square(dbg$0!(5 + 10));
     println!("{}", x);
 }"#,
             r#"
@@ -328,7 +328,7 @@ fn main() {
     fn test_remove_dbg_try_expr() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(result?).foo();"#,
+            r#"let res = $0dbg!(result?).foo();"#,
             r#"let res = result?.foo();"#,
         );
     }
@@ -337,7 +337,7 @@ fn main() {
     fn test_remove_dbg_await_expr() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(fut.await).foo();"#,
+            r#"let res = $0dbg!(fut.await).foo();"#,
             r#"let res = fut.await.foo();"#,
         );
     }
@@ -346,7 +346,7 @@ fn main() {
     fn test_remove_dbg_as_cast() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(3 as usize).foo();"#,
+            r#"let res = $0dbg!(3 as usize).foo();"#,
             r#"let res = (3 as usize).foo();"#,
         );
     }
@@ -355,12 +355,12 @@ fn main() {
     fn test_remove_dbg_index_expr() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(array[3]).foo();"#,
+            r#"let res = $0dbg!(array[3]).foo();"#,
             r#"let res = array[3].foo();"#,
         );
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(tuple.3).foo();"#,
+            r#"let res = $0dbg!(tuple.3).foo();"#,
             r#"let res = tuple.3.foo();"#,
         );
     }
@@ -369,12 +369,12 @@ fn main() {
     fn test_remove_dbg_range_expr() {
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(foo..bar).foo();"#,
+            r#"let res = $0dbg!(foo..bar).foo();"#,
             r#"let res = (foo..bar).foo();"#,
         );
         check_assist(
             remove_dbg,
-            r#"let res = <|>dbg!(foo..=bar).foo();"#,
+            r#"let res = $0dbg!(foo..=bar).foo();"#,
             r#"let res = (foo..=bar).foo();"#,
         );
     }
@@ -384,7 +384,7 @@ fn main() {
         check_assist(
             remove_dbg,
             r#"fn foo() {
-    if <|>dbg!(x || y) {}
+    if $0dbg!(x || y) {}
 }"#,
             r#"fn foo() {
     if x || y {}
@@ -393,7 +393,7 @@ fn main() {
         check_assist(
             remove_dbg,
             r#"fn foo() {
-    while let foo = <|>dbg!(&x) {}
+    while let foo = $0dbg!(&x) {}
 }"#,
             r#"fn foo() {
     while let foo = &x {}
@@ -402,7 +402,7 @@ fn main() {
         check_assist(
             remove_dbg,
             r#"fn foo() {
-    if let foo = <|>dbg!(&x) {}
+    if let foo = $0dbg!(&x) {}
 }"#,
             r#"fn foo() {
     if let foo = &x {}
@@ -411,7 +411,7 @@ fn main() {
         check_assist(
             remove_dbg,
             r#"fn foo() {
-    match <|>dbg!(&x) {}
+    match $0dbg!(&x) {}
 }"#,
             r#"fn foo() {
     match &x {}
diff --git a/crates/assists/src/handlers/remove_mut.rs b/crates/assists/src/handlers/remove_mut.rs
index 575b271f7..30d36dacd 100644
--- a/crates/assists/src/handlers/remove_mut.rs
+++ b/crates/assists/src/handlers/remove_mut.rs
@@ -8,7 +8,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // impl Walrus {
-//     fn feed(&mut<|> self, amount: u32) {}
+//     fn feed(&mut$0 self, amount: u32) {}
 // }
 // ```
 // ->
diff --git a/crates/assists/src/handlers/remove_unused_param.rs b/crates/assists/src/handlers/remove_unused_param.rs
index f72dd49ed..56e8b5229 100644
--- a/crates/assists/src/handlers/remove_unused_param.rs
+++ b/crates/assists/src/handlers/remove_unused_param.rs
@@ -16,7 +16,7 @@ use crate::{
 // Removes unused function parameter.
 //
 // ```
-// fn frobnicate(x: i32<|>) {}
+// fn frobnicate(x: i32$0) {}
 //
 // fn main() {
 //     frobnicate(92);
@@ -123,7 +123,7 @@ mod tests {
             remove_unused_param,
             r#"
 fn a() { foo(9, 2) }
-fn foo(x: i32, <|>y: i32) { x; }
+fn foo(x: i32, $0y: i32) { x; }
 fn b() { foo(9, 2,) }
 "#,
             r#"
@@ -139,7 +139,7 @@ fn b() { foo(9, ) }
         check_assist(
             remove_unused_param,
             r#"
-fn foo(<|>x: i32, y: i32) { y; }
+fn foo($0x: i32, y: i32) { y; }
 fn a() { foo(1, 2) }
 fn b() { foo(1, 2,) }
 "#,
@@ -156,7 +156,7 @@ fn b() { foo(2,) }
         check_assist(
             remove_unused_param,
             r#"
-fn foo(<|>x: i32) { 0; }
+fn foo($0x: i32) { 0; }
 fn a() { foo(1) }
 fn b() { foo(1, ) }
 "#,
@@ -173,7 +173,7 @@ fn b() { foo( ) }
         check_assist(
             remove_unused_param,
             r#"
-fn foo(x: i32, <|>y: i32, z: i32) { x; }
+fn foo(x: i32, $0y: i32, z: i32) { x; }
 fn a() { foo(1, 2, 3) }
 fn b() { foo(1, 2, 3,) }
 "#,
@@ -190,7 +190,7 @@ fn b() { foo(1, 3,) }
         check_assist(
             remove_unused_param,
             r#"
-mod bar { pub fn foo(x: i32, <|>y: i32) { x; } }
+mod bar { pub fn foo(x: i32, $0y: i32) { x; } }
 fn b() { bar::foo(9, 2) }
 "#,
             r#"
@@ -205,7 +205,7 @@ fn b() { bar::foo(9) }
         check_assist(
             remove_unused_param,
             r#"
-pub fn foo<T>(x: T, <|>y: i32) { x; }
+pub fn foo<T>(x: T, $0y: i32) { x; }
 fn b() { foo::<i32>(9, 2) }
 "#,
             r#"
@@ -220,7 +220,7 @@ fn b() { foo::<i32>(9) }
         check_assist(
             remove_unused_param,
             r#"
-pub fn foo<T>(x: i32, <|>y: T) { x; }
+pub fn foo<T>(x: i32, $0y: T) { x; }
 fn b() { foo::<i32>(9, 2) }
 fn b2() { foo(9, 2) }
 "#,
@@ -238,7 +238,7 @@ fn b2() { foo(9) }
         check_assist_not_applicable(
             remove_unused_param,
             r#"
-fn foo(x: i32, <|>y: i32) { y; }
+fn foo(x: i32, $0y: i32) { y; }
 fn main() { foo(9, 2) }
 "#,
         );
@@ -250,7 +250,7 @@ fn main() { foo(9, 2) }
             remove_unused_param,
             r#"
 //- /main.rs
-fn foo(x: i32, <|>y: i32) { x; }
+fn foo(x: i32, $0y: i32) { x; }
 
 mod foo;
 
diff --git a/crates/assists/src/handlers/reorder_fields.rs b/crates/assists/src/handlers/reorder_fields.rs
index fe5574242..fba7d6ddb 100644
--- a/crates/assists/src/handlers/reorder_fields.rs
+++ b/crates/assists/src/handlers/reorder_fields.rs
@@ -15,7 +15,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // struct Foo {foo: i32, bar: i32};
-// const test: Foo = <|>Foo {bar: 0, foo: 1}
+// const test: Foo = $0Foo {bar: 0, foo: 1}
 // ```
 // ->
 // ```
@@ -126,7 +126,7 @@ struct Foo {
     bar: i32,
 }
 
-const test: Foo = <|>Foo { foo: 0, bar: 0 };
+const test: Foo = $0Foo { foo: 0, bar: 0 };
 "#,
         )
     }
@@ -137,7 +137,7 @@ const test: Foo = <|>Foo { foo: 0, bar: 0 };
             reorder_fields,
             r#"
 struct Foo {};
-const test: Foo = <|>Foo {}
+const test: Foo = $0Foo {}
 "#,
         )
     }
@@ -148,7 +148,7 @@ const test: Foo = <|>Foo {}
             reorder_fields,
             r#"
 struct Foo {foo: i32, bar: i32};
-const test: Foo = <|>Foo {bar: 0, foo: 1}
+const test: Foo = $0Foo {bar: 0, foo: 1}
 "#,
             r#"
 struct Foo {foo: i32, bar: i32};
@@ -166,7 +166,7 @@ struct Foo { foo: i64, bar: i64, baz: i64 }
 
 fn f(f: Foo) -> {
     match f {
-        <|>Foo { baz: 0, ref mut bar, .. } => (),
+        $0Foo { baz: 0, ref mut bar, .. } => (),
         _ => ()
     }
 }
@@ -197,7 +197,7 @@ struct Foo {
 impl Foo {
     fn new() -> Foo {
         let foo = String::new();
-        <|>Foo {
+        $0Foo {
             bar: foo.clone(),
             extra: "Extra field",
             foo,
diff --git a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
index cb7a5c104..bd4c1c806 100644
--- a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
@@ -22,7 +22,7 @@ use crate::{
 //
 // ```
 // # trait Debug { fn fmt(&self, f: &mut Formatter) -> Result<()>; }
-// #[derive(Deb<|>ug, Display)]
+// #[derive(Deb$0ug, Display)]
 // struct S;
 // ```
 // ->
@@ -219,7 +219,7 @@ mod fmt {
     }
 }
 
-#[derive(Debu<|>g)]
+#[derive(Debu$0g)]
 struct Foo {
     bar: String,
 }
@@ -261,7 +261,7 @@ mod foo {
     }
 }
 
-#[derive(<|>Bar)]
+#[derive($0Bar)]
 struct Foo {
     bar: String,
 }
@@ -300,7 +300,7 @@ impl foo::Bar for Foo {
         check_assist(
             replace_derive_with_manual_impl,
             "
-#[derive(Debu<|>g)]
+#[derive(Debu$0g)]
 struct Foo {
     bar: String,
 }
@@ -322,7 +322,7 @@ impl Debug for Foo {
         check_assist(
             replace_derive_with_manual_impl,
             "
-#[derive(Debug<|>)]
+#[derive(Debug$0)]
 pub struct Foo {
     bar: String,
 }
@@ -344,7 +344,7 @@ impl Debug for Foo {
         check_assist(
             replace_derive_with_manual_impl,
             "
-#[derive(Display, Debug<|>, Serialize)]
+#[derive(Display, Debug$0, Serialize)]
 struct Foo {}
             ",
             "
@@ -363,7 +363,7 @@ impl Debug for Foo {
         check_assist_not_applicable(
             replace_derive_with_manual_impl,
             "
-#[derive(<|>)]
+#[derive($0)]
 struct Foo {}
             ",
         )
@@ -374,7 +374,7 @@ struct Foo {}
         check_assist_not_applicable(
             replace_derive_with_manual_impl,
             "
-#[derive<|>(Debug)]
+#[derive$0(Debug)]
 struct Foo {}
             ",
         );
@@ -382,7 +382,7 @@ struct Foo {}
         check_assist_not_applicable(
             replace_derive_with_manual_impl,
             "
-#[derive(Debug)<|>]
+#[derive(Debug)$0]
 struct Foo {}
             ",
         )
@@ -393,7 +393,7 @@ struct Foo {}
         check_assist_not_applicable(
             replace_derive_with_manual_impl,
             "
-#[allow(non_camel_<|>case_types)]
+#[allow(non_camel_$0case_types)]
 struct Foo {}
             ",
         )
diff --git a/crates/assists/src/handlers/replace_if_let_with_match.rs b/crates/assists/src/handlers/replace_if_let_with_match.rs
index 4a355c66f..aee3397ab 100644
--- a/crates/assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/assists/src/handlers/replace_if_let_with_match.rs
@@ -20,7 +20,7 @@ use crate::{utils::unwrap_trivial_block, AssistContext, AssistId, AssistKind, As
 // enum Action { Move { distance: u32 }, Stop }
 //
 // fn handle(action: Action) {
-//     <|>if let Action::Move { distance } = action {
+//     $0if let Action::Move { distance } = action {
 //         foo(distance)
 //     } else {
 //         bar()
@@ -89,7 +89,7 @@ pub(crate) fn replace_if_let_with_match(acc: &mut Assists, ctx: &AssistContext)
 // enum Action { Move { distance: u32 }, Stop }
 //
 // fn handle(action: Action) {
-//     <|>match action {
+//     $0match action {
 //         Action::Move { distance } => foo(distance),
 //         _ => bar(),
 //     }
@@ -138,7 +138,7 @@ pub(crate) fn replace_match_with_if_let(acc: &mut Assists, ctx: &AssistContext)
             };
             let else_expr = match else_expr {
                 ast::Expr::BlockExpr(block)
-                    if block.statements().count() == 0 && block.expr().is_none() =>
+                    if block.statements().count() == 0 && block.tail_expr().is_none() =>
                 {
                     None
                 }
@@ -179,7 +179,7 @@ mod tests {
             r#"
 impl VariantData {
     pub fn is_struct(&self) -> bool {
-        if <|>let VariantData::Struct(..) = *self {
+        if $0let VariantData::Struct(..) = *self {
             true
         } else {
             false
@@ -204,7 +204,7 @@ impl VariantData {
             replace_if_let_with_match,
             r#"
 fn foo() {
-    if <|>let VariantData::Struct(..) = a {
+    if $0let VariantData::Struct(..) = a {
         bar(
             123
         )
@@ -233,7 +233,7 @@ fn foo() {
             r#"
 impl VariantData {
     pub fn is_struct(&self) -> bool {
-        if <|>let VariantData::Struct(..) = *self {
+        if $0let VariantData::Struct(..) = *self {
             true
         } else {
             false
@@ -257,7 +257,7 @@ enum Option<T> { Some(T), None }
 use Option::*;
 
 fn foo(x: Option<i32>) {
-    <|>if let Some(x) = x {
+    $0if let Some(x) = x {
         println!("{}", x)
     } else {
         println!("none")
@@ -287,7 +287,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 use Result::*;
 
 fn foo(x: Result<i32, ()>) {
-    <|>if let Ok(x) = x {
+    $0if let Ok(x) = x {
         println!("{}", x)
     } else {
         println!("none")
@@ -315,7 +315,7 @@ fn foo(x: Result<i32, ()>) {
             r#"
 fn main() {
     if true {
-        <|>if let Ok(rel_path) = path.strip_prefix(root_path) {
+        $0if let Ok(rel_path) = path.strip_prefix(root_path) {
             let rel_path = RelativePathBuf::from_path(rel_path).ok()?;
             Some((*id, rel_path))
         } else {
@@ -347,7 +347,7 @@ fn main() {
             r#"
 impl VariantData {
     pub fn is_struct(&self) -> bool {
-        <|>match *self {
+        $0match *self {
             VariantData::Struct(..) => true,
             _ => false,
         }
@@ -372,7 +372,7 @@ impl VariantData {
             replace_match_with_if_let,
             r#"
 fn foo() {
-    <|>match a {
+    $0match a {
         VariantData::Struct(..) => {
             bar(
                 123
@@ -401,7 +401,7 @@ fn foo() {
             r#"
 impl VariantData {
     pub fn is_struct(&self) -> bool {
-        <|>match *self {
+        $0match *self {
             VariantData::Struct(..) => true,
             _ => false,
         }
@@ -423,7 +423,7 @@ enum Option<T> { Some(T), None }
 use Option::*;
 
 fn foo(x: Option<i32>) {
-    <|>match x {
+    $0match x {
         Some(x) => println!("{}", x),
         None => println!("none"),
     }
@@ -453,7 +453,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 use Result::*;
 
 fn foo(x: Result<i32, ()>) {
-    <|>match x {
+    $0match x {
         Ok(x) => println!("{}", x),
         Err(_) => println!("none"),
     }
@@ -481,7 +481,7 @@ fn foo(x: Result<i32, ()>) {
             r#"
 fn main() {
     if true {
-        <|>match path.strip_prefix(root_path) {
+        $0match path.strip_prefix(root_path) {
             Ok(rel_path) => {
                 let rel_path = RelativePathBuf::from_path(rel_path).ok()?;
                 Some((*id, rel_path))
@@ -512,7 +512,7 @@ fn main() {
             replace_match_with_if_let,
             r#"
 fn main() {
-    <|>match path.strip_prefix(root_path) {
+    $0match path.strip_prefix(root_path) {
         Ok(rel_path) => println!("{}", rel_path),
         _ => (),
     }
diff --git a/crates/assists/src/handlers/replace_impl_trait_with_generic.rs b/crates/assists/src/handlers/replace_impl_trait_with_generic.rs
index 6738bc134..ff25b61ea 100644
--- a/crates/assists/src/handlers/replace_impl_trait_with_generic.rs
+++ b/crates/assists/src/handlers/replace_impl_trait_with_generic.rs
@@ -7,7 +7,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Replaces `impl Trait` function argument with the named generic.
 //
 // ```
-// fn foo(bar: <|>impl Bar) {}
+// fn foo(bar: $0impl Bar) {}
 // ```
 // ->
 // ```
@@ -56,7 +56,7 @@ mod tests {
         check_assist(
             replace_impl_trait_with_generic,
             r#"
-            fn foo<G>(bar: <|>impl Bar) {}
+            fn foo<G>(bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<G, B: Bar>(bar: B) {}
@@ -69,7 +69,7 @@ mod tests {
         check_assist(
             replace_impl_trait_with_generic,
             r#"
-            fn foo(bar: <|>impl Bar) {}
+            fn foo(bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<B: Bar>(bar: B) {}
@@ -82,7 +82,7 @@ mod tests {
         check_assist(
             replace_impl_trait_with_generic,
             r#"
-            fn foo<G>(foo: impl Foo, bar: <|>impl Bar) {}
+            fn foo<G>(foo: impl Foo, bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<G, B: Bar>(foo: impl Foo, bar: B) {}
@@ -95,7 +95,7 @@ mod tests {
         check_assist(
             replace_impl_trait_with_generic,
             r#"
-            fn foo<>(bar: <|>impl Bar) {}
+            fn foo<>(bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<B: Bar>(bar: B) {}
@@ -109,7 +109,7 @@ mod tests {
             replace_impl_trait_with_generic,
             r#"
             fn foo<
-            >(bar: <|>impl Bar) {}
+            >(bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<B: Bar
@@ -124,7 +124,7 @@ mod tests {
         check_assist(
             replace_impl_trait_with_generic,
             r#"
-            fn foo<B>(bar: <|>impl Bar) {}
+            fn foo<B>(bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<B, C: Bar>(bar: C) {}
@@ -141,7 +141,7 @@ mod tests {
                 G: Foo,
                 F,
                 H,
-            >(bar: <|>impl Bar) {}
+            >(bar: $0impl Bar) {}
             "#,
             r#"
             fn foo<
@@ -158,7 +158,7 @@ mod tests {
         check_assist(
             replace_impl_trait_with_generic,
             r#"
-            fn foo(bar: <|>impl Foo + Bar) {}
+            fn foo(bar: $0impl Foo + Bar) {}
             "#,
             r#"
             fn foo<F: Foo + Bar>(bar: F) {}
diff --git a/crates/assists/src/handlers/replace_let_with_if_let.rs b/crates/assists/src/handlers/replace_let_with_if_let.rs
index 5970e283c..5a27ada6b 100644
--- a/crates/assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/assists/src/handlers/replace_let_with_if_let.rs
@@ -20,7 +20,7 @@ use ide_db::ty_filter::TryEnum;
 // # enum Option<T> { Some(T), None }
 //
 // fn main(action: Action) {
-//     <|>let x = compute();
+//     $0let x = compute();
 // }
 //
 // fn compute() -> Option<i32> { None }
@@ -85,7 +85,7 @@ mod tests {
 enum E<T> { X(T), Y(T) }
 
 fn main() {
-    <|>let x = E::X(92);
+    $0let x = E::X(92);
 }
             ",
             r"
diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
index 8193e45a8..f3bc6cf39 100644
--- a/crates/assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
@@ -9,7 +9,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Adds a use statement for a given fully-qualified name.
 //
 // ```
-// fn process(map: std::collections::<|>HashMap<String, String>) {}
+// fn process(map: std::collections::$0HashMap<String, String>) {}
 // ```
 // ->
 // ```
@@ -127,7 +127,7 @@ mod tests {
             r"use std::fs;
 
 fn main() {
-    std::f<|>s::Path
+    std::f$0s::Path
 }",
             r"use std::fs;
 
@@ -142,7 +142,7 @@ fn main() {
         check_assist(
             replace_qualified_name_with_use,
             r"
-std::fmt::Debug<|>
+std::fmt::Debug$0
     ",
             r"
 use std::fmt::Debug;
@@ -156,7 +156,7 @@ Debug
         check_assist(
             replace_qualified_name_with_use,
             r"
-std::fmt::Debug<|>
+std::fmt::Debug$0
 
 fn main() {
 }
@@ -180,7 +180,7 @@ fn main() {
 fn main() {
 }
 
-std::fmt::Debug<|>
+std::fmt::Debug$0
     ",
             r"
 use std::fmt::Debug;
@@ -198,7 +198,7 @@ Debug
         check_assist(
             replace_qualified_name_with_use,
             r"
-std::fmt<|>::Debug
+std::fmt$0::Debug
     ",
             r"
 use std::fmt;
@@ -215,7 +215,7 @@ fmt::Debug
             r"
 use stdx;
 
-impl std::fmt::Debug<|> for Foo {
+impl std::fmt::Debug$0 for Foo {
 }
     ",
             r"
@@ -234,7 +234,7 @@ impl Debug for Foo {
         check_assist(
             replace_qualified_name_with_use,
             r"
-impl std::fmt::Debug<|> for Foo {
+impl std::fmt::Debug$0 for Foo {
 }
     ",
             r"
@@ -251,7 +251,7 @@ impl Debug for Foo {
         check_assist(
             replace_qualified_name_with_use,
             r"
-    impl std::fmt::Debug<|> for Foo {
+    impl std::fmt::Debug$0 for Foo {
     }
     ",
             r"
@@ -270,7 +270,7 @@ impl Debug for Foo {
             r"
 use std::fmt;
 
-impl std::io<|> for Foo {
+impl std::io$0 for Foo {
 }
     ",
             r"
@@ -289,7 +289,7 @@ impl io for Foo {
             r"
 use std::fmt;
 
-impl std::fmt::Debug<|> for Foo {
+impl std::fmt::Debug$0 for Foo {
 }
     ",
             r"
@@ -308,7 +308,7 @@ impl Debug for Foo {
             r"
 use std::fmt::Debug;
 
-impl std::fmt<|> for Foo {
+impl std::fmt$0 for Foo {
 }
     ",
             r"
@@ -327,7 +327,7 @@ impl fmt for Foo {
             r"
 use std::fmt::{Debug, nested::{Display}};
 
-impl std::fmt::nested<|> for Foo {
+impl std::fmt::nested$0 for Foo {
 }
 ",
             r"
@@ -346,7 +346,7 @@ impl nested for Foo {
             r"
 use std::fmt::{Debug, nested::{self, Display}};
 
-impl std::fmt::nested<|> for Foo {
+impl std::fmt::nested$0 for Foo {
 }
 ",
             r"
@@ -365,7 +365,7 @@ impl nested for Foo {
             r"
 use std::fmt::{Debug, nested::{Display}};
 
-impl std::fmt::nested::Debug<|> for Foo {
+impl std::fmt::nested::Debug$0 for Foo {
 }
 ",
             r"
@@ -384,7 +384,7 @@ impl Debug for Foo {
             r"
 use std::fmt::Debug;
 
-impl std::fmt::nested::Display<|> for Foo {
+impl std::fmt::nested::Display$0 for Foo {
 }
 ",
             r"
@@ -403,7 +403,7 @@ impl Display for Foo {
             r"
 use std::fmt::nested::Debug;
 
-impl std::fmt::Display<|> for Foo {
+impl std::fmt::Display$0 for Foo {
 }
 ",
             r"
@@ -425,7 +425,7 @@ use crate::{
     AssocItem,
 };
 
-fn foo() { crate::ty::lower<|>::trait_env() }
+fn foo() { crate::ty::lower$0::trait_env() }
 ",
             r"
 use crate::{AssocItem, ty::{Substs, Ty, lower}};
@@ -442,7 +442,7 @@ fn foo() { lower::trait_env() }
             r"
 use std::fmt as foo;
 
-impl foo::Debug<|> for Foo {
+impl foo::Debug$0 for Foo {
 }
 ",
             r"
@@ -462,7 +462,7 @@ impl Debug for Foo {
         check_assist_not_applicable(
             replace_qualified_name_with_use,
             r"
-impl foo<|> for Foo {
+impl foo$0 for Foo {
 }
 ",
         );
@@ -473,7 +473,7 @@ impl foo<|> for Foo {
         check_assist_not_applicable(
             replace_qualified_name_with_use,
             r"
-use std::fmt<|>;
+use std::fmt$0;
 ",
         );
     }
@@ -485,7 +485,7 @@ use std::fmt<|>;
             r"
 mod foo {
     mod bar {
-        std::fmt::Debug<|>
+        std::fmt::Debug$0
     }
 }
     ",
@@ -509,7 +509,7 @@ mod foo {
 #![allow(dead_code)]
 
 fn main() {
-    std::fmt::Debug<|>
+    std::fmt::Debug$0
 }
     ",
             r"
@@ -530,7 +530,7 @@ fn main() {
             replace_qualified_name_with_use,
             r"
 fn main() {
-    std::fmt::Debug<|>;
+    std::fmt::Debug$0;
     let x: std::fmt::Debug = std::fmt::Debug;
 }
     ",
@@ -552,7 +552,7 @@ fn main() {
             r"
 mod m {
     fn f() {
-        std::fmt::Debug<|>;
+        std::fmt::Debug$0;
         let x: std::fmt::Debug = std::fmt::Debug;
     }
     fn g() {
@@ -590,7 +590,7 @@ fn f() {
             replace_qualified_name_with_use,
             r"
 fn main() {
-    std::fmt::Debug<|>;
+    std::fmt::Debug$0;
 }
 
 mod sub {
@@ -623,7 +623,7 @@ mod sub {
 use std::fmt::Display;
 
 fn main() {
-    std::fmt<|>;
+    std::fmt$0;
 }
     ",
             r"
@@ -643,7 +643,7 @@ fn main() {
             r"
 pub use std::fmt;
 
-impl std::io<|> for Foo {
+impl std::io$0 for Foo {
 }
     ",
             r"
@@ -663,7 +663,7 @@ impl io for Foo {
             r"
 pub(crate) use std::fmt;
 
-impl std::io<|> for Foo {
+impl std::io$0 for Foo {
 }
     ",
             r"
diff --git a/crates/assists/src/handlers/replace_string_with_char.rs b/crates/assists/src/handlers/replace_string_with_char.rs
index b4b898846..317318c24 100644
--- a/crates/assists/src/handlers/replace_string_with_char.rs
+++ b/crates/assists/src/handlers/replace_string_with_char.rs
@@ -8,7 +8,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     find("{<|>");
+//     find("{$0");
 // }
 // ```
 // ->
@@ -48,7 +48,7 @@ mod tests {
             replace_string_with_char,
             r#"
             fn f() {
-                let s = "<|>c";
+                let s = "$0c";
             }
             "#,
             r#""c""#,
@@ -61,7 +61,7 @@ mod tests {
             replace_string_with_char,
             r#"
     fn f() {
-        let s = "<|>c";
+        let s = "$0c";
     }
     "#,
             r##"
@@ -78,7 +78,7 @@ mod tests {
             replace_string_with_char,
             r#"
     fn f() {
-        let s = "<|>😀";
+        let s = "$0😀";
     }
     "#,
             r##"
@@ -95,7 +95,7 @@ mod tests {
             replace_string_with_char,
             r#"
     fn f() {
-        let s = "<|>test";
+        let s = "$0test";
     }
     "#,
         )
@@ -107,7 +107,7 @@ mod tests {
             replace_string_with_char,
             r#"
                 fn f() {
-                    format!(<|>"x", 92)
+                    format!($0"x", 92)
                 }
                 "#,
             r##"
@@ -124,7 +124,7 @@ mod tests {
             replace_string_with_char,
             r#"
                 fn f() {
-                    find(<|>"x");
+                    find($0"x");
                 }
                 "#,
             r##"
diff --git a/crates/assists/src/handlers/replace_unwrap_with_match.rs b/crates/assists/src/handlers/replace_unwrap_with_match.rs
index f547066f0..a986a6ae8 100644
--- a/crates/assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/assists/src/handlers/replace_unwrap_with_match.rs
@@ -23,7 +23,7 @@ use ide_db::ty_filter::TryEnum;
 // enum Result<T, E> { Ok(T), Err(E) }
 // fn main() {
 //     let x: Result<i32, i32> = Result::Ok(92);
-//     let y = x.<|>unwrap();
+//     let y = x.$0unwrap();
 // }
 // ```
 // ->
@@ -101,7 +101,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 fn i<T>(a: T) -> T { a }
 fn main() {
     let x: Result<i32, i32> = Result::Ok(92);
-    let y = i(x).<|>unwrap();
+    let y = i(x).$0unwrap();
 }
             ",
             r"
@@ -127,7 +127,7 @@ enum Option<T> { Some(T), None }
 fn i<T>(a: T) -> T { a }
 fn main() {
     let x = Option::Some(92);
-    let y = i(x).<|>unwrap();
+    let y = i(x).$0unwrap();
 }
             ",
             r"
@@ -153,7 +153,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 fn i<T>(a: T) -> T { a }
 fn main() {
     let x: Result<i32, i32> = Result::Ok(92);
-    let y = i(x).<|>unwrap().count_zeroes();
+    let y = i(x).$0unwrap().count_zeroes();
 }
             ",
             r"
@@ -179,7 +179,7 @@ enum Option<T> { Some(T), None }
 fn i<T>(a: T) -> T { a }
 fn main() {
     let x = Option::Some(92);
-    let y = i(x).<|>unwrap();
+    let y = i(x).$0unwrap();
 }
             ",
             r"i(x).unwrap()",
diff --git a/crates/assists/src/handlers/split_import.rs b/crates/assists/src/handlers/split_import.rs
index ef1f6b8a1..9319a4267 100644
--- a/crates/assists/src/handlers/split_import.rs
+++ b/crates/assists/src/handlers/split_import.rs
@@ -9,7 +9,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Wraps the tail of import into braces.
 //
 // ```
-// use std::<|>collections::HashMap;
+// use std::$0collections::HashMap;
 // ```
 // ->
 // ```
@@ -43,7 +43,7 @@ mod tests {
     fn test_split_import() {
         check_assist(
             split_import,
-            "use crate::<|>db::RootDatabase;",
+            "use crate::$0db::RootDatabase;",
             "use crate::{db::RootDatabase};",
         )
     }
@@ -52,19 +52,19 @@ mod tests {
     fn split_import_works_with_trees() {
         check_assist(
             split_import,
-            "use crate:<|>:db::{RootDatabase, FileSymbol}",
+            "use crate:$0:db::{RootDatabase, FileSymbol}",
             "use crate::{db::{RootDatabase, FileSymbol}}",
         )
     }
 
     #[test]
     fn split_import_target() {
-        check_assist_target(split_import, "use crate::<|>db::{RootDatabase, FileSymbol}", "::");
+        check_assist_target(split_import, "use crate::$0db::{RootDatabase, FileSymbol}", "::");
     }
 
     #[test]
     fn issue4044() {
-        check_assist_not_applicable(split_import, "use crate::<|>:::self;")
+        check_assist_not_applicable(split_import, "use crate::$0:::self;")
     }
 
     #[test]
@@ -72,7 +72,7 @@ mod tests {
         check_assist_not_applicable(
             split_import,
             r"
-use std::<|>
+use std::$0
 fn main() {}",
         );
     }
diff --git a/crates/assists/src/handlers/toggle_ignore.rs b/crates/assists/src/handlers/toggle_ignore.rs
index 14b420421..33e12a7d0 100644
--- a/crates/assists/src/handlers/toggle_ignore.rs
+++ b/crates/assists/src/handlers/toggle_ignore.rs
@@ -10,7 +10,7 @@ use crate::{utils::test_related_attribute, AssistContext, AssistId, AssistKind,
 // Adds `#[ignore]` attribute to the test.
 //
 // ```
-// <|>#[test]
+// $0#[test]
 // fn arithmetics {
 //     assert_eq!(2 + 2, 5);
 // }
@@ -69,7 +69,7 @@ mod tests {
         check_assist(
             toggle_ignore,
             r#"
-            #[test<|>]
+            #[test$0]
             fn test() {}
             "#,
             r#"
@@ -85,7 +85,7 @@ mod tests {
         check_assist(
             toggle_ignore,
             r#"
-            #[test<|>]
+            #[test$0]
             #[ignore]
             fn test() {}
             "#,
diff --git a/crates/assists/src/handlers/unwrap_block.rs b/crates/assists/src/handlers/unwrap_block.rs
index 676db7137..ed6f6177d 100644
--- a/crates/assists/src/handlers/unwrap_block.rs
+++ b/crates/assists/src/handlers/unwrap_block.rs
@@ -14,7 +14,7 @@ use crate::{utils::unwrap_trivial_block, AssistContext, AssistId, AssistKind, As
 //
 // ```
 // fn foo() {
-//     if true {<|>
+//     if true {$0
 //         println!("foo");
 //     }
 // }
@@ -124,7 +124,7 @@ mod tests {
             unwrap_block,
             r#"
 fn main() {
-    <|>{
+    $0{
         92
     }
 }
@@ -143,7 +143,7 @@ fn main() {
             unwrap_block,
             r#"
 fn main() {
-    <|>{
+    $0{
         92;
     }
     ()
@@ -161,7 +161,7 @@ fn main() {
             unwrap_block,
             r#"
 fn main() {
-    <|>{
+    $0{
         92
     }
     ()
@@ -183,7 +183,7 @@ fn main() {
             r#"
 fn main() {
     bar();
-    if true {<|>
+    if true {$0
         foo();
 
         //comment
@@ -217,7 +217,7 @@ fn main() {
 
         //comment
         bar();
-    } else {<|>
+    } else {$0
         println!("bar");
     }
 }
@@ -249,7 +249,7 @@ fn main() {
 
         //comment
         //bar();
-    } else if false {<|>
+    } else if false {$0
         println!("bar");
     } else {
         println!("foo");
@@ -285,7 +285,7 @@ fn main() {
         //bar();
     } else if false {
         println!("bar");
-    } else if true {<|>
+    } else if true {$0
         println!("foo");
     }
 }
@@ -323,7 +323,7 @@ fn main() {
         println!("bar");
     } else if true {
         println!("foo");
-    } else {<|>
+    } else {$0
         println!("else");
     }
 }
@@ -361,7 +361,7 @@ fn main() {
         //bar();
     } else if false {
         println!("bar");
-    } else if true {<|>
+    } else if true {$0
         println!("foo");
     } else {
         println!("else");
@@ -391,7 +391,7 @@ fn main() {
             unwrap_block,
             r#"
 fn main() {
-    bar();<|>
+    bar();$0
     if true {
         foo();
 
@@ -411,7 +411,7 @@ fn main() {
             unwrap_block,
             r#"
 fn main() {
-    for i in 0..5 {<|>
+    for i in 0..5 {$0
         if true {
             foo();
 
@@ -445,7 +445,7 @@ fn main() {
             r#"
 fn main() {
     for i in 0..5 {
-        if true {<|>
+        if true {$0
             foo();
 
             //comment
@@ -475,7 +475,7 @@ fn main() {
             unwrap_block,
             r#"
 fn main() {
-    loop {<|>
+    loop {$0
         if true {
             foo();
 
@@ -508,7 +508,7 @@ fn main() {
             unwrap_block,
             r#"
 fn main() {
-    while true {<|>
+    while true {$0
         if true {
             foo();
 
@@ -542,7 +542,7 @@ fn main() {
             r#"
 fn main() {
     match rel_path {
-        Ok(rel_path) => {<|>
+        Ok(rel_path) => {$0
             let rel_path = RelativePathBuf::from_path(rel_path).ok()?;
             Some((*id, rel_path))
         }
@@ -567,7 +567,7 @@ fn main() {
 fn main() {
     while true {
         if true {
-            foo();<|>
+            foo();$0
 
             //comment
             bar();
diff --git a/crates/assists/src/handlers/wrap_return_type_in_result.rs b/crates/assists/src/handlers/wrap_return_type_in_result.rs
index 59e5debb1..fec16fc49 100644
--- a/crates/assists/src/handlers/wrap_return_type_in_result.rs
+++ b/crates/assists/src/handlers/wrap_return_type_in_result.rs
@@ -13,7 +13,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Wrap the function's return type into Result.
 //
 // ```
-// fn foo() -> i32<|> { 42i32 }
+// fn foo() -> i32$0 { 42i32 }
 // ```
 // ->
 // ```
@@ -98,7 +98,7 @@ impl TailReturnCollector {
         }
 
         // Browse tail expressions for each block
-        if let Some(expr) = block_expr.expr() {
+        if let Some(expr) = block_expr.tail_expr() {
             if let Some(last_exprs) = get_tail_expr_from_block(&expr) {
                 for last_expr in last_exprs {
                     let last_expr = match last_expr {
@@ -170,7 +170,7 @@ impl TailReturnCollector {
     }
 
     fn collect_tail_exprs(&mut self, block: &BlockExpr) {
-        if let Some(expr) = block.expr() {
+        if let Some(expr) = block.tail_expr() {
             self.handle_exprs(&expr, true);
             self.fetch_tail_exprs(&expr);
         }
@@ -206,7 +206,7 @@ fn get_tail_expr_from_block(expr: &Expr) -> Option<Vec<NodeType>> {
         Expr::IfExpr(if_expr) => {
             let mut nodes = vec![];
             for block in if_expr.blocks() {
-                if let Some(block_expr) = block.expr() {
+                if let Some(block_expr) = block.tail_expr() {
                     if let Some(tail_exprs) = get_tail_expr_from_block(&block_expr) {
                         nodes.extend(tail_exprs);
                     }
@@ -228,7 +228,7 @@ fn get_tail_expr_from_block(expr: &Expr) -> Option<Vec<NodeType>> {
             while_expr.syntax().last_child().map(|lc| vec![NodeType::Node(lc)])
         }
         Expr::BlockExpr(block_expr) => {
-            block_expr.expr().map(|lc| vec![NodeType::Node(lc.syntax().clone())])
+            block_expr.tail_expr().map(|lc| vec![NodeType::Node(lc.syntax().clone())])
         }
         Expr::MatchExpr(match_expr) => {
             let arm_list = match_expr.match_arm_list()?;
@@ -282,7 +282,7 @@ mod tests {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i3<|>2 {
+fn foo() -> i3$02 {
     let test = "test";
     return 42i32;
 }
@@ -302,7 +302,7 @@ fn foo() -> Result<i32, ${0:_}> {
             wrap_return_type_in_result,
             r#"
 fn foo() {
-    || -> i32<|> {
+    || -> i32$0 {
         let test = "test";
         return 42i32;
     };
@@ -325,7 +325,7 @@ fn foo() {
             wrap_return_type_in_result,
             r#"
 fn foo() -> i32 {
-    let test = "test";<|>
+    let test = "test";$0
     return 42i32;
 }
 "#,
@@ -339,7 +339,7 @@ fn foo() -> i32 {
             r#"
 fn foo() {
     || -> i32 {
-        let test = "test";<|>
+        let test = "test";$0
         return 42i32;
     };
 }
@@ -349,7 +349,7 @@ fn foo() {
 
     #[test]
     fn wrap_return_type_in_result_closure_non_block() {
-        check_assist_not_applicable(wrap_return_type_in_result, r#"fn foo() { || -> i<|>32 3; }"#);
+        check_assist_not_applicable(wrap_return_type_in_result, r#"fn foo() { || -> i$032 3; }"#);
     }
 
     #[test]
@@ -357,7 +357,7 @@ fn foo() {
         check_assist_not_applicable(
             wrap_return_type_in_result,
             r#"
-fn foo() -> std::result::Result<i32<|>, String> {
+fn foo() -> std::result::Result<i32$0, String> {
     let test = "test";
     return 42i32;
 }
@@ -371,7 +371,7 @@ fn foo() -> std::result::Result<i32<|>, String> {
         check_assist_not_applicable(
             wrap_return_type_in_result,
             r#"
-fn foo() -> Result<i32<|>, String> {
+fn foo() -> Result<i32$0, String> {
     let test = "test";
     return 42i32;
 }
@@ -385,7 +385,7 @@ fn foo() -> Result<i32<|>, String> {
             wrap_return_type_in_result,
             r#"
 fn foo() {
-    || -> Result<i32<|>, String> {
+    || -> Result<i32$0, String> {
         let test = "test";
         return 42i32;
     };
@@ -399,7 +399,7 @@ fn foo() {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> <|>i32 {
+fn foo() -> $0i32 {
     let test = "test";
     return 42i32;
 }
@@ -418,7 +418,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -><|> i32 {
+fn foo() ->$0 i32 {
     let test = "test";
     42i32
 }
@@ -438,7 +438,7 @@ fn foo() -> Result<i32, ${0:_}> {
             wrap_return_type_in_result,
             r#"
 fn foo() {
-    || -><|> i32 {
+    || ->$0 i32 {
         let test = "test";
         42i32
     };
@@ -459,7 +459,7 @@ fn foo() {
     fn wrap_return_type_in_result_simple_with_tail_only() {
         check_assist(
             wrap_return_type_in_result,
-            r#"fn foo() -> i32<|> { 42i32 }"#,
+            r#"fn foo() -> i32$0 { 42i32 }"#,
             r#"fn foo() -> Result<i32, ${0:_}> { Ok(42i32) }"#,
         );
     }
@@ -469,7 +469,7 @@ fn foo() {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     if true {
         42i32
     } else {
@@ -495,7 +495,7 @@ fn foo() -> Result<i32, ${0:_}> {
             wrap_return_type_in_result,
             r#"
 fn foo() {
-    || -> i32<|> {
+    || -> i32$0 {
         if true {
             42i32
         } else {
@@ -523,7 +523,7 @@ fn foo() {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     if true {
         if false {
             1
@@ -556,7 +556,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-async fn foo() -> i<|>32 {
+async fn foo() -> i$032 {
     if true {
         if false {
             1.await
@@ -588,7 +588,7 @@ async fn foo() -> Result<i32, ${0:_}> {
     fn wrap_return_type_in_result_simple_with_array() {
         check_assist(
             wrap_return_type_in_result,
-            r#"fn foo() -> [i32;<|> 3] { [1, 2, 3] }"#,
+            r#"fn foo() -> [i32;$0 3] { [1, 2, 3] }"#,
             r#"fn foo() -> Result<[i32; 3], ${0:_}> { Ok([1, 2, 3]) }"#,
         );
     }
@@ -598,7 +598,7 @@ async fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -<|>> i32 {
+fn foo() -$0> i32 {
     if true {
         if false {
             1 as i32
@@ -631,7 +631,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let my_var = 5;
     match my_var {
         5 => 42i32,
@@ -656,7 +656,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let my_var = 5;
     loop {
         println!("test");
@@ -683,7 +683,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let my_var = let x = loop {
         break 1;
     };
@@ -706,7 +706,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let my_var = 5;
     let res = match my_var {
         5 => 42i32,
@@ -730,7 +730,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let my_var = 5;
     let res = if my_var == 5 {
         42i32
@@ -759,7 +759,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let my_var = 5;
     match my_var {
         5 => {
@@ -808,7 +808,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i<|>32 {
+fn foo() -> i$032 {
     let test = "test";
     if test == "test" {
         return 24i32;
@@ -833,7 +833,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo(the_field: u32) -><|> u32 {
+fn foo(the_field: u32) ->$0 u32 {
     let true_closure = || { return true; };
     if the_field < 5 {
         let mut i = 0;
@@ -865,7 +865,7 @@ fn foo(the_field: u32) -> Result<u32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-            fn foo(the_field: u32) -> u32<|> {
+            fn foo(the_field: u32) -> u32$0 {
                 let true_closure = || {
                     return true;
                 };
@@ -912,7 +912,7 @@ fn foo(the_field: u32) -> Result<u32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let test = "test";
     if test == "test" {
         return 24i32;
@@ -946,7 +946,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i32<|> {
+fn foo() -> i32$0 {
     let test = "test";
     if test == "test" {
         return 24i32;
@@ -984,7 +984,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo() -> i3<|>2 {
+fn foo() -> i3$02 {
     let test = "test";
     let other = 5;
     if test == "test" {
@@ -1030,7 +1030,7 @@ fn foo() -> Result<i32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo(the_field: u32) -> u32<|> {
+fn foo(the_field: u32) -> u32$0 {
     if the_field < 5 {
         let mut i = 0;
         loop {
@@ -1070,7 +1070,7 @@ fn foo(the_field: u32) -> Result<u32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo(the_field: u32) -> u3<|>2 {
+fn foo(the_field: u32) -> u3$02 {
     if the_field < 5 {
         let mut i = 0;
         match i {
@@ -1098,7 +1098,7 @@ fn foo(the_field: u32) -> Result<u32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo(the_field: u32) -> u32<|> {
+fn foo(the_field: u32) -> u32$0 {
     if the_field < 5 {
         let mut i = 0;
         if i == 5 {
@@ -1128,7 +1128,7 @@ fn foo(the_field: u32) -> Result<u32, ${0:_}> {
         check_assist(
             wrap_return_type_in_result,
             r#"
-fn foo(the_field: u32) -> <|>u32 {
+fn foo(the_field: u32) -> $0u32 {
     if the_field < 5 {
         let mut i = 0;
         if i == 5 {
diff --git a/crates/assists/src/lib.rs b/crates/assists/src/lib.rs
index 212464f85..90009c55a 100644
--- a/crates/assists/src/lib.rs
+++ b/crates/assists/src/lib.rs
@@ -24,7 +24,7 @@ use syntax::TextRange;
 
 pub(crate) use crate::assist_context::{AssistContext, Assists};
 
-pub use assist_config::AssistConfig;
+pub use assist_config::{AssistConfig, InsertUseConfig};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AssistKind {
@@ -116,8 +116,6 @@ mod handlers {
     mod convert_integer_literal;
     mod early_return;
     mod expand_glob_import;
-    mod extract_assignment;
-    mod extract_module_to_file;
     mod extract_struct_from_enum_variant;
     mod extract_variable;
     mod fill_match_arms;
@@ -125,13 +123,14 @@ mod handlers {
     mod flip_binexpr;
     mod flip_comma;
     mod flip_trait_bound;
-    mod generate_derive;
     mod generate_default_from_enum_variant;
+    mod generate_derive;
     mod generate_from_impl_for_enum;
     mod generate_function;
     mod generate_impl;
     mod generate_new;
     mod infer_function_return_type;
+    mod inline_function;
     mod inline_local_variable;
     mod introduce_named_lifetime;
     mod invert_if;
@@ -139,6 +138,8 @@ mod handlers {
     mod merge_match_arms;
     mod move_bounds;
     mod move_guard;
+    mod move_module_to_file;
+    mod pull_assignment_up;
     mod qualify_path;
     mod raw_string;
     mod remove_dbg;
@@ -168,8 +169,7 @@ mod handlers {
             convert_integer_literal::convert_integer_literal,
             early_return::convert_to_guarded_return,
             expand_glob_import::expand_glob_import,
-            extract_assignment::extract_assigment,
-            extract_module_to_file::extract_module_to_file,
+            move_module_to_file::move_module_to_file,
             extract_struct_from_enum_variant::extract_struct_from_enum_variant,
             extract_variable::extract_variable,
             fill_match_arms::fill_match_arms,
@@ -177,13 +177,14 @@ mod handlers {
             flip_binexpr::flip_binexpr,
             flip_comma::flip_comma,
             flip_trait_bound::flip_trait_bound,
-            generate_derive::generate_derive,
             generate_default_from_enum_variant::generate_default_from_enum_variant,
+            generate_derive::generate_derive,
             generate_from_impl_for_enum::generate_from_impl_for_enum,
             generate_function::generate_function,
             generate_impl::generate_impl,
             generate_new::generate_new,
             infer_function_return_type::infer_function_return_type,
+            inline_function::inline_function,
             inline_local_variable::inline_local_variable,
             introduce_named_lifetime::introduce_named_lifetime,
             invert_if::invert_if,
@@ -192,6 +193,7 @@ mod handlers {
             move_bounds::move_bounds_to_where_clause,
             move_guard::move_arm_cond_to_match_guard,
             move_guard::move_guard_to_arm_body,
+            pull_assignment_up::pull_assignment_up,
             qualify_path::qualify_path,
             raw_string::add_hash,
             raw_string::make_usual_string,
diff --git a/crates/assists/src/tests.rs b/crates/assists/src/tests.rs
index 21e448fb8..fef29a0b8 100644
--- a/crates/assists/src/tests.rs
+++ b/crates/assists/src/tests.rs
@@ -1,15 +1,29 @@
 mod generated;
 
 use hir::Semantics;
-use ide_db::base_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt};
-use ide_db::source_change::FileSystemEdit;
-use ide_db::RootDatabase;
+use ide_db::{
+    base_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt},
+    helpers::{insert_use::MergeBehavior, SnippetCap},
+    source_change::FileSystemEdit,
+    RootDatabase,
+};
 use syntax::TextRange;
 use test_utils::{assert_eq_text, extract_offset, extract_range};
 
-use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, AssistKind, Assists};
+use crate::{
+    handlers::Handler, Assist, AssistConfig, AssistContext, AssistKind, Assists, InsertUseConfig,
+};
 use stdx::{format_to, trim_indent};
 
+pub(crate) const TEST_CONFIG: AssistConfig = AssistConfig {
+    snippet_cap: SnippetCap::new(true),
+    allowed: None,
+    insert_use: InsertUseConfig {
+        merge: Some(MergeBehavior::Full),
+        prefix_kind: hir::PrefixKind::Plain,
+    },
+};
+
 pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) {
     RootDatabase::with_single_file(text)
 }
@@ -48,14 +62,14 @@ fn check_doc_test(assist_id: &str, before: &str, after: &str) {
     let before = db.file_text(file_id).to_string();
     let frange = FileRange { file_id, range: selection.into() };
 
-    let assist = Assist::get(&db, &AssistConfig::default(), true, frange)
+    let assist = Assist::get(&db, &TEST_CONFIG, true, frange)
         .into_iter()
         .find(|assist| assist.id.0 == assist_id)
         .unwrap_or_else(|| {
             panic!(
                 "\n\nAssist is not applicable: {}\nAvailable assists: {}",
                 assist_id,
-                Assist::get(&db, &AssistConfig::default(), false, frange)
+                Assist::get(&db, &TEST_CONFIG, false, frange)
                     .into_iter()
                     .map(|assist| assist.id.0)
                     .collect::<Vec<_>>()
@@ -89,7 +103,7 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
     let frange = FileRange { file_id: file_with_caret_id, range: range_or_offset.into() };
 
     let sema = Semantics::new(&db);
-    let config = AssistConfig::default();
+    let config = TEST_CONFIG;
     let ctx = AssistContext::new(sema, &config, frange);
     let mut acc = Assists::new(&ctx, true);
     handler(&mut acc, &ctx);
@@ -152,11 +166,11 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
 
 #[test]
 fn assist_order_field_struct() {
-    let before = "struct Foo { <|>bar: u32 }";
+    let before = "struct Foo { $0bar: u32 }";
     let (before_cursor_pos, before) = extract_offset(before);
     let (db, file_id) = with_single_file(&before);
     let frange = FileRange { file_id, range: TextRange::empty(before_cursor_pos) };
-    let assists = Assist::get(&db, &AssistConfig::default(), false, frange);
+    let assists = Assist::get(&db, &TEST_CONFIG, false, frange);
     let mut assists = assists.iter();
 
     assert_eq!(assists.next().expect("expected assist").label, "Change visibility to pub(crate)");
@@ -167,7 +181,7 @@ fn assist_order_field_struct() {
 fn assist_order_if_expr() {
     let before = "
     pub fn test_some_range(a: int) -> bool {
-        if let 2..6 = <|>5<|> {
+        if let 2..6 = $05$0 {
             true
         } else {
             false
@@ -176,7 +190,7 @@ fn assist_order_if_expr() {
     let (range, before) = extract_range(before);
     let (db, file_id) = with_single_file(&before);
     let frange = FileRange { file_id, range };
-    let assists = Assist::get(&db, &AssistConfig::default(), false, frange);
+    let assists = Assist::get(&db, &TEST_CONFIG, false, frange);
     let mut assists = assists.iter();
 
     assert_eq!(assists.next().expect("expected assist").label, "Extract into variable");
@@ -187,7 +201,7 @@ fn assist_order_if_expr() {
 fn assist_filter_works() {
     let before = "
     pub fn test_some_range(a: int) -> bool {
-        if let 2..6 = <|>5<|> {
+        if let 2..6 = $05$0 {
             true
         } else {
             false
@@ -198,7 +212,7 @@ fn assist_filter_works() {
     let frange = FileRange { file_id, range };
 
     {
-        let mut cfg = AssistConfig::default();
+        let mut cfg = TEST_CONFIG;
         cfg.allowed = Some(vec![AssistKind::Refactor]);
 
         let assists = Assist::get(&db, &cfg, false, frange);
@@ -209,7 +223,7 @@ fn assist_filter_works() {
     }
 
     {
-        let mut cfg = AssistConfig::default();
+        let mut cfg = TEST_CONFIG;
         cfg.allowed = Some(vec![AssistKind::RefactorExtract]);
         let assists = Assist::get(&db, &cfg, false, frange);
         assert_eq!(assists.len(), 1);
@@ -219,7 +233,7 @@ fn assist_filter_works() {
     }
 
     {
-        let mut cfg = AssistConfig::default();
+        let mut cfg = TEST_CONFIG;
         cfg.allowed = Some(vec![AssistKind::QuickFix]);
         let assists = Assist::get(&db, &cfg, false, frange);
         assert!(assists.is_empty(), "All asserts but quickfixes should be filtered out");
diff --git a/crates/assists/src/tests/generated.rs b/crates/assists/src/tests/generated.rs
index b91a816e8..e28837b53 100644
--- a/crates/assists/src/tests/generated.rs
+++ b/crates/assists/src/tests/generated.rs
@@ -8,7 +8,7 @@ fn doctest_add_explicit_type() {
         "add_explicit_type",
         r#####"
 fn main() {
-    let x<|> = 92;
+    let x$0 = 92;
 }
 "#####,
         r#####"
@@ -25,7 +25,7 @@ fn doctest_add_hash() {
         "add_hash",
         r#####"
 fn main() {
-    r#"Hello,<|> World!"#;
+    r#"Hello,$0 World!"#;
 }
 "#####,
         r#####"
@@ -49,7 +49,7 @@ trait Trait {
 
 impl Trait for () {
     type X = ();
-    fn foo(&self) {}<|>
+    fn foo(&self) {}$0
 
 }
 "#####,
@@ -81,7 +81,7 @@ trait Trait<T> {
     fn bar(&self) {}
 }
 
-impl Trait<u32> for () {<|>
+impl Trait<u32> for () {$0
 
 }
 "#####,
@@ -110,7 +110,7 @@ fn doctest_add_turbo_fish() {
         r#####"
 fn make<T>() -> T { todo!() }
 fn main() {
-    let x = make<|>();
+    let x = make$0();
 }
 "#####,
         r#####"
@@ -128,7 +128,7 @@ fn doctest_apply_demorgan() {
         "apply_demorgan",
         r#####"
 fn main() {
-    if x != 4 ||<|> !y {}
+    if x != 4 ||$0 !y {}
 }
 "#####,
         r#####"
@@ -145,7 +145,7 @@ fn doctest_auto_import() {
         "auto_import",
         r#####"
 fn main() {
-    let map = HashMap<|>::new();
+    let map = HashMap$0::new();
 }
 pub mod std { pub mod collections { pub struct HashMap { } } }
 "#####,
@@ -165,7 +165,7 @@ fn doctest_change_visibility() {
     check_doc_test(
         "change_visibility",
         r#####"
-<|>fn frobnicate() {}
+$0fn frobnicate() {}
 "#####,
         r#####"
 pub(crate) fn frobnicate() {}
@@ -178,7 +178,7 @@ fn doctest_convert_integer_literal() {
     check_doc_test(
         "convert_integer_literal",
         r#####"
-const _: i32 = 10<|>;
+const _: i32 = 10$0;
 "#####,
         r#####"
 const _: i32 = 0b1010;
@@ -192,7 +192,7 @@ fn doctest_convert_to_guarded_return() {
         "convert_to_guarded_return",
         r#####"
 fn main() {
-    <|>if cond {
+    $0if cond {
         foo();
         bar();
     }
@@ -220,7 +220,7 @@ mod foo {
     pub struct Baz;
 }
 
-use foo::*<|>;
+use foo::*$0;
 
 fn qux(bar: Bar, baz: Baz) {}
 "#####,
@@ -238,55 +238,11 @@ fn qux(bar: Bar, baz: Baz) {}
 }
 
 #[test]
-fn doctest_extract_assignment() {
-    check_doc_test(
-        "extract_assignment",
-        r#####"
-fn main() {
-    let mut foo = 6;
-
-    if true {
-        <|>foo = 5;
-    } else {
-        foo = 4;
-    }
-}
-"#####,
-        r#####"
-fn main() {
-    let mut foo = 6;
-
-    foo = if true {
-        5
-    } else {
-        4
-    };
-}
-"#####,
-    )
-}
-
-#[test]
-fn doctest_extract_module_to_file() {
-    check_doc_test(
-        "extract_module_to_file",
-        r#####"
-mod foo {<|>
-    fn t() {}
-}
-"#####,
-        r#####"
-mod foo;
-"#####,
-    )
-}
-
-#[test]
 fn doctest_extract_struct_from_enum_variant() {
     check_doc_test(
         "extract_struct_from_enum_variant",
         r#####"
-enum A { <|>One(u32, u32) }
+enum A { $0One(u32, u32) }
 "#####,
         r#####"
 struct One(pub u32, pub u32);
@@ -302,7 +258,7 @@ fn doctest_extract_variable() {
         "extract_variable",
         r#####"
 fn main() {
-    <|>(1 + 2)<|> * 4;
+    $0(1 + 2)$0 * 4;
 }
 "#####,
         r#####"
@@ -323,7 +279,7 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        <|>
+        $0
     }
 }
 "#####,
@@ -349,7 +305,7 @@ mod m {
     fn frobnicate() {}
 }
 fn main() {
-    m::frobnicate<|>() {}
+    m::frobnicate$0() {}
 }
 "#####,
         r#####"
@@ -369,7 +325,7 @@ fn doctest_flip_binexpr() {
         "flip_binexpr",
         r#####"
 fn main() {
-    let _ = 90 +<|> 2;
+    let _ = 90 +$0 2;
 }
 "#####,
         r#####"
@@ -386,7 +342,7 @@ fn doctest_flip_comma() {
         "flip_comma",
         r#####"
 fn main() {
-    ((1, 2),<|> (3, 4));
+    ((1, 2),$0 (3, 4));
 }
 "#####,
         r#####"
@@ -402,7 +358,7 @@ fn doctest_flip_trait_bound() {
     check_doc_test(
         "flip_trait_bound",
         r#####"
-fn foo<T: Clone +<|> Copy>() { }
+fn foo<T: Clone +$0 Copy>() { }
 "#####,
         r#####"
 fn foo<T: Copy + Clone>() { }
@@ -417,7 +373,7 @@ fn doctest_generate_default_from_enum_variant() {
         r#####"
 enum Version {
  Undefined,
- Minor<|>,
+ Minor$0,
  Major,
 }
 "#####,
@@ -444,7 +400,7 @@ fn doctest_generate_derive() {
         r#####"
 struct Point {
     x: u32,
-    y: u32,<|>
+    y: u32,$0
 }
 "#####,
         r#####"
@@ -462,7 +418,7 @@ fn doctest_generate_from_impl_for_enum() {
     check_doc_test(
         "generate_from_impl_for_enum",
         r#####"
-enum A { <|>One(u32) }
+enum A { $0One(u32) }
 "#####,
         r#####"
 enum A { One(u32) }
@@ -484,7 +440,7 @@ fn doctest_generate_function() {
 struct Baz;
 fn baz() -> Baz { Baz }
 fn foo() {
-    bar<|>("", baz());
+    bar$0("", baz());
 }
 
 "#####,
@@ -509,7 +465,7 @@ fn doctest_generate_impl() {
         "generate_impl",
         r#####"
 struct Ctx<T: Clone> {
-    data: T,<|>
+    data: T,$0
 }
 "#####,
         r#####"
@@ -530,7 +486,7 @@ fn doctest_generate_new() {
         "generate_new",
         r#####"
 struct Ctx<T: Clone> {
-     data: T,<|>
+     data: T,$0
 }
 "#####,
         r#####"
@@ -551,7 +507,7 @@ fn doctest_infer_function_return_type() {
     check_doc_test(
         "infer_function_return_type",
         r#####"
-fn foo() { 4<|>2i32 }
+fn foo() { 4$02i32 }
 "#####,
         r#####"
 fn foo() -> i32 { 42i32 }
@@ -560,12 +516,35 @@ fn foo() -> i32 { 42i32 }
 }
 
 #[test]
+fn doctest_inline_function() {
+    check_doc_test(
+        "inline_function",
+        r#####"
+fn add(a: u32, b: u32) -> u32 { a + b }
+fn main() {
+    let x = add$0(1, 2);
+}
+"#####,
+        r#####"
+fn add(a: u32, b: u32) -> u32 { a + b }
+fn main() {
+    let x = {
+        let a = 1;
+        let b = 2;
+        a + b
+    };
+}
+"#####,
+    )
+}
+
+#[test]
 fn doctest_inline_local_variable() {
     check_doc_test(
         "inline_local_variable",
         r#####"
 fn main() {
-    let x<|> = 1 + 2;
+    let x$0 = 1 + 2;
     x * 4;
 }
 "#####,
@@ -582,7 +561,7 @@ fn doctest_introduce_named_lifetime() {
     check_doc_test(
         "introduce_named_lifetime",
         r#####"
-impl Cursor<'_<|>> {
+impl Cursor<'_$0> {
     fn node(self) -> &SyntaxNode {
         match self {
             Cursor::Replace(node) | Cursor::Before(node) => node,
@@ -608,7 +587,7 @@ fn doctest_invert_if() {
         "invert_if",
         r#####"
 fn main() {
-    if<|> !y { A } else { B }
+    if$0 !y { A } else { B }
 }
 "#####,
         r#####"
@@ -625,7 +604,7 @@ fn doctest_make_raw_string() {
         "make_raw_string",
         r#####"
 fn main() {
-    "Hello,<|> World!";
+    "Hello,$0 World!";
 }
 "#####,
         r#####"
@@ -642,7 +621,7 @@ fn doctest_make_usual_string() {
         "make_usual_string",
         r#####"
 fn main() {
-    r#"Hello,<|> "World!""#;
+    r#"Hello,$0 "World!""#;
 }
 "#####,
         r#####"
@@ -658,7 +637,7 @@ fn doctest_merge_imports() {
     check_doc_test(
         "merge_imports",
         r#####"
-use std::<|>fmt::Formatter;
+use std::$0fmt::Formatter;
 use std::io;
 "#####,
         r#####"
@@ -676,7 +655,7 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        <|>Action::Move(..) => foo(),
+        $0Action::Move(..) => foo(),
         Action::Stop => foo(),
     }
 }
@@ -702,7 +681,7 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        Action::Move { distance } => <|>if distance > 10 { foo() },
+        Action::Move { distance } => $0if distance > 10 { foo() },
         _ => (),
     }
 }
@@ -725,7 +704,7 @@ fn doctest_move_bounds_to_where_clause() {
     check_doc_test(
         "move_bounds_to_where_clause",
         r#####"
-fn apply<T, U, <|>F: FnOnce(T) -> U>(f: F, x: T) -> U {
+fn apply<T, U, $0F: FnOnce(T) -> U>(f: F, x: T) -> U {
     f(x)
 }
 "#####,
@@ -746,7 +725,7 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        Action::Move { distance } <|>if distance > 10 => foo(),
+        Action::Move { distance } $0if distance > 10 => foo(),
         _ => (),
     }
 }
@@ -767,12 +746,56 @@ fn handle(action: Action) {
 }
 
 #[test]
+fn doctest_move_module_to_file() {
+    check_doc_test(
+        "move_module_to_file",
+        r#####"
+mod $0foo {
+    fn t() {}
+}
+"#####,
+        r#####"
+mod foo;
+"#####,
+    )
+}
+
+#[test]
+fn doctest_pull_assignment_up() {
+    check_doc_test(
+        "pull_assignment_up",
+        r#####"
+fn main() {
+    let mut foo = 6;
+
+    if true {
+        $0foo = 5;
+    } else {
+        foo = 4;
+    }
+}
+"#####,
+        r#####"
+fn main() {
+    let mut foo = 6;
+
+    foo = if true {
+        5
+    } else {
+        4
+    };
+}
+"#####,
+    )
+}
+
+#[test]
 fn doctest_qualify_path() {
     check_doc_test(
         "qualify_path",
         r#####"
 fn main() {
-    let map = HashMap<|>::new();
+    let map = HashMap$0::new();
 }
 pub mod std { pub mod collections { pub struct HashMap { } } }
 "#####,
@@ -791,7 +814,7 @@ fn doctest_remove_dbg() {
         "remove_dbg",
         r#####"
 fn main() {
-    <|>dbg!(92);
+    $0dbg!(92);
 }
 "#####,
         r#####"
@@ -808,7 +831,7 @@ fn doctest_remove_hash() {
         "remove_hash",
         r#####"
 fn main() {
-    r#"Hello,<|> World!"#;
+    r#"Hello,$0 World!"#;
 }
 "#####,
         r#####"
@@ -825,7 +848,7 @@ fn doctest_remove_mut() {
         "remove_mut",
         r#####"
 impl Walrus {
-    fn feed(&mut<|> self, amount: u32) {}
+    fn feed(&mut$0 self, amount: u32) {}
 }
 "#####,
         r#####"
@@ -841,7 +864,7 @@ fn doctest_remove_unused_param() {
     check_doc_test(
         "remove_unused_param",
         r#####"
-fn frobnicate(x: i32<|>) {}
+fn frobnicate(x: i32$0) {}
 
 fn main() {
     frobnicate(92);
@@ -863,7 +886,7 @@ fn doctest_reorder_fields() {
         "reorder_fields",
         r#####"
 struct Foo {foo: i32, bar: i32};
-const test: Foo = <|>Foo {bar: 0, foo: 1}
+const test: Foo = $0Foo {bar: 0, foo: 1}
 "#####,
         r#####"
 struct Foo {foo: i32, bar: i32};
@@ -878,7 +901,7 @@ fn doctest_replace_derive_with_manual_impl() {
         "replace_derive_with_manual_impl",
         r#####"
 trait Debug { fn fmt(&self, f: &mut Formatter) -> Result<()>; }
-#[derive(Deb<|>ug, Display)]
+#[derive(Deb$0ug, Display)]
 struct S;
 "#####,
         r#####"
@@ -903,7 +926,7 @@ fn doctest_replace_if_let_with_match() {
 enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
-    <|>if let Action::Move { distance } = action {
+    $0if let Action::Move { distance } = action {
         foo(distance)
     } else {
         bar()
@@ -928,7 +951,7 @@ fn doctest_replace_impl_trait_with_generic() {
     check_doc_test(
         "replace_impl_trait_with_generic",
         r#####"
-fn foo(bar: <|>impl Bar) {}
+fn foo(bar: $0impl Bar) {}
 "#####,
         r#####"
 fn foo<B: Bar>(bar: B) {}
@@ -944,7 +967,7 @@ fn doctest_replace_let_with_if_let() {
 enum Option<T> { Some(T), None }
 
 fn main(action: Action) {
-    <|>let x = compute();
+    $0let x = compute();
 }
 
 fn compute() -> Option<i32> { None }
@@ -970,7 +993,7 @@ fn doctest_replace_match_with_if_let() {
 enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
-    <|>match action {
+    $0match action {
         Action::Move { distance } => foo(distance),
         _ => bar(),
     }
@@ -995,7 +1018,7 @@ fn doctest_replace_qualified_name_with_use() {
     check_doc_test(
         "replace_qualified_name_with_use",
         r#####"
-fn process(map: std::collections::<|>HashMap<String, String>) {}
+fn process(map: std::collections::$0HashMap<String, String>) {}
 "#####,
         r#####"
 use std::collections::HashMap;
@@ -1011,7 +1034,7 @@ fn doctest_replace_string_with_char() {
         "replace_string_with_char",
         r#####"
 fn main() {
-    find("{<|>");
+    find("{$0");
 }
 "#####,
         r#####"
@@ -1030,7 +1053,7 @@ fn doctest_replace_unwrap_with_match() {
 enum Result<T, E> { Ok(T), Err(E) }
 fn main() {
     let x: Result<i32, i32> = Result::Ok(92);
-    let y = x.<|>unwrap();
+    let y = x.$0unwrap();
 }
 "#####,
         r#####"
@@ -1051,7 +1074,7 @@ fn doctest_split_import() {
     check_doc_test(
         "split_import",
         r#####"
-use std::<|>collections::HashMap;
+use std::$0collections::HashMap;
 "#####,
         r#####"
 use std::{collections::HashMap};
@@ -1064,7 +1087,7 @@ fn doctest_toggle_ignore() {
     check_doc_test(
         "toggle_ignore",
         r#####"
-<|>#[test]
+$0#[test]
 fn arithmetics {
     assert_eq!(2 + 2, 5);
 }
@@ -1085,7 +1108,7 @@ fn doctest_unwrap_block() {
         "unwrap_block",
         r#####"
 fn foo() {
-    if true {<|>
+    if true {$0
         println!("foo");
     }
 }
@@ -1103,7 +1126,7 @@ fn doctest_wrap_return_type_in_result() {
     check_doc_test(
         "wrap_return_type_in_result",
         r#####"
-fn foo() -> i32<|> { 42i32 }
+fn foo() -> i32$0 { 42i32 }
 "#####,
         r#####"
 fn foo() -> Result<i32, ${0:_}> { Ok(42i32) }
diff --git a/crates/assists/src/utils.rs b/crates/assists/src/utils.rs
index b05596446..9ea96eb73 100644
--- a/crates/assists/src/utils.rs
+++ b/crates/assists/src/utils.rs
@@ -4,7 +4,7 @@ pub(crate) mod import_assets;
 use std::ops;
 
 use hir::HasSource;
-use ide_db::RootDatabase;
+use ide_db::{helpers::SnippetCap, RootDatabase};
 use itertools::Itertools;
 use syntax::{
     ast::edit::AstNodeEdit,
@@ -16,10 +16,7 @@ use syntax::{
     SyntaxNode, TextSize, T,
 };
 
-use crate::{
-    assist_config::SnippetCap,
-    ast_transform::{self, AstTransform, QualifyPaths, SubstituteTypeParams},
-};
+use crate::ast_transform::{self, AstTransform, QualifyPaths, SubstituteTypeParams};
 
 pub(crate) fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr {
     extract_trivial_expression(&block)
@@ -37,7 +34,7 @@ pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
         non_trivial_children.next().is_some()
     };
 
-    if let Some(expr) = block.expr() {
+    if let Some(expr) = block.tail_expr() {
         if has_anything_else(expr.syntax()) {
             return None;
         }
diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 66e6443cb..98acd61b1 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -61,7 +61,9 @@ use std::{str::FromStr, sync::Arc};
 
 use cfg::CfgOptions;
 use rustc_hash::FxHashMap;
-use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER};
+use test_utils::{
+    extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER, ESCAPED_CURSOR_MARKER,
+};
 use vfs::{file_set::FileSet, VfsPath};
 
 use crate::{
@@ -142,10 +144,14 @@ impl ChangeFixture {
 
         for entry in fixture {
             let text = if entry.text.contains(CURSOR_MARKER) {
-                let (range_or_offset, text) = extract_range_or_offset(&entry.text);
-                assert!(file_position.is_none());
-                file_position = Some((file_id, range_or_offset));
-                text.to_string()
+                if entry.text.contains(ESCAPED_CURSOR_MARKER) {
+                    entry.text.replace(ESCAPED_CURSOR_MARKER, CURSOR_MARKER)
+                } else {
+                    let (range_or_offset, text) = extract_range_or_offset(&entry.text);
+                    assert!(file_position.is_none());
+                    file_position = Some((file_id, range_or_offset));
+                    text.to_string()
+                }
             } else {
                 entry.text.clone()
             };
diff --git a/crates/cfg/Cargo.toml b/crates/cfg/Cargo.toml
index c68e391c1..73247d130 100644
--- a/crates/cfg/Cargo.toml
+++ b/crates/cfg/Cargo.toml
@@ -17,4 +17,4 @@ tt = { path = "../tt", version = "0.0.0" }
 [dev-dependencies]
 mbe = { path = "../mbe" }
 syntax = { path = "../syntax" }
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/completion/Cargo.toml b/crates/completion/Cargo.toml
index 78e93e78e..99a1bdd54 100644
--- a/crates/completion/Cargo.toml
+++ b/crates/completion/Cargo.toml
@@ -28,4 +28,4 @@ test_utils = { path = "../test_utils", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/completion/src/completions/attribute.rs b/crates/completion/src/completions/attribute.rs
index 8695eed39..3a29b5203 100644
--- a/crates/completion/src/completions/attribute.rs
+++ b/crates/completion/src/completions/attribute.rs
@@ -21,20 +21,15 @@ pub(crate) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext)
 
     let attribute = ctx.attribute_under_caret.as_ref()?;
     match (attribute.path(), attribute.token_tree()) {
-        (Some(path), Some(token_tree)) if path.to_string() == "derive" => {
-            complete_derive(acc, ctx, token_tree)
-        }
-        (Some(path), Some(token_tree)) if path.to_string() == "feature" => {
-            complete_lint(acc, ctx, token_tree, FEATURES);
-        }
-        (Some(path), Some(token_tree))
-            if ["allow", "warn", "deny", "forbid"]
-                .iter()
-                .any(|lint_level| lint_level == &path.to_string()) =>
-        {
-            complete_lint(acc, ctx, token_tree.clone(), DEFAULT_LINT_COMPLETIONS);
-            complete_lint(acc, ctx, token_tree, CLIPPY_LINTS);
-        }
+        (Some(path), Some(token_tree)) => match path.to_string().as_str() {
+            "derive" => complete_derive(acc, ctx, token_tree),
+            "feature" => complete_lint(acc, ctx, token_tree, FEATURES),
+            "allow" | "warn" | "deny" | "forbid" => {
+                complete_lint(acc, ctx, token_tree.clone(), DEFAULT_LINT_COMPLETIONS);
+                complete_lint(acc, ctx, token_tree, CLIPPY_LINTS);
+            }
+            _ => {}
+        },
         (_, Some(_token_tree)) => {}
         _ => complete_attribute_start(acc, ctx, attribute),
     }
@@ -54,11 +49,8 @@ fn complete_attribute_start(acc: &mut Completions, ctx: &CompletionContext, attr
             item = item.lookup_by(lookup);
         }
 
-        match (attr_completion.snippet, ctx.config.snippet_cap) {
-            (Some(snippet), Some(cap)) => {
-                item = item.insert_snippet(cap, snippet);
-            }
-            _ => {}
+        if let Some((snippet, cap)) = attr_completion.snippet.zip(ctx.config.snippet_cap) {
+            item = item.insert_snippet(cap, snippet);
         }
 
         if attribute.kind() == ast::AttrKind::Inner || !attr_completion.prefer_inner {
@@ -98,7 +90,7 @@ const ATTRIBUTES: &[AttrCompletion] = &[
     attr(r#"crate_name = """#, Some("crate_name"), Some(r#"crate_name = "${0:crate_name}""#))
         .prefer_inner(),
     attr("deny(…)", Some("deny"), Some("deny(${0:lint})")),
-    attr(r#"deprecated = "…""#, Some("deprecated"), Some(r#"deprecated = "${0:reason}""#)),
+    attr(r#"deprecated"#, Some("deprecated"), Some(r#"deprecated"#)),
     attr("derive(…)", Some("derive"), Some(r#"derive(${0:Debug})"#)),
     attr(
         r#"export_name = "…""#,
@@ -121,7 +113,7 @@ const ATTRIBUTES: &[AttrCompletion] = &[
     ),
     attr("macro_export", None, None),
     attr("macro_use", None, None),
-    attr(r#"must_use = "…""#, Some("must_use"), Some(r#"must_use = "${0:reason}""#)),
+    attr(r#"must_use"#, Some("must_use"), Some(r#"must_use"#)),
     attr("no_link", None, None).prefer_inner(),
     attr("no_implicit_prelude", None, None).prefer_inner(),
     attr("no_main", None, None).prefer_inner(),
@@ -136,11 +128,7 @@ const ATTRIBUTES: &[AttrCompletion] = &[
     attr("recursion_limit = …", Some("recursion_limit"), Some("recursion_limit = ${0:128}"))
         .prefer_inner(),
     attr("repr(…)", Some("repr"), Some("repr(${0:C})")),
-    attr(
-        "should_panic(…)",
-        Some("should_panic"),
-        Some(r#"should_panic(expected = "${0:reason}")"#),
-    ),
+    attr("should_panic", Some("should_panic"), Some(r#"should_panic"#)),
     attr(
         r#"target_feature = "…""#,
         Some("target_feature"),
@@ -417,7 +405,7 @@ mod tests {
     fn empty_derive_completion() {
         check(
             r#"
-#[derive(<|>)]
+#[derive($0)]
 struct Test {}
         "#,
             expect![[r#"
@@ -438,7 +426,7 @@ struct Test {}
     fn no_completion_for_incorrect_derive() {
         check(
             r#"
-#[derive{<|>)]
+#[derive{$0)]
 struct Test {}
 "#,
             expect![[r#""#]],
@@ -449,7 +437,7 @@ struct Test {}
     fn derive_with_input_completion() {
         check(
             r#"
-#[derive(serde::Serialize, PartialEq, <|>)]
+#[derive(serde::Serialize, PartialEq, $0)]
 struct Test {}
 "#,
             expect![[r#"
@@ -468,7 +456,7 @@ struct Test {}
     #[test]
     fn test_attribute_completion() {
         check(
-            r#"#[<|>]"#,
+            r#"#[$0]"#,
             expect![[r#"
                 at allow(…)
                 at automatically_derived
@@ -476,7 +464,7 @@ struct Test {}
                 at cfg(…)
                 at cold
                 at deny(…)
-                at deprecated = "…"
+                at deprecated
                 at derive(…)
                 at export_name = "…"
                 at doc = "…"
@@ -488,7 +476,7 @@ struct Test {}
                 at link_section = "…"
                 at macro_export
                 at macro_use
-                at must_use = "…"
+                at must_use
                 at no_mangle
                 at non_exhaustive
                 at path = "…"
@@ -496,7 +484,7 @@ struct Test {}
                 at proc_macro_attribute
                 at proc_macro_derive(…)
                 at repr(…)
-                at should_panic(…)
+                at should_panic
                 at target_feature = "…"
                 at test
                 at track_caller
@@ -508,13 +496,13 @@ struct Test {}
 
     #[test]
     fn test_attribute_completion_inside_nested_attr() {
-        check(r#"#[cfg(<|>)]"#, expect![[]])
+        check(r#"#[cfg($0)]"#, expect![[]])
     }
 
     #[test]
     fn test_inner_attribute_completion() {
         check(
-            r"#![<|>]",
+            r"#![$0]",
             expect![[r#"
                 at allow(…)
                 at automatically_derived
@@ -523,7 +511,7 @@ struct Test {}
                 at cold
                 at crate_name = ""
                 at deny(…)
-                at deprecated = "…"
+                at deprecated
                 at derive(…)
                 at export_name = "…"
                 at doc = "…"
@@ -537,7 +525,7 @@ struct Test {}
                 at link_section = "…"
                 at macro_export
                 at macro_use
-                at must_use = "…"
+                at must_use
                 at no_link
                 at no_implicit_prelude
                 at no_main
@@ -551,7 +539,7 @@ struct Test {}
                 at proc_macro_derive(…)
                 at recursion_limit = …
                 at repr(…)
-                at should_panic(…)
+                at should_panic
                 at target_feature = "…"
                 at test
                 at track_caller
diff --git a/crates/completion/src/completions/dot.rs b/crates/completion/src/completions/dot.rs
index 551ef1771..2e25c8ba2 100644
--- a/crates/completion/src/completions/dot.rs
+++ b/crates/completion/src/completions/dot.rs
@@ -79,7 +79,7 @@ struct S { foo: u32 }
 impl S {
     fn bar(&self) {}
 }
-fn foo(s: S) { s.<|> }
+fn foo(s: S) { s.$0 }
 "#,
             expect![[r#"
                 fd foo   u32
@@ -94,7 +94,7 @@ fn foo(s: S) { s.<|> }
             r#"
 struct S { the_field: (u32,) }
 impl S {
-    fn foo(self) { self.<|> }
+    fn foo(self) { self.$0 }
 }
 "#,
             expect![[r#"
@@ -110,7 +110,7 @@ impl S {
             r#"
 struct A { the_field: (u32, i32) }
 impl A {
-    fn foo(&self) { self.<|> }
+    fn foo(&self) { self.$0 }
 }
 "#,
             expect![[r#"
@@ -126,7 +126,7 @@ impl A {
         check(
             r#"
 struct A { the_field: u32 }
-fn foo(a: A) { a.<|>() }
+fn foo(a: A) { a.$0() }
 "#,
             expect![[""]],
         );
@@ -144,7 +144,7 @@ mod inner {
         pub(crate) super_field: u32,
     }
 }
-fn foo(a: inner::A) { a.<|> }
+fn foo(a: inner::A) { a.$0 }
 "#,
             expect![[r#"
                 fd pub_field   u32
@@ -162,7 +162,7 @@ mod m {
         pub(crate) fn the_method(&self) {}
     }
 }
-fn foo(a: A) { a.<|> }
+fn foo(a: A) { a.$0 }
 "#,
             expect![[r#"
                 me the_method() pub(crate) fn the_method(&self)
@@ -175,7 +175,7 @@ fn foo(a: A) { a.<|> }
         check(
             r#"
 union U { field: u8, other: u16 }
-fn foo(u: U) { u.<|> }
+fn foo(u: U) { u.$0 }
 "#,
             expect![[r#"
                 fd field u8
@@ -195,7 +195,7 @@ impl A<u32> {
 impl A<i32> {
     fn the_other_method(&self) {}
 }
-fn foo(a: A<u32>) { a.<|> }
+fn foo(a: A<u32>) { a.$0 }
 "#,
             expect![[r#"
                 me the_method() fn the_method(&self)
@@ -210,7 +210,7 @@ fn foo(a: A<u32>) { a.<|> }
 struct A {}
 trait Trait { fn the_method(&self); }
 impl Trait for A {}
-fn foo(a: A) { a.<|> }
+fn foo(a: A) { a.$0 }
 "#,
             expect![[r#"
                 me the_method() fn the_method(&self)
@@ -225,7 +225,7 @@ fn foo(a: A) { a.<|> }
 struct A {}
 trait Trait { fn the_method(&self); }
 impl<T> Trait for T {}
-fn foo(a: &A) { a.<|> }
+fn foo(a: &A) { a.$0 }
 ",
             expect![[r#"
                 me the_method() fn the_method(&self)
@@ -243,7 +243,7 @@ mod m {
 }
 use m::Trait;
 impl Trait for A {}
-fn foo(a: A) { a.<|> }
+fn foo(a: A) { a.$0 }
 ",
             expect![[r#"
                 me the_method() fn the_method(&self)
@@ -260,7 +260,7 @@ impl A {
     fn the_method() {}
 }
 fn foo(a: A) {
-   a.<|>
+   a.$0
 }
 "#,
             expect![[""]],
@@ -273,7 +273,7 @@ fn foo(a: A) {
             r#"
 fn foo() {
    let b = (0, 3.14);
-   b.<|>
+   b.$0
 }
 "#,
             expect![[r#"
@@ -295,7 +295,7 @@ struct T(S);
 impl T {
     fn foo(&self) {
         // FIXME: This doesn't work without the trailing `a` as `0.` is a float
-        self.0.a<|>
+        self.0.a$0
     }
 }
 "#,
@@ -311,7 +311,7 @@ impl T {
             r#"
 struct A { the_field: u32 }
 const X: u32 = {
-    A { the_field: 92 }.<|>
+    A { the_field: 92 }.$0
 };
 "#,
             expect![[r#"
@@ -327,7 +327,7 @@ const X: u32 = {
 macro_rules! m { ($e:expr) => { $e } }
 struct A { the_field: u32 }
 fn foo(a: A) {
-    m!(a.x<|>)
+    m!(a.x$0)
 }
 "#,
             expect![[r#"
@@ -344,7 +344,7 @@ fn foo(a: A) {
 macro_rules! m { ($e:expr) => { $e } }
 struct A { the_field: u32 }
 fn foo(a: A) {
-    m!(a.<|>)
+    m!(a.$0)
 }
 "#,
             expect![[r#"
@@ -360,7 +360,7 @@ fn foo(a: A) {
 macro_rules! m { ($e:expr) => { $e } }
 struct A { the_field: u32 }
 fn foo(a: A) {
-    m!(m!(m!(a.x<|>)))
+    m!(m!(m!(a.x$0)))
 }
 "#,
             expect![[r#"
@@ -386,7 +386,7 @@ macro_rules! dbg {
 }
 struct A { the_field: u32 }
 fn foo(a: A) {
-    dbg!(a.<|>)
+    dbg!(a.$0)
 }
 "#,
             expect![[r#"
@@ -405,7 +405,7 @@ impl<T> HashSet<T> {
 }
 fn foo() {
     let s: HashSet<_>;
-    s.<|>
+    s.$0
 }
 "#,
             expect![[r#"
@@ -421,7 +421,7 @@ fn foo() {
 struct S;
 impl S { fn foo(&self) {} }
 macro_rules! make_s { () => { S }; }
-fn main() { make_s!().f<|>; }
+fn main() { make_s!().f$0; }
 "#,
             expect![[r#"
                 me foo() fn foo(&self)
diff --git a/crates/completion/src/completions/fn_param.rs b/crates/completion/src/completions/fn_param.rs
index e777a53c1..5505c3559 100644
--- a/crates/completion/src/completions/fn_param.rs
+++ b/crates/completion/src/completions/fn_param.rs
@@ -81,7 +81,7 @@ mod tests {
             r#"
 fn foo(file_id: FileId) {}
 fn bar(file_id: FileId) {}
-fn baz(file<|>) {}
+fn baz(file$0) {}
 "#,
             expect![[r#"
                 bn file_id: FileId
@@ -94,7 +94,7 @@ fn baz(file<|>) {}
         check(
             r#"
 fn foo(file_id: FileId) {}
-fn baz(file<|>, x: i32) {}
+fn baz(file$0, x: i32) {}
 "#,
             expect![[r#"
                 bn file_id: FileId
@@ -110,7 +110,7 @@ pub(crate) trait SourceRoot {
     pub fn contains(&self, file_id: FileId) -> bool;
     pub fn module_map(&self) -> &ModuleMap;
     pub fn lines(&self, file_id: FileId) -> &LineIndex;
-    pub fn syntax(&self, file<|>)
+    pub fn syntax(&self, file$0)
 }
 "#,
             expect![[r#"
@@ -124,7 +124,7 @@ pub(crate) trait SourceRoot {
         check(
             r#"
 fn outer(text: String) {
-    fn inner(<|>)
+    fn inner($0)
 }
 "#,
             expect![[r#"
diff --git a/crates/completion/src/completions/keyword.rs b/crates/completion/src/completions/keyword.rs
index 1859dec70..425a688ff 100644
--- a/crates/completion/src/completions/keyword.rs
+++ b/crates/completion/src/completions/keyword.rs
@@ -193,7 +193,7 @@ mod tests {
     #[test]
     fn test_keywords_in_use_stmt() {
         check(
-            r"use <|>",
+            r"use $0",
             expect![[r#"
                 kw crate::
                 kw self
@@ -202,7 +202,7 @@ mod tests {
         );
 
         check(
-            r"use a::<|>",
+            r"use a::$0",
             expect![[r#"
                 kw self
                 kw super::
@@ -210,7 +210,7 @@ mod tests {
         );
 
         check(
-            r"use a::{b, <|>}",
+            r"use a::{b, $0}",
             expect![[r#"
                 kw self
                 kw super::
@@ -221,7 +221,7 @@ mod tests {
     #[test]
     fn test_keywords_at_source_file_level() {
         check(
-            r"m<|>",
+            r"m$0",
             expect![[r#"
                 kw fn
                 kw use
@@ -245,7 +245,7 @@ mod tests {
     #[test]
     fn test_keywords_in_function() {
         check(
-            r"fn quux() { <|> }",
+            r"fn quux() { $0 }",
             expect![[r#"
                 kw fn
                 kw use
@@ -271,7 +271,7 @@ mod tests {
     #[test]
     fn test_keywords_inside_block() {
         check(
-            r"fn quux() { if true { <|> } }",
+            r"fn quux() { if true { $0 } }",
             expect![[r#"
                 kw fn
                 kw use
@@ -297,7 +297,7 @@ mod tests {
     #[test]
     fn test_keywords_after_if() {
         check(
-            r#"fn quux() { if true { () } <|> }"#,
+            r#"fn quux() { if true { () } $0 }"#,
             expect![[r#"
                 kw fn
                 kw use
@@ -322,7 +322,7 @@ mod tests {
         );
         check_edit(
             "else",
-            r#"fn quux() { if true { () } <|> }"#,
+            r#"fn quux() { if true { () } $0 }"#,
             r#"fn quux() { if true { () } else {$0} }"#,
         );
     }
@@ -332,7 +332,7 @@ mod tests {
         check(
             r#"
 fn quux() -> i32 {
-    match () { () => <|> }
+    match () { () => $0 }
 }
 "#,
             expect![[r#"
@@ -350,7 +350,7 @@ fn quux() -> i32 {
     #[test]
     fn test_keywords_in_trait_def() {
         check(
-            r"trait My { <|> }",
+            r"trait My { $0 }",
             expect![[r#"
                 kw fn
                 kw const
@@ -363,7 +363,7 @@ fn quux() -> i32 {
     #[test]
     fn test_keywords_in_impl_def() {
         check(
-            r"impl My { <|> }",
+            r"impl My { $0 }",
             expect![[r#"
                 kw fn
                 kw const
@@ -378,7 +378,7 @@ fn quux() -> i32 {
     #[test]
     fn test_keywords_in_loop() {
         check(
-            r"fn my() { loop { <|> } }",
+            r"fn my() { loop { $0 } }",
             expect![[r#"
                 kw fn
                 kw use
@@ -406,7 +406,7 @@ fn quux() -> i32 {
     #[test]
     fn test_keywords_after_unsafe_in_item_list() {
         check(
-            r"unsafe <|>",
+            r"unsafe $0",
             expect![[r#"
                 kw fn
                 kw trait
@@ -418,7 +418,7 @@ fn quux() -> i32 {
     #[test]
     fn test_keywords_after_unsafe_in_block_expr() {
         check(
-            r"fn my_fn() { unsafe <|> }",
+            r"fn my_fn() { unsafe $0 }",
             expect![[r#"
                 kw fn
                 kw trait
@@ -430,19 +430,19 @@ fn quux() -> i32 {
     #[test]
     fn test_mut_in_ref_and_in_fn_parameters_list() {
         check(
-            r"fn my_fn(&<|>) {}",
+            r"fn my_fn(&$0) {}",
             expect![[r#"
                 kw mut
             "#]],
         );
         check(
-            r"fn my_fn(<|>) {}",
+            r"fn my_fn($0) {}",
             expect![[r#"
                 kw mut
             "#]],
         );
         check(
-            r"fn my_fn() { let &<|> }",
+            r"fn my_fn() { let &$0 }",
             expect![[r#"
                 kw mut
             "#]],
@@ -452,13 +452,13 @@ fn quux() -> i32 {
     #[test]
     fn test_where_keyword() {
         check(
-            r"trait A <|>",
+            r"trait A $0",
             expect![[r#"
                 kw where
             "#]],
         );
         check(
-            r"impl A <|>",
+            r"impl A $0",
             expect![[r#"
                 kw where
             "#]],
@@ -471,7 +471,7 @@ fn quux() -> i32 {
         check(
             r#"
 fn test() {
-    let x = 2; // A comment<|>
+    let x = 2; // A comment$0
 }
 "#,
             expect![[""]],
@@ -479,7 +479,7 @@ fn test() {
         check(
             r#"
 /*
-Some multi-line comment<|>
+Some multi-line comment$0
 */
 "#,
             expect![[""]],
@@ -487,7 +487,7 @@ Some multi-line comment<|>
         check(
             r#"
 /// Some doc comment
-/// let test<|> = 1
+/// let test$0 = 1
 "#,
             expect![[""]],
         );
@@ -501,7 +501,7 @@ Some multi-line comment<|>
 use std::future::*;
 struct A {}
 impl Future for A {}
-fn foo(a: A) { a.<|> }
+fn foo(a: A) { a.$0 }
 
 //- /std/lib.rs crate:std
 pub mod future {
@@ -520,7 +520,7 @@ pub mod future {
 use std::future::*;
 fn foo() {
     let a = async {};
-    a.<|>
+    a.$0
 }
 
 //- /std/lib.rs crate:std
@@ -540,7 +540,7 @@ pub mod future {
     #[test]
     fn after_let() {
         check(
-            r#"fn main() { let _ = <|> }"#,
+            r#"fn main() { let _ = $0 }"#,
             expect![[r#"
                 kw match
                 kw while
@@ -557,7 +557,7 @@ pub mod future {
         check(
             r#"
 struct Foo {
-    <|>
+    $0
     pub f: i32,
 }
 "#,
@@ -578,7 +578,7 @@ struct Foo {
 }
 fn foo() {
     Foo {
-        <|>
+        $0
     }
 }
 "#,
@@ -595,7 +595,7 @@ struct Foo {
 }
 fn foo() {
     Foo {
-        f: <|>
+        f: $0
     }
 }
 "#,
diff --git a/crates/completion/src/completions/macro_in_item_position.rs b/crates/completion/src/completions/macro_in_item_position.rs
index 82884a181..2be299ac2 100644
--- a/crates/completion/src/completions/macro_in_item_position.rs
+++ b/crates/completion/src/completions/macro_in_item_position.rs
@@ -31,7 +31,7 @@ mod tests {
 macro_rules! foo { () => {} }
 fn foo() {}
 
-<|>
+$0
 "#,
             expect![[r#"
                 ma foo!(…) macro_rules! foo
diff --git a/crates/completion/src/completions/mod_.rs b/crates/completion/src/completions/mod_.rs
index f77864b77..00e951ca9 100644
--- a/crates/completion/src/completions/mod_.rs
+++ b/crates/completion/src/completions/mod_.rs
@@ -1,5 +1,7 @@
 //! Completes mod declarations.
 
+use std::iter;
+
 use hir::{Module, ModuleSource};
 use ide_db::base_db::{SourceDatabaseExt, VfsPath};
 use ide_db::RootDatabase;
@@ -9,12 +11,11 @@ use crate::{CompletionItem, CompletionItemKind};
 
 use crate::{context::CompletionContext, item::CompletionKind, Completions};
 
-/// Complete mod declaration, i.e. `mod <|> ;`
+/// Complete mod declaration, i.e. `mod $0 ;`
 pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
     let mod_under_caret = match &ctx.mod_declaration_under_caret {
-        Some(mod_under_caret) if mod_under_caret.item_list().is_some() => return None,
-        Some(mod_under_caret) => mod_under_caret,
-        None => return None,
+        Some(mod_under_caret) if mod_under_caret.item_list().is_none() => mod_under_caret,
+        _ => return None,
     };
 
     let _p = profile::span("completion::complete_mod");
@@ -49,9 +50,13 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
         .filter_map(|submodule_file| {
             let submodule_path = source_root.path_for_file(&submodule_file)?;
             let directory_with_submodule = submodule_path.parent()?;
-            match submodule_path.name_and_extension()? {
-                ("lib", Some("rs")) | ("main", Some("rs")) => None,
-                ("mod", Some("rs")) => {
+            let (name, ext) = submodule_path.name_and_extension()?;
+            if ext != Some("rs") {
+                return None;
+            }
+            match name {
+                "lib" | "main" => None,
+                "mod" => {
                     if directory_with_submodule.parent()? == directory_to_look_for_submodules {
                         match directory_with_submodule.name_and_extension()? {
                             (directory_name, None) => Some(directory_name.to_owned()),
@@ -61,9 +66,7 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
                         None
                     }
                 }
-                (file_name, Some("rs"))
-                    if directory_with_submodule == directory_to_look_for_submodules =>
-                {
+                file_name if directory_with_submodule == directory_to_look_for_submodules => {
                     Some(file_name.to_owned())
                 }
                 _ => None,
@@ -73,7 +76,7 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
         .for_each(|submodule_name| {
             let mut label = submodule_name;
             if mod_under_caret.semicolon_token().is_none() {
-                label.push(';')
+                label.push(';');
             }
             CompletionItem::new(CompletionKind::Magic, ctx.source_range(), &label)
                 .kind(CompletionItemKind::Module)
@@ -89,11 +92,13 @@ fn directory_to_look_for_submodules(
     module_file_path: &VfsPath,
 ) -> Option<VfsPath> {
     let directory_with_module_path = module_file_path.parent()?;
-    let base_directory = match module_file_path.name_and_extension()? {
-        ("mod", Some("rs")) | ("lib", Some("rs")) | ("main", Some("rs")) => {
-            Some(directory_with_module_path)
-        }
-        (regular_rust_file_name, Some("rs")) => {
+    let (name, ext) = module_file_path.name_and_extension()?;
+    if ext != Some("rs") {
+        return None;
+    }
+    let base_directory = match name {
+        "mod" | "lib" | "main" => Some(directory_with_module_path),
+        regular_rust_file_name => {
             if matches!(
                 (
                     directory_with_module_path
@@ -110,37 +115,25 @@ fn directory_to_look_for_submodules(
                 directory_with_module_path.join(regular_rust_file_name)
             }
         }
-        _ => None,
     }?;
 
-    let mut resulting_path = base_directory;
-    for module in module_chain_to_containing_module_file(module, db) {
-        if let Some(name) = module.name(db) {
-            resulting_path = resulting_path.join(&name.to_string())?;
-        }
-    }
-
-    Some(resulting_path)
+    module_chain_to_containing_module_file(module, db)
+        .into_iter()
+        .filter_map(|module| module.name(db))
+        .try_fold(base_directory, |path, name| path.join(&name.to_string()))
 }
 
 fn module_chain_to_containing_module_file(
     current_module: Module,
     db: &RootDatabase,
 ) -> Vec<Module> {
-    let mut path = Vec::new();
-
-    let mut current_module = Some(current_module);
-    while let Some(ModuleSource::Module(_)) =
-        current_module.map(|module| module.definition_source(db).value)
-    {
-        if let Some(module) = current_module {
-            path.insert(0, module);
-            current_module = module.parent(db);
-        } else {
-            current_module = None;
-        }
-    }
-
+    let mut path =
+        iter::successors(Some(current_module), |current_module| current_module.parent(db))
+            .take_while(|current_module| {
+                matches!(current_module.definition_source(db).value, ModuleSource::Module(_))
+            })
+            .collect::<Vec<_>>();
+    path.reverse();
     path
 }
 
@@ -159,7 +152,7 @@ mod tests {
         check(
             r#"
             //- /lib.rs
-            mod <|>
+            mod $0
             //- /foo.rs
             fn foo() {}
             //- /foo/ignored_foo.rs
@@ -181,7 +174,7 @@ mod tests {
         check(
             r#"
             //- /lib.rs
-            mod <|> {
+            mod $0 {
 
             }
             //- /foo.rs
@@ -196,7 +189,7 @@ mod tests {
         check(
             r#"
             //- /main.rs
-            mod <|>
+            mod $0
             //- /foo.rs
             fn foo() {}
             //- /foo/ignored_foo.rs
@@ -219,7 +212,7 @@ mod tests {
             r#"
             //- /main.rs
             mod tests {
-                mod <|>;
+                mod $0;
             }
             //- /tests/foo.rs
             fn foo() {}
@@ -237,7 +230,7 @@ mod tests {
             //- /lib.rs
             mod foo;
             //- /foo.rs
-            mod <|>;
+            mod $0;
             //- /foo/bar.rs
             fn bar() {}
             //- /foo/bar/ignored_bar.rs
@@ -262,7 +255,7 @@ mod tests {
             mod foo;
             //- /foo.rs
             mod bar {
-                mod <|>
+                mod $0
             }
             //- /foo/bar/baz.rs
             fn baz() {}
@@ -288,7 +281,7 @@ mod tests {
     //         //- /src/bin.rs
     //         fn main() {}
     //         //- /src/bin/foo.rs
-    //         mod <|>
+    //         mod $0
     //         //- /src/bin/bar.rs
     //         fn bar() {}
     //         //- /src/bin/bar/bar_ignored.rs
@@ -307,7 +300,7 @@ mod tests {
             //- /src/bin.rs crate:main
             fn main() {}
             //- /src/bin/foo.rs
-            mod <|>
+            mod $0
             //- /src/bin/bar.rs
             mod foo;
             fn bar() {}
diff --git a/crates/completion/src/completions/pattern.rs b/crates/completion/src/completions/pattern.rs
index eee31098d..595160ff5 100644
--- a/crates/completion/src/completions/pattern.rs
+++ b/crates/completion/src/completions/pattern.rs
@@ -71,7 +71,7 @@ static FOO: E = E::X;
 struct Bar { f: u32 }
 
 fn foo() {
-   match E::X { <|> }
+   match E::X { $0 }
 }
 "#,
             expect![[r#"
@@ -92,7 +92,7 @@ macro_rules! m { ($e:expr) => { $e } }
 enum E { X }
 
 fn foo() {
-   m!(match E::X { <|> })
+   m!(match E::X { $0 })
 }
 "#,
             expect![[r#"
@@ -115,7 +115,7 @@ static FOO: E = E::X;
 struct Bar { f: u32 }
 
 fn foo() {
-   let <|>
+   let $0
 }
 "#,
             expect![[r#"
@@ -133,7 +133,7 @@ enum E { X }
 static FOO: E = E::X;
 struct Bar { f: u32 }
 
-fn foo(<|>) {
+fn foo($0) {
 }
 "#,
             expect![[r#"
@@ -149,7 +149,7 @@ fn foo(<|>) {
 struct Bar { f: u32 }
 
 fn foo() {
-   let <|>
+   let $0
 }
 "#,
             expect![[r#"
@@ -165,7 +165,7 @@ fn foo() {
 struct Foo { bar: String, baz: String }
 struct Bar(String, String);
 struct Baz;
-fn outer(<|>) {}
+fn outer($0) {}
 "#,
             expect![[r#"
                 bn Foo Foo { bar$1, baz$2 }: Foo$0
@@ -182,7 +182,7 @@ struct Foo { bar: String, baz: String }
 struct Bar(String, String);
 struct Baz;
 fn outer() {
-    let <|>
+    let $0
 }
 "#,
             expect![[r#"
@@ -201,7 +201,7 @@ struct Bar(String, String);
 struct Baz;
 fn outer() {
     match () {
-        <|>
+        $0
     }
 }
 "#,
@@ -225,7 +225,7 @@ use foo::*;
 
 fn outer() {
     match () {
-        <|>
+        $0
     }
 }
 "#,
@@ -244,7 +244,7 @@ fn outer() {
 struct Foo(i32);
 fn main() {
     match Foo(92) {
-        <|>(92) => (),
+        $0(92) => (),
     }
 }
 "#,
diff --git a/crates/completion/src/completions/postfix.rs b/crates/completion/src/completions/postfix.rs
index 3883d6d21..87f0c0b2a 100644
--- a/crates/completion/src/completions/postfix.rs
+++ b/crates/completion/src/completions/postfix.rs
@@ -1,8 +1,8 @@
-//! Postfix completions, like `Ok(10).ifl<|>` => `if let Ok() = Ok(10) { <|> }`.
+//! Postfix completions, like `Ok(10).ifl$0` => `if let Ok() = Ok(10) { $0 }`.
 
 mod format_like;
 
-use ide_db::ty_filter::TryEnum;
+use ide_db::{helpers::SnippetCap, ty_filter::TryEnum};
 use syntax::{
     ast::{self, AstNode, AstToken},
     SyntaxKind::{BLOCK_EXPR, EXPR_STMT},
@@ -10,9 +10,8 @@ use syntax::{
 };
 use text_edit::TextEdit;
 
-use self::format_like::add_format_like_completions;
 use crate::{
-    config::SnippetCap,
+    completions::postfix::format_like::add_format_like_completions,
     context::CompletionContext,
     item::{Builder, CompletionKind},
     CompletionItem, CompletionItemKind, Completions,
@@ -311,7 +310,7 @@ mod tests {
             r#"
 fn main() {
     let bar = true;
-    bar.<|>
+    bar.$0
 }
 "#,
             expect![[r#"
@@ -343,7 +342,7 @@ fn foo(elt: bool) -> bool {
 
 fn main() {
     let bar = true;
-    foo(bar.<|>)
+    foo(bar.$0)
 }
 "#,
             expect![[r#"
@@ -369,7 +368,7 @@ fn main() {
             r#"
 fn main() {
     let bar: u8 = 12;
-    bar.<|>
+    bar.$0
 }
 "#,
             expect![[r#"
@@ -393,7 +392,7 @@ fn main() {
         check(
             r#"
 fn main() {
-    baz.l<|>
+    baz.l$0
     res
 }
 "#,
@@ -425,7 +424,7 @@ enum Option<T> { Some(T), None }
 
 fn main() {
     let bar = Option::Some(true);
-    bar.<|>
+    bar.$0
 }
 "#,
             r#"
@@ -450,7 +449,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 
 fn main() {
     let bar = Result::Ok(true);
-    bar.<|>
+    bar.$0
 }
 "#,
             r#"
@@ -469,7 +468,7 @@ fn main() {
 
     #[test]
     fn postfix_completion_works_for_ambiguous_float_literal() {
-        check_edit("refm", r#"fn main() { 42.<|> }"#, r#"fn main() { &mut 42 }"#)
+        check_edit("refm", r#"fn main() { 42.$0 }"#, r#"fn main() { &mut 42 }"#)
     }
 
     #[test]
@@ -480,7 +479,7 @@ fn main() {
 macro_rules! m { ($e:expr) => { $e } }
 fn main() {
     let bar: u8 = 12;
-    m!(bar.d<|>)
+    m!(bar.d$0)
 }
 "#,
             r#"
@@ -495,55 +494,47 @@ fn main() {
 
     #[test]
     fn postfix_completion_for_references() {
-        check_edit("dbg", r#"fn main() { &&42.<|> }"#, r#"fn main() { dbg!(&&42) }"#);
-        check_edit("refm", r#"fn main() { &&42.<|> }"#, r#"fn main() { &&&mut 42 }"#);
+        check_edit("dbg", r#"fn main() { &&42.$0 }"#, r#"fn main() { dbg!(&&42) }"#);
+        check_edit("refm", r#"fn main() { &&42.$0 }"#, r#"fn main() { &&&mut 42 }"#);
     }
 
     #[test]
     fn postfix_completion_for_format_like_strings() {
         check_edit(
             "format",
-            r#"fn main() { "{some_var:?}".<|> }"#,
+            r#"fn main() { "{some_var:?}".$0 }"#,
             r#"fn main() { format!("{:?}", some_var) }"#,
         );
         check_edit(
             "panic",
-            r#"fn main() { "Panic with {a}".<|> }"#,
+            r#"fn main() { "Panic with {a}".$0 }"#,
             r#"fn main() { panic!("Panic with {}", a) }"#,
         );
         check_edit(
             "println",
-            r#"fn main() { "{ 2+2 } { SomeStruct { val: 1, other: 32 } :?}".<|> }"#,
+            r#"fn main() { "{ 2+2 } { SomeStruct { val: 1, other: 32 } :?}".$0 }"#,
             r#"fn main() { println!("{} {:?}", 2+2, SomeStruct { val: 1, other: 32 }) }"#,
         );
         check_edit(
             "loge",
-            r#"fn main() { "{2+2}".<|> }"#,
+            r#"fn main() { "{2+2}".$0 }"#,
             r#"fn main() { log::error!("{}", 2+2) }"#,
         );
         check_edit(
             "logt",
-            r#"fn main() { "{2+2}".<|> }"#,
+            r#"fn main() { "{2+2}".$0 }"#,
             r#"fn main() { log::trace!("{}", 2+2) }"#,
         );
         check_edit(
             "logd",
-            r#"fn main() { "{2+2}".<|> }"#,
+            r#"fn main() { "{2+2}".$0 }"#,
             r#"fn main() { log::debug!("{}", 2+2) }"#,
         );
-        check_edit(
-            "logi",
-            r#"fn main() { "{2+2}".<|> }"#,
-            r#"fn main() { log::info!("{}", 2+2) }"#,
-        );
-        check_edit(
-            "logw",
-            r#"fn main() { "{2+2}".<|> }"#,
-            r#"fn main() { log::warn!("{}", 2+2) }"#,
-        );
+        check_edit("logi", r#"fn main() { "{2+2}".$0 }"#, r#"fn main() { log::info!("{}", 2+2) }"#);
+        check_edit("logw", r#"fn main() { "{2+2}".$0 }"#, r#"fn main() { log::warn!("{}", 2+2) }"#);
         check_edit(
             "loge",
-            r#"fn main() { "{2+2}".<|> }"#,
+            r#"fn main() { "{2+2}".$0 }"#,
             r#"fn main() { log::error!("{}", 2+2) }"#,
         );
     }
diff --git a/crates/completion/src/completions/postfix/format_like.rs b/crates/completion/src/completions/postfix/format_like.rs
index def4b13fb..3afc63021 100644
--- a/crates/completion/src/completions/postfix/format_like.rs
+++ b/crates/completion/src/completions/postfix/format_like.rs
@@ -14,12 +14,11 @@
 //   + `logw` -> `log::warn!(...)`
 //   + `loge` -> `log::error!(...)`
 
-use crate::{
-    completions::postfix::postfix_snippet, config::SnippetCap, context::CompletionContext,
-    Completions,
-};
+use ide_db::helpers::SnippetCap;
 use syntax::ast::{self, AstToken};
 
+use crate::{completions::postfix::postfix_snippet, context::CompletionContext, Completions};
+
 /// Mapping ("postfix completion item" => "macro to use")
 static KINDS: &[(&str, &str)] = &[
     ("format", "format!"),
diff --git a/crates/completion/src/completions/qualified_path.rs b/crates/completion/src/completions/qualified_path.rs
index 882c4dcbc..fa9e6e810 100644
--- a/crates/completion/src/completions/qualified_path.rs
+++ b/crates/completion/src/completions/qualified_path.rs
@@ -1,4 +1,4 @@
-//! Completion of paths, i.e. `some::prefix::<|>`.
+//! Completion of paths, i.e. `some::prefix::$0`.
 
 use hir::{Adt, HasVisibility, PathResolution, ScopeDef};
 use rustc_hash::FxHashSet;
@@ -38,7 +38,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                     if let ScopeDef::Unknown = def {
                         if let Some(name_ref) = ctx.name_ref_syntax.as_ref() {
                             if name_ref.syntax().text() == name.to_string().as_str() {
-                                // for `use self::foo<|>`, don't suggest `foo` as a completion
+                                // for `use self::foo$0`, don't suggest `foo` as a completion
                                 mark::hit!(dont_complete_current_use);
                                 continue;
                             }
@@ -173,7 +173,7 @@ mod tests {
     #[test]
     fn dont_complete_current_use() {
         mark::check!(dont_complete_current_use);
-        check(r#"use self::foo<|>;"#, expect![[""]]);
+        check(r#"use self::foo$0;"#, expect![[""]]);
     }
 
     #[test]
@@ -181,7 +181,7 @@ mod tests {
         check(
             r#"
 mod foo { pub struct S; }
-use self::{foo::*, bar<|>};
+use self::{foo::*, bar$0};
 "#,
             expect![[r#"
                 st S
@@ -192,18 +192,18 @@ use self::{foo::*, bar<|>};
 
     #[test]
     fn dont_complete_primitive_in_use() {
-        check_builtin(r#"use self::<|>;"#, expect![[""]]);
+        check_builtin(r#"use self::$0;"#, expect![[""]]);
     }
 
     #[test]
     fn dont_complete_primitive_in_module_scope() {
-        check_builtin(r#"fn foo() { self::<|> }"#, expect![[""]]);
+        check_builtin(r#"fn foo() { self::$0 }"#, expect![[""]]);
     }
 
     #[test]
     fn completes_primitives() {
         check_builtin(
-            r#"fn main() { let _: <|> = 92; }"#,
+            r#"fn main() { let _: $0 = 92; }"#,
             expect![[r#"
                 bt u32
                 bt bool
@@ -230,7 +230,7 @@ use self::{foo::*, bar<|>};
     fn completes_mod_with_same_name_as_function() {
         check(
             r#"
-use self::my::<|>;
+use self::my::$0;
 
 mod my { pub struct Bar; }
 fn my() {}
@@ -245,7 +245,7 @@ fn my() {}
     fn filters_visibility() {
         check(
             r#"
-use self::my::<|>;
+use self::my::$0;
 
 mod my {
     struct Bar;
@@ -264,7 +264,7 @@ mod my {
     fn completes_use_item_starting_with_self() {
         check(
             r#"
-use self::m::<|>;
+use self::m::$0;
 
 mod m { pub struct Bar; }
 "#,
@@ -282,7 +282,7 @@ mod m { pub struct Bar; }
 mod foo;
 struct Spam;
 //- /foo.rs
-use crate::Sp<|>
+use crate::Sp$0
 "#,
             expect![[r#"
                 md foo
@@ -299,7 +299,7 @@ use crate::Sp<|>
 mod foo;
 struct Spam;
 //- /foo.rs
-use crate::{Sp<|>};
+use crate::{Sp$0};
 "#,
             expect![[r#"
                 md foo
@@ -320,7 +320,7 @@ pub mod bar {
     }
 }
 //- /foo.rs
-use crate::{bar::{baz::Sp<|>}};
+use crate::{bar::{baz::Sp$0}};
 "#,
             expect![[r#"
                 st Spam
@@ -333,7 +333,7 @@ use crate::{bar::{baz::Sp<|>}};
         check(
             r#"
 enum E { Foo, Bar(i32) }
-fn foo() { let _ = E::<|> }
+fn foo() { let _ = E::$0 }
 "#,
             expect![[r#"
                 ev Foo    ()
@@ -356,7 +356,7 @@ impl S {
     type T = i32;
 }
 
-fn foo() { let _ = S::<|> }
+fn foo() { let _ = S::$0 }
 "#,
             expect![[r#"
                 fn a()  fn a()
@@ -384,7 +384,7 @@ mod m {
     }
 }
 
-fn foo() { let _ = S::<|> }
+fn foo() { let _ = S::$0 }
 "#,
             expect![[r#"
                 fn public_method() pub(crate) fn public_method()
@@ -401,7 +401,7 @@ fn foo() { let _ = S::<|> }
 enum E {};
 impl E { fn m() { } }
 
-fn foo() { let _ = E::<|> }
+fn foo() { let _ = E::$0 }
         "#,
             expect![[r#"
                 fn m() fn m()
@@ -416,7 +416,7 @@ fn foo() { let _ = E::<|> }
 union U {};
 impl U { fn m() { } }
 
-fn foo() { let _ = U::<|> }
+fn foo() { let _ = U::$0 }
 "#,
             expect![[r#"
                 fn m() fn m()
@@ -429,7 +429,7 @@ fn foo() { let _ = U::<|> }
         check(
             r#"
 //- /main.rs crate:main deps:foo
-use foo::<|>;
+use foo::$0;
 
 //- /foo/lib.rs crate:foo
 pub mod bar { pub struct S; }
@@ -446,7 +446,7 @@ pub mod bar { pub struct S; }
             r#"
 trait Trait { fn m(); }
 
-fn foo() { let _ = Trait::<|> }
+fn foo() { let _ = Trait::$0 }
 "#,
             expect![[r#"
                 fn m() fn m()
@@ -463,7 +463,7 @@ trait Trait { fn m(); }
 struct S;
 impl Trait for S {}
 
-fn foo() { let _ = S::<|> }
+fn foo() { let _ = S::$0 }
 "#,
             expect![[r#"
                 fn m() fn m()
@@ -480,7 +480,7 @@ trait Trait { fn m(); }
 struct S;
 impl Trait for S {}
 
-fn foo() { let _ = <S as Trait>::<|> }
+fn foo() { let _ = <S as Trait>::$0 }
 "#,
             expect![[r#"
                 fn m() fn m()
@@ -506,7 +506,7 @@ trait Sub: Super {
     fn submethod(&self) {}
 }
 
-fn foo<T: Sub>() { T::<|> }
+fn foo<T: Sub>() { T::$0 }
 "#,
             expect![[r#"
                 ta SubTy        type SubTy;
@@ -544,7 +544,7 @@ impl<T> Super for Wrap<T> {}
 impl<T> Sub for Wrap<T> {
     fn subfunc() {
         // Should be able to assume `Self: Sub + Super`
-        Self::<|>
+        Self::$0
     }
 }
 "#,
@@ -570,7 +570,7 @@ impl S { fn foo() {} }
 type T = S;
 impl T { fn bar() {} }
 
-fn main() { T::<|>; }
+fn main() { T::$0; }
 "#,
             expect![[r#"
                 fn foo() fn foo()
@@ -586,7 +586,7 @@ fn main() { T::<|>; }
 #[macro_export]
 macro_rules! foo { () => {} }
 
-fn main() { let _ = crate::<|> }
+fn main() { let _ = crate::$0 }
         "#,
             expect![[r##"
                 fn main()  fn main()
@@ -604,7 +604,7 @@ mod a {
     const A: usize = 0;
     mod b {
         const B: usize = 0;
-        mod c { use super::super::<|> }
+        mod c { use super::super::$0 }
     }
 }
 "#,
@@ -619,7 +619,7 @@ mod a {
     fn completes_reexported_items_under_correct_name() {
         check(
             r#"
-fn foo() { self::m::<|> }
+fn foo() { self::m::$0 }
 
 mod m {
     pub use super::p::wrong_fn as right_fn;
@@ -642,7 +642,7 @@ mod p {
         check_edit(
             "RightType",
             r#"
-fn foo() { self::m::<|> }
+fn foo() { self::m::$0 }
 
 mod m {
     pub use super::p::wrong_fn as right_fn;
@@ -677,7 +677,7 @@ mod p {
         check(
             r#"
 macro_rules! m { ($e:expr) => { $e } }
-fn main() { m!(self::f<|>); }
+fn main() { m!(self::f$0); }
 fn foo() {}
 "#,
             expect![[r#"
@@ -691,7 +691,7 @@ fn foo() {}
     fn function_mod_share_name() {
         check(
             r#"
-fn foo() { self::m::<|> }
+fn foo() { self::m::$0 }
 
 mod m {
     pub mod z {}
@@ -716,7 +716,7 @@ impl<K, V> HashMap<K, V, RandomState> {
     pub fn new() -> HashMap<K, V, RandomState> { }
 }
 fn foo() {
-    HashMap::<|>
+    HashMap::$0
 }
 "#,
             expect![[r#"
@@ -730,7 +730,7 @@ fn foo() {
         check(
             r#"
 mod foo { pub struct Foo; }
-#[foo::<|>]
+#[foo::$0]
 fn f() {}
 "#,
             expect![[""]],
@@ -749,7 +749,7 @@ fn foo(
 }
 
 fn main() {
-    fo<|>
+    fo$0
 }
 "#,
             expect![[r#"
@@ -770,7 +770,7 @@ enum Foo {
 
 impl Foo {
     fn foo(self) {
-        Self::<|>
+        Self::$0
     }
 }
 "#,
diff --git a/crates/completion/src/completions/record.rs b/crates/completion/src/completions/record.rs
index e58b9a274..bb6354ded 100644
--- a/crates/completion/src/completions/record.rs
+++ b/crates/completion/src/completions/record.rs
@@ -99,7 +99,7 @@ impl core::default::Default for S {
 fn process(f: S) {
     let other = S {
         foo: 5,
-        .<|>
+        .$0
     };
 }
 "#;
@@ -139,7 +139,7 @@ impl core::default::Default for S {
 fn process(f: S) {
     let other = S {
         foo: 5,
-        .<|>
+        .$0
     };
 }
 "#,
@@ -173,7 +173,7 @@ struct S { foo: u32, bar: usize }
 fn process(f: S) {
     let other = S {
         foo: 5,
-        .<|>
+        .$0
     };
 }
 "#;
@@ -201,7 +201,7 @@ struct S { foo: u32 }
 
 fn process(f: S) {
     match f {
-        S { f<|>: 92 } => (),
+        S { f$0: 92 } => (),
     }
 }
 "#,
@@ -219,7 +219,7 @@ enum E { S { foo: u32, bar: () } }
 
 fn process(e: E) {
     match e {
-        E::S { <|> } => (),
+        E::S { $0 } => (),
     }
 }
 "#,
@@ -239,7 +239,7 @@ struct S { foo: u32 }
 
 fn process(f: S) {
     m!(match f {
-        S { f<|>: 92 } => (),
+        S { f$0: 92 } => (),
     })
 }
 ",
@@ -263,7 +263,7 @@ fn main() {
         foo1: 1, foo2: 2,
         bar: 3, baz: 4,
     };
-    if let S { foo1, foo2: a, <|> } = s {}
+    if let S { foo1, foo2: a, $0 } = s {}
 }
 "#,
             expect![[r#"
@@ -279,7 +279,7 @@ fn main() {
             r#"
 struct A { the_field: u32 }
 fn foo() {
-   A { the<|> }
+   A { the$0 }
 }
 "#,
             expect![[r#"
@@ -294,7 +294,7 @@ fn foo() {
             r#"
 enum E { A { a: u32 } }
 fn foo() {
-    let _ = E::A { <|> }
+    let _ = E::A { $0 }
 }
 "#,
             expect![[r#"
@@ -311,7 +311,7 @@ struct A { a: u32 }
 struct B { b: u32 }
 
 fn foo() {
-   let _: A = B { <|> }
+   let _: A = B { $0 }
 }
 "#,
             expect![[r#"
@@ -327,7 +327,7 @@ fn foo() {
 struct A<T> { a: T }
 
 fn foo() {
-   let _: A<u32> = A { <|> }
+   let _: A<u32> = A { $0 }
 }
 "#,
             expect![[r#"
@@ -343,7 +343,7 @@ fn foo() {
 macro_rules! m { ($e:expr) => { $e } }
 struct A { the_field: u32 }
 fn foo() {
-   m!(A { the<|> })
+   m!(A { the$0 })
 }
 "#,
             expect![[r#"
@@ -363,7 +363,7 @@ struct S {
 
 fn main() {
     let foo1 = 1;
-    let s = S { foo1, foo2: 5, <|> }
+    let s = S { foo1, foo2: 5, $0 }
 }
 "#,
             expect![[r#"
@@ -381,7 +381,7 @@ struct S { foo1: u32, foo2: u32 }
 
 fn main() {
     let foo1 = 1;
-    let s = S { foo1, <|> .. loop {} }
+    let s = S { foo1, $0 .. loop {} }
 }
 "#,
             expect![[r#"
diff --git a/crates/completion/src/completions/snippet.rs b/crates/completion/src/completions/snippet.rs
index 842590130..df17a15c5 100644
--- a/crates/completion/src/completions/snippet.rs
+++ b/crates/completion/src/completions/snippet.rs
@@ -1,8 +1,10 @@
 //! This file provides snippet completions, like `pd` => `eprintln!(...)`.
 
+use ide_db::helpers::SnippetCap;
+
 use crate::{
-    config::SnippetCap, item::Builder, CompletionContext, CompletionItem, CompletionItemKind,
-    CompletionKind, Completions,
+    item::Builder, CompletionContext, CompletionItem, CompletionItemKind, CompletionKind,
+    Completions,
 };
 
 fn snippet(ctx: &CompletionContext, cap: SnippetCap, label: &str, snippet: &str) -> Builder {
@@ -81,7 +83,7 @@ mod tests {
     #[test]
     fn completes_snippets_in_expressions() {
         check(
-            r#"fn foo(x: i32) { <|> }"#,
+            r#"fn foo(x: i32) { $0 }"#,
             expect![[r#"
                 sn pd
                 sn ppd
@@ -91,8 +93,8 @@ mod tests {
 
     #[test]
     fn should_not_complete_snippets_in_path() {
-        check(r#"fn foo(x: i32) { ::foo<|> }"#, expect![[""]]);
-        check(r#"fn foo(x: i32) { ::<|> }"#, expect![[""]]);
+        check(r#"fn foo(x: i32) { ::foo$0 }"#, expect![[""]]);
+        check(r#"fn foo(x: i32) { ::$0 }"#, expect![[""]]);
     }
 
     #[test]
@@ -101,7 +103,7 @@ mod tests {
             r#"
 #[cfg(test)]
 mod tests {
-    <|>
+    $0
 }
 "#,
             expect![[r#"
diff --git a/crates/completion/src/completions/trait_impl.rs b/crates/completion/src/completions/trait_impl.rs
index 54bb897e9..aa9c845da 100644
--- a/crates/completion/src/completions/trait_impl.rs
+++ b/crates/completion/src/completions/trait_impl.rs
@@ -15,7 +15,7 @@
 //! }
 //!
 //! impl SomeTrait for () {
-//!     fn f<|>
+//!     fn f$0
 //! }
 //! ```
 //!
@@ -27,7 +27,7 @@
 //! # }
 //!
 //! impl SomeTrait for () {
-//!     fn foo() {}<|>
+//!     fn foo() {}$0
 //! }
 //! ```
 
@@ -82,7 +82,7 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext
 
 fn completion_match(ctx: &CompletionContext) -> Option<(ImplCompletionKind, SyntaxNode, Impl)> {
     let mut token = ctx.token.clone();
-    // For keywork without name like `impl .. { fn <|> }`, the current position is inside
+    // For keywork without name like `impl .. { fn $0 }`, the current position is inside
     // the whitespace token, which is outside `FN` syntax node.
     // We need to follow the previous token in this case.
     if token.kind() == SyntaxKind::WHITESPACE {
@@ -90,20 +90,20 @@ fn completion_match(ctx: &CompletionContext) -> Option<(ImplCompletionKind, Synt
     }
 
     let impl_item_offset = match token.kind() {
-        // `impl .. { const <|> }`
+        // `impl .. { const $0 }`
         // ERROR      0
         //   CONST_KW <- *
         SyntaxKind::CONST_KW => 0,
-        // `impl .. { fn/type <|> }`
+        // `impl .. { fn/type $0 }`
         // FN/TYPE_ALIAS  0
         //   FN_KW        <- *
         SyntaxKind::FN_KW | SyntaxKind::TYPE_KW => 0,
-        // `impl .. { fn/type/const foo<|> }`
+        // `impl .. { fn/type/const foo$0 }`
         // FN/TYPE_ALIAS/CONST  1
         //  NAME                0
         //    IDENT             <- *
         SyntaxKind::IDENT if token.parent().kind() == SyntaxKind::NAME => 1,
-        // `impl .. { foo<|> }`
+        // `impl .. { foo$0 }`
         // MACRO_CALL       3
         //  PATH            2
         //    PATH_SEGMENT  1
@@ -120,7 +120,7 @@ fn completion_match(ctx: &CompletionContext) -> Option<(ImplCompletionKind, Synt
     //     <item>
     let impl_def = ast::Impl::cast(impl_item.parent()?.parent()?)?;
     let kind = match impl_item.kind() {
-        // `impl ... { const <|> fn/type/const }`
+        // `impl ... { const $0 fn/type/const }`
         _ if token.kind() == SyntaxKind::CONST_KW => ImplCompletionKind::Const,
         SyntaxKind::CONST | SyntaxKind::ERROR => ImplCompletionKind::Const,
         SyntaxKind::TYPE_ALIAS => ImplCompletionKind::TypeAlias,
@@ -267,7 +267,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    t<|>
+    t$0
 }
 "#,
             expect![["
@@ -287,7 +287,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        t<|>
+        t$0
     }
 }
 ",
@@ -301,7 +301,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        fn t<|>
+        fn t$0
     }
 }
 ",
@@ -315,7 +315,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        fn <|>
+        fn $0
     }
 }
 ",
@@ -330,7 +330,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        foo.<|>
+        foo.$0
     }
 }
 ",
@@ -343,7 +343,7 @@ trait Test { fn test(_: i32); fn test2(); }
 struct T;
 
 impl Test for T {
-    fn test(t<|>)
+    fn test(t$0)
 }
 ",
             expect![[""]],
@@ -355,7 +355,7 @@ trait Test { fn test(_: fn()); fn test2(); }
 struct T;
 
 impl Test for T {
-    fn test(f: fn <|>)
+    fn test(f: fn $0)
 }
 ",
             expect![[""]],
@@ -370,7 +370,7 @@ trait Test { const TEST: fn(); const TEST2: u32; type Test; fn test(); }
 struct T;
 
 impl Test for T {
-    const TEST: fn <|>
+    const TEST: fn $0
 }
 ",
             expect![[""]],
@@ -382,7 +382,7 @@ trait Test { const TEST: u32; const TEST2: u32; type Test; fn test(); }
 struct T;
 
 impl Test for T {
-    const TEST: T<|>
+    const TEST: T$0
 }
 ",
             expect![[""]],
@@ -394,7 +394,7 @@ trait Test { const TEST: u32; const TEST2: u32; type Test; fn test(); }
 struct T;
 
 impl Test for T {
-    const TEST: u32 = f<|>
+    const TEST: u32 = f$0
 }
 ",
             expect![[""]],
@@ -407,7 +407,7 @@ struct T;
 
 impl Test for T {
     const TEST: u32 = {
-        t<|>
+        t$0
     };
 }
 ",
@@ -421,7 +421,7 @@ struct T;
 
 impl Test for T {
     const TEST: u32 = {
-        fn <|>
+        fn $0
     };
 }
 ",
@@ -435,7 +435,7 @@ struct T;
 
 impl Test for T {
     const TEST: u32 = {
-        fn t<|>
+        fn t$0
     };
 }
 ",
@@ -451,7 +451,7 @@ trait Test { type Test; type Test2; fn test(); }
 struct T;
 
 impl Test for T {
-    type Test = T<|>;
+    type Test = T$0;
 }
 ",
             expect![[""]],
@@ -463,7 +463,7 @@ trait Test { type Test; type Test2; fn test(); }
 struct T;
 
 impl Test for T {
-    type Test = fn <|>;
+    type Test = fn $0;
 }
 ",
             expect![[""]],
@@ -481,7 +481,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    t<|>
+    t$0
 }
 "#,
             r#"
@@ -510,7 +510,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    fn t<|>
+    fn t$0
 }
 "#,
             r#"
@@ -540,7 +540,7 @@ struct T;
 
 impl Test for T {
     fn foo() {}
-    fn f<|>
+    fn f$0
 }
 "#,
             expect![[r#"
@@ -560,7 +560,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    fn f<|>
+    fn f$0
 }
 "#,
             r#"
@@ -585,7 +585,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    fn f<|>
+    fn f$0
 }
 "#,
             r#"
@@ -614,7 +614,7 @@ trait Test {
 }
 
 impl Test for () {
-    type S<|>
+    type S$0
 }
 "#,
             "
@@ -639,7 +639,7 @@ trait Test {
 }
 
 impl Test for () {
-    const S<|>
+    const S$0
 }
 "#,
             "
@@ -661,7 +661,7 @@ trait Test {
 }
 
 impl Test for () {
-    const S<|>
+    const S$0
 }
 "#,
             "
@@ -724,7 +724,7 @@ impl Test for T {{
         // Enumerate some possible next siblings.
         for next_sibling in &[
             "",
-            "fn other_fn() {}", // `const <|> fn` -> `const fn`
+            "fn other_fn() {}", // `const $0 fn` -> `const fn`
             "type OtherType = i32;",
             "const OTHER_CONST: i32 = 0;",
             "async fn other_fn() {}",
@@ -733,9 +733,9 @@ impl Test for T {{
             "default type OtherType = i32;",
             "default const OTHER_CONST: i32 = 0;",
         ] {
-            test("bar", "fn <|>", "fn bar() {\n    $0\n}", next_sibling);
-            test("Foo", "type <|>", "type Foo = ", next_sibling);
-            test("CONST", "const <|>", "const CONST: u16 = ", next_sibling);
+            test("bar", "fn $0", "fn bar() {\n    $0\n}", next_sibling);
+            test("Foo", "type $0", "type Foo = ", next_sibling);
+            test("CONST", "const $0", "const CONST: u16 = ", next_sibling);
         }
     }
 }
diff --git a/crates/completion/src/completions/unqualified_path.rs b/crates/completion/src/completions/unqualified_path.rs
index 81a6d00e2..12cdb869d 100644
--- a/crates/completion/src/completions/unqualified_path.rs
+++ b/crates/completion/src/completions/unqualified_path.rs
@@ -46,7 +46,7 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
         acc.add_resolution(ctx, name.to_string(), &res)
     });
 
-    if ctx.config.enable_autoimport_completions && ctx.config.resolve_additional_edits_lazily() {
+    if ctx.config.enable_autoimport_completions {
         fuzzy_completion(acc, ctx);
     }
 }
@@ -85,7 +85,7 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
 //
 // ```
 // fn main() {
-//     pda<|>
+//     pda$0
 // }
 // # pub mod std { pub mod marker { pub struct PhantomData { } } }
 // ```
@@ -124,8 +124,8 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
 // Note that having this flag set to `true` does not guarantee that the feature is enabled: your client needs to have the corredponding
 // capability enabled.
 fn fuzzy_completion(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
-    let _p = profile::span("fuzzy_completion");
     let potential_import_name = ctx.token.to_string();
+    let _p = profile::span("fuzzy_completion").detail(|| potential_import_name.clone());
 
     if potential_import_name.len() < 2 {
         return None;
@@ -142,6 +142,7 @@ fn fuzzy_completion(acc: &mut Completions, ctx: &CompletionContext) -> Option<()
         Some(40),
         potential_import_name,
         true,
+        true,
     )
     .filter_map(|import_candidate| {
         Some(match import_candidate {
@@ -191,12 +192,14 @@ mod tests {
     use test_utils::mark;
 
     use crate::{
-        test_utils::{check_edit, check_edit_with_config, completion_list_with_config},
+        test_utils::{
+            check_edit, check_edit_with_config, completion_list_with_config, TEST_CONFIG,
+        },
         CompletionConfig, CompletionKind,
     };
 
     fn check(ra_fixture: &str, expect: Expect) {
-        check_with_config(CompletionConfig::default(), ra_fixture, expect);
+        check_with_config(TEST_CONFIG, ra_fixture, expect);
     }
 
     fn check_with_config(config: CompletionConfig, ra_fixture: &str, expect: Expect) {
@@ -204,20 +207,12 @@ mod tests {
         expect.assert_eq(&actual)
     }
 
-    fn fuzzy_completion_config() -> CompletionConfig {
-        let mut completion_config = CompletionConfig::default();
-        completion_config
-            .active_resolve_capabilities
-            .insert(crate::CompletionResolveCapability::AdditionalTextEdits);
-        completion_config
-    }
-
     #[test]
     fn self_fulfilling_completion() {
         mark::check!(self_fulfilling_completion);
         check(
             r#"
-use foo<|>
+use foo$0
 use std::collections;
 "#,
             expect![[r#"
@@ -234,7 +229,7 @@ enum Enum { A, B }
 fn quux(x: Option<Enum>) {
     match x {
         None => (),
-        Some(en<|> @ Enum::A) => (),
+        Some(en$0 @ Enum::A) => (),
     }
 }
 "#,
@@ -250,7 +245,7 @@ enum Enum { A, B }
 fn quux(x: Option<Enum>) {
     match x {
         None => (),
-        Some(ref en<|>) => (),
+        Some(ref en$0) => (),
     }
 }
 "#,
@@ -266,7 +261,7 @@ enum Enum { A, B }
 fn quux(x: Option<Enum>) {
     match x {
         None => (),
-        Some(En<|>) => (),
+        Some(En$0) => (),
     }
 }
 "#,
@@ -282,7 +277,7 @@ fn quux(x: Option<Enum>) {
             r#"
 fn quux(x: i32) {
     let y = 92;
-    1 + <|>;
+    1 + $0;
     let z = ();
 }
 "#,
@@ -304,7 +299,7 @@ fn quux() {
     };
     if let Some(a) = bar() {
         let b = 62;
-        1 + <|>
+        1 + $0
     }
 }
 "#,
@@ -321,7 +316,7 @@ fn quux() {
         check(
             r#"
 fn quux() {
-    for x in &[1, 2, 3] { <|> }
+    for x in &[1, 2, 3] { $0 }
 }
 "#,
             expect![[r#"
@@ -339,7 +334,7 @@ fn quux() {
             r#"
 fn main() {
     let wherewolf = 92;
-    drop(where<|>)
+    drop(where$0)
 }
 "#,
             r#"
@@ -354,7 +349,7 @@ fn main() {
     #[test]
     fn completes_generic_params() {
         check(
-            r#"fn quux<T>() { <|> }"#,
+            r#"fn quux<T>() { $0 }"#,
             expect![[r#"
                 tp T
                 fn quux() fn quux<T>()
@@ -365,7 +360,7 @@ fn main() {
     #[test]
     fn completes_generic_params_in_struct() {
         check(
-            r#"struct S<T> { x: <|>}"#,
+            r#"struct S<T> { x: $0}"#,
             expect![[r#"
                 tp Self
                 tp T
@@ -377,7 +372,7 @@ fn main() {
     #[test]
     fn completes_self_in_enum() {
         check(
-            r#"enum X { Y(<|>) }"#,
+            r#"enum X { Y($0) }"#,
             expect![[r#"
                 tp Self
                 en X
@@ -391,7 +386,7 @@ fn main() {
             r#"
 struct S;
 enum E {}
-fn quux() { <|> }
+fn quux() { $0 }
 "#,
             expect![[r#"
                 st S
@@ -408,7 +403,7 @@ fn quux() { <|> }
             "_alpha",
             r#"
 fn main() {
-    _<|>
+    _$0
 }
 fn _alpha() {}
 "#,
@@ -426,7 +421,7 @@ fn _alpha() {}
         check(
             r#"
 //- /lib.rs crate:main deps:other_crate
-use <|>;
+use $0;
 
 //- /other_crate/lib.rs crate:other_crate
 // nothing here
@@ -444,7 +439,7 @@ use <|>;
 struct Foo;
 mod m {
     struct Bar;
-    fn quux() { <|> }
+    fn quux() { $0 }
 }
 "#,
             expect![[r#"
@@ -459,7 +454,7 @@ mod m {
         check(
             r#"
 struct Foo;
-fn x() -> <|>
+fn x() -> $0
 "#,
             expect![[r#"
                 st Foo
@@ -476,7 +471,7 @@ fn foo() {
     let bar = 92;
     {
         let bar = 62;
-        drop(<|>)
+        drop($0)
     }
 }
 "#,
@@ -492,7 +487,7 @@ fn foo() {
     #[test]
     fn completes_self_in_methods() {
         check(
-            r#"impl S { fn foo(&self) { <|> } }"#,
+            r#"impl S { fn foo(&self) { $0 } }"#,
             expect![[r#"
                 bn self &{unknown}
                 tp Self
@@ -505,7 +500,7 @@ fn foo() {
         check(
             r#"
 //- /main.rs crate:main deps:std
-fn foo() { let x: <|> }
+fn foo() { let x: $0 }
 
 //- /std/lib.rs crate:std
 #[prelude_import]
@@ -526,7 +521,7 @@ mod prelude { struct Option; }
         check(
             r#"
 //- /main.rs crate:main deps:core,std
-fn foo() { let x: <|> }
+fn foo() { let x: $0 }
 
 //- /core/lib.rs crate:core
 #[prelude_import]
@@ -567,7 +562,7 @@ mod m2 {
     macro_rules! baz { () => {} }
 }
 
-fn main() { let v = <|> }
+fn main() { let v = $0 }
 "#,
             expect![[r##"
                 md m1
@@ -586,7 +581,7 @@ fn main() { let v = <|> }
         check(
             r#"
 macro_rules! foo { () => {} }
-fn foo() { <|> }
+fn foo() { $0 }
 "#,
             expect![[r#"
                 fn foo()   fn foo()
@@ -600,7 +595,7 @@ fn foo() { <|> }
         check(
             r#"
 macro_rules! foo { () => {} }
-fn main() { let x: <|> }
+fn main() { let x: $0 }
 "#,
             expect![[r#"
                 fn main()  fn main()
@@ -614,7 +609,7 @@ fn main() { let x: <|> }
         check(
             r#"
 macro_rules! foo { () => {} }
-fn main() { <|> }
+fn main() { $0 }
 "#,
             expect![[r#"
                 fn main()  fn main()
@@ -628,7 +623,7 @@ fn main() { <|> }
         check(
             r#"
 fn main() {
-    return f<|>;
+    return f$0;
     fn frobnicate() {}
 }
 "#,
@@ -646,7 +641,7 @@ fn main() {
 macro_rules! m { ($e:expr) => { $e } }
 fn quux(x: i32) {
     let y = 92;
-    m!(<|>);
+    m!($0);
 }
 "#,
             expect![[r#"
@@ -665,7 +660,7 @@ fn quux(x: i32) {
 macro_rules! m { ($e:expr) => { $e } }
 fn quux(x: i32) {
     let y = 92;
-    m!(x<|>);
+    m!(x$0);
 }
 ",
             expect![[r#"
@@ -684,7 +679,7 @@ fn quux(x: i32) {
 macro_rules! m { ($e:expr) => { $e } }
 fn quux(x: i32) {
     let y = 92;
-    m!(x<|>
+    m!(x$0
 }
 "#,
             expect![[r#"
@@ -702,7 +697,7 @@ fn quux(x: i32) {
             r#"
 use spam::Quux;
 
-fn main() { <|> }
+fn main() { $0 }
 "#,
             expect![[r#"
                 fn main() fn main()
@@ -719,7 +714,7 @@ enum Foo { Bar, Baz, Quux }
 
 fn main() {
     let foo = Foo::Quux;
-    match foo { Qu<|> }
+    match foo { Qu$0 }
 }
 "#,
             expect![[r#"
@@ -739,7 +734,7 @@ enum Foo { Bar, Baz, Quux }
 
 fn main() {
     let foo = Foo::Quux;
-    match &foo { Qu<|> }
+    match &foo { Qu$0 }
 }
 "#,
             expect![[r#"
@@ -759,7 +754,7 @@ enum Foo { Bar, Baz, Quux }
 
 fn main() {
     let foo = Foo::Quux;
-    if let Qu<|> = foo { }
+    if let Qu$0 = foo { }
 }
 "#,
             expect![[r#"
@@ -776,7 +771,7 @@ fn main() {
         check(
             r#"
 enum Foo { Bar, Baz, Quux }
-fn main() { let foo: Foo = Q<|> }
+fn main() { let foo: Foo = Q$0 }
 "#,
             expect![[r#"
                 ev Foo::Bar  ()
@@ -793,7 +788,7 @@ fn main() { let foo: Foo = Q<|> }
         check(
             r#"
 mod m { pub enum E { V } }
-fn f() -> m::E { V<|> }
+fn f() -> m::E { V$0 }
 "#,
             expect![[r#"
                 ev m::E::V ()
@@ -808,7 +803,7 @@ fn f() -> m::E { V<|> }
         check(
             r#"
 struct Foo;
-#[<|>]
+#[$0]
 fn f() {}
 "#,
             expect![[""]],
@@ -822,7 +817,7 @@ fn f() {}
 trait MyTrait {}
 struct MyStruct {}
 
-impl My<|>
+impl My$0
 "#,
             expect![[r#"
                 tp Self
@@ -835,7 +830,7 @@ impl My<|>
     #[test]
     fn function_fuzzy_completion() {
         check_edit_with_config(
-            fuzzy_completion_config(),
+            TEST_CONFIG,
             "stdin",
             r#"
 //- /lib.rs crate:dep
@@ -845,7 +840,7 @@ pub mod io {
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    stdi<|>
+    stdi$0
 }
 "#,
             r#"
@@ -861,7 +856,7 @@ fn main() {
     #[test]
     fn macro_fuzzy_completion() {
         check_edit_with_config(
-            fuzzy_completion_config(),
+            TEST_CONFIG,
             "macro_with_curlies!",
             r#"
 //- /lib.rs crate:dep
@@ -873,7 +868,7 @@ macro_rules! macro_with_curlies {
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    curli<|>
+    curli$0
 }
 "#,
             r#"
@@ -889,7 +884,7 @@ fn main() {
     #[test]
     fn struct_fuzzy_completion() {
         check_edit_with_config(
-            fuzzy_completion_config(),
+            TEST_CONFIG,
             "ThirdStruct",
             r#"
 //- /lib.rs crate:dep
@@ -903,7 +898,7 @@ pub mod some_module {
 use dep::{FirstStruct, some_module::SecondStruct};
 
 fn main() {
-    this<|>
+    this$0
 }
 "#,
             r#"
@@ -920,7 +915,7 @@ fn main() {
     fn fuzzy_completions_come_in_specific_order() {
         mark::check!(certain_fuzzy_order_test);
         check_with_config(
-            fuzzy_completion_config(),
+            TEST_CONFIG,
             r#"
 //- /lib.rs crate:dep
 pub struct FirstStruct;
@@ -941,7 +936,7 @@ pub mod some_module {
 use dep::{FirstStruct, some_module::SecondStruct};
 
 fn main() {
-    hir<|>
+    hir$0
 }
 "#,
             expect![[r#"
diff --git a/crates/completion/src/config.rs b/crates/completion/src/config.rs
index 30577dc11..b4439b7d1 100644
--- a/crates/completion/src/config.rs
+++ b/crates/completion/src/config.rs
@@ -4,8 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! completions if we are allowed to.
 
-use ide_db::helpers::insert_use::MergeBehavior;
-use rustc_hash::FxHashSet;
+use ide_db::helpers::{insert_use::MergeBehavior, SnippetCap};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CompletionConfig {
@@ -15,49 +14,4 @@ pub struct CompletionConfig {
     pub add_call_argument_snippets: bool,
     pub snippet_cap: Option<SnippetCap>,
     pub merge: Option<MergeBehavior>,
-    /// A set of capabilities, enabled on the client and supported on the server.
-    pub active_resolve_capabilities: FxHashSet<CompletionResolveCapability>,
-}
-
-/// A resolve capability, supported on the server.
-/// If the client registers any completion resolve capabilities,
-/// the server is able to render completion items' corresponding fields later,
-/// not during an initial completion item request.
-/// See https://github.com/rust-analyzer/rust-analyzer/issues/6366 for more details.
-#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
-pub enum CompletionResolveCapability {
-    Documentation,
-    Detail,
-    AdditionalTextEdits,
-}
-
-impl CompletionConfig {
-    pub fn allow_snippets(&mut self, yes: bool) {
-        self.snippet_cap = if yes { Some(SnippetCap { _private: () }) } else { None }
-    }
-
-    /// Whether the completions' additional edits are calculated when sending an initional completions list
-    /// or later, in a separate resolve request.
-    pub fn resolve_additional_edits_lazily(&self) -> bool {
-        self.active_resolve_capabilities.contains(&CompletionResolveCapability::AdditionalTextEdits)
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct SnippetCap {
-    _private: (),
-}
-
-impl Default for CompletionConfig {
-    fn default() -> Self {
-        CompletionConfig {
-            enable_postfix_completions: true,
-            enable_autoimport_completions: true,
-            add_call_parenthesis: true,
-            add_call_argument_snippets: true,
-            snippet_cap: Some(SnippetCap { _private: () }),
-            merge: Some(MergeBehavior::Full),
-            active_resolve_capabilities: FxHashSet::default(),
-        }
-    }
 }
diff --git a/crates/completion/src/context.rs b/crates/completion/src/context.rs
index 41de324d8..ebf28e887 100644
--- a/crates/completion/src/context.rs
+++ b/crates/completion/src/context.rs
@@ -63,7 +63,7 @@ pub(crate) struct CompletionContext<'a> {
     pub(super) is_expr: bool,
     /// Something is typed at the "top" level, in module or impl/trait.
     pub(super) is_new_item: bool,
-    /// The receiver if this is a field or method access, i.e. writing something.<|>
+    /// The receiver if this is a field or method access, i.e. writing something.$0
     pub(super) dot_receiver: Option<ast::Expr>,
     pub(super) dot_receiver_is_ambiguous_float_literal: bool,
     /// If this is a call (method or function) in particular, i.e. the () are already there.
@@ -228,9 +228,9 @@ impl<'a> CompletionContext<'a> {
 
     /// Checks whether completions in that particular case don't make much sense.
     /// Examples:
-    /// - `fn <|>` -- we expect function name, it's unlikely that "hint" will be helpful.
+    /// - `fn $0` -- we expect function name, it's unlikely that "hint" will be helpful.
     ///   Exception for this case is `impl Trait for Foo`, where we would like to hint trait method names.
-    /// - `for _ i<|>` -- obviously, it'll be "in" keyword.
+    /// - `for _ i$0` -- obviously, it'll be "in" keyword.
     pub(crate) fn no_completion_required(&self) -> bool {
         (self.fn_is_prev && !self.inside_impl_trait_block) || self.for_is_prev2
     }
@@ -279,7 +279,7 @@ impl<'a> CompletionContext<'a> {
         offset: TextSize,
     ) {
         // FIXME: this is wrong in at least two cases:
-        //  * when there's no token `foo(<|>)`
+        //  * when there's no token `foo($0)`
         //  * when there is a token, but it happens to have type of it's own
         self.expected_type = self
             .token
@@ -458,7 +458,7 @@ impl<'a> CompletionContext<'a> {
                     }
                     if let Some(block) = ast::BlockExpr::cast(node) {
                         return Some(
-                            block.expr().map(|e| e.syntax().text_range())
+                            block.tail_expr().map(|e| e.syntax().text_range())
                                 == Some(name_ref.syntax().text_range()),
                         );
                     }
diff --git a/crates/completion/src/item.rs b/crates/completion/src/item.rs
index 65f8353e7..35af354b0 100644
--- a/crates/completion/src/item.rs
+++ b/crates/completion/src/item.rs
@@ -5,13 +5,11 @@ use std::fmt;
 use hir::{Documentation, ModPath, Mutability};
 use ide_db::helpers::{
     insert_use::{self, ImportScope, MergeBehavior},
-    mod_path_to_ast,
+    mod_path_to_ast, SnippetCap,
 };
 use syntax::{algo, TextRange};
 use text_edit::TextEdit;
 
-use crate::config::SnippetCap;
-
 /// `CompletionItem` describes a single completion variant in the editor pop-up.
 /// It is basically a POD with various properties. To construct a
 /// `CompletionItem`, use `new` method and the `Builder` struct.
@@ -45,7 +43,7 @@ pub struct CompletionItem {
     /// Lookup is used to check if completion item indeed can complete current
     /// ident.
     ///
-    /// That is, in `foo.bar<|>` lookup of `abracadabra` will be accepted (it
+    /// That is, in `foo.bar$0` lookup of `abracadabra` will be accepted (it
     /// contains `bar` sub sequence), and `quux` will rejected.
     lookup: Option<String>,
 
diff --git a/crates/completion/src/lib.rs b/crates/completion/src/lib.rs
index c57d05bbe..6cba88a6b 100644
--- a/crates/completion/src/lib.rs
+++ b/crates/completion/src/lib.rs
@@ -20,7 +20,7 @@ use text_edit::TextEdit;
 use crate::{completions::Completions, context::CompletionContext, item::CompletionKind};
 
 pub use crate::{
-    config::{CompletionConfig, CompletionResolveCapability},
+    config::CompletionConfig,
     item::{CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, InsertTextFormat},
 };
 
@@ -47,8 +47,8 @@ pub use crate::{
 // - `expr.while` -> `while expr {}` or `while let ... {}` for `Option` or `Result`
 // - `expr.ref` -> `&expr`
 // - `expr.refm` -> `&mut expr`
-// - `expr.let` -> `let <|> = expr;`
-// - `expr.letm` -> `let mut <|> = expr;`
+// - `expr.let` -> `let $0 = expr;`
+// - `expr.letm` -> `let mut $0 = expr;`
 // - `expr.not` -> `!expr`
 // - `expr.dbg` -> `dbg!(expr)`
 // - `expr.dbgr` -> `dbg!(&expr)`
@@ -92,7 +92,7 @@ pub use crate::{
 /// ```no_run
 /// fn f() {
 ///     let foo = 92;
-///     let _ = bar<|>
+///     let _ = bar$0
 /// }
 /// ```
 ///
@@ -158,8 +158,7 @@ pub fn resolve_completion_edits(
 
 #[cfg(test)]
 mod tests {
-    use crate::config::CompletionConfig;
-    use crate::test_utils;
+    use crate::test_utils::{self, TEST_CONFIG};
 
     struct DetailAndDocumentation<'a> {
         detail: &'a str,
@@ -168,7 +167,7 @@ mod tests {
 
     fn check_detail_and_documentation(ra_fixture: &str, expected: DetailAndDocumentation) {
         let (db, position) = test_utils::position(ra_fixture);
-        let config = CompletionConfig::default();
+        let config = TEST_CONFIG;
         let completions: Vec<_> = crate::completions(&db, &config, position).unwrap().into();
         for item in completions {
             if item.detail() == Some(expected.detail) {
@@ -183,7 +182,7 @@ mod tests {
 
     fn check_no_completion(ra_fixture: &str) {
         let (db, position) = test_utils::position(ra_fixture);
-        let config = CompletionConfig::default();
+        let config = TEST_CONFIG;
 
         let completions: Option<Vec<String>> = crate::completions(&db, &config, position)
             .and_then(|completions| {
@@ -221,7 +220,7 @@ mod tests {
 
             fn foo() {
                 let bar = Bar;
-                bar.fo<|>;
+                bar.fo$0;
             }
             "#,
             DetailAndDocumentation { detail: "fn foo(&self)", documentation: "Do the foo" },
@@ -247,7 +246,7 @@ mod tests {
 
             fn foo() {
                 let bar = Bar;
-                bar.fo<|>;
+                bar.fo$0;
             }
             "#,
             DetailAndDocumentation { detail: "fn foo(&self)", documentation: " Do the foo" },
@@ -260,7 +259,7 @@ mod tests {
         check_no_completion(
             r#"
             fn foo() {
-                for i i<|>
+                for i i$0
             }
             "#,
         );
@@ -271,7 +270,7 @@ mod tests {
             fn foo() -> &'static str { "foo" }
 
             fn bar() {
-                for c in fo<|>
+                for c in fo$0
             }
             "#,
             DetailAndDocumentation {
diff --git a/crates/completion/src/patterns.rs b/crates/completion/src/patterns.rs
index b0f35f9bf..f148b9402 100644
--- a/crates/completion/src/patterns.rs
+++ b/crates/completion/src/patterns.rs
@@ -20,7 +20,7 @@ pub(crate) fn has_trait_parent(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_trait_parent() {
-    check_pattern_is_applicable(r"trait A { f<|> }", has_trait_parent);
+    check_pattern_is_applicable(r"trait A { f$0 }", has_trait_parent);
 }
 
 pub(crate) fn has_impl_parent(element: SyntaxElement) -> bool {
@@ -32,7 +32,7 @@ pub(crate) fn has_impl_parent(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_impl_parent() {
-    check_pattern_is_applicable(r"impl A { f<|> }", has_impl_parent);
+    check_pattern_is_applicable(r"impl A { f$0 }", has_impl_parent);
 }
 
 pub(crate) fn inside_impl_trait_block(element: SyntaxElement) -> bool {
@@ -47,10 +47,10 @@ pub(crate) fn inside_impl_trait_block(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_inside_impl_trait_block() {
-    check_pattern_is_applicable(r"impl Foo for Bar { f<|> }", inside_impl_trait_block);
-    check_pattern_is_applicable(r"impl Foo for Bar { fn f<|> }", inside_impl_trait_block);
-    check_pattern_is_not_applicable(r"impl A { f<|> }", inside_impl_trait_block);
-    check_pattern_is_not_applicable(r"impl A { fn f<|> }", inside_impl_trait_block);
+    check_pattern_is_applicable(r"impl Foo for Bar { f$0 }", inside_impl_trait_block);
+    check_pattern_is_applicable(r"impl Foo for Bar { fn f$0 }", inside_impl_trait_block);
+    check_pattern_is_not_applicable(r"impl A { f$0 }", inside_impl_trait_block);
+    check_pattern_is_not_applicable(r"impl A { fn f$0 }", inside_impl_trait_block);
 }
 
 pub(crate) fn has_field_list_parent(element: SyntaxElement) -> bool {
@@ -58,8 +58,8 @@ pub(crate) fn has_field_list_parent(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_field_list_parent() {
-    check_pattern_is_applicable(r"struct Foo { f<|> }", has_field_list_parent);
-    check_pattern_is_applicable(r"struct Foo { f<|> pub f: i32}", has_field_list_parent);
+    check_pattern_is_applicable(r"struct Foo { f$0 }", has_field_list_parent);
+    check_pattern_is_applicable(r"struct Foo { f$0 pub f: i32}", has_field_list_parent);
 }
 
 pub(crate) fn has_block_expr_parent(element: SyntaxElement) -> bool {
@@ -67,7 +67,7 @@ pub(crate) fn has_block_expr_parent(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_block_expr_parent() {
-    check_pattern_is_applicable(r"fn my_fn() { let a = 2; f<|> }", has_block_expr_parent);
+    check_pattern_is_applicable(r"fn my_fn() { let a = 2; f$0 }", has_block_expr_parent);
 }
 
 pub(crate) fn has_bind_pat_parent(element: SyntaxElement) -> bool {
@@ -75,8 +75,8 @@ pub(crate) fn has_bind_pat_parent(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_bind_pat_parent() {
-    check_pattern_is_applicable(r"fn my_fn(m<|>) {}", has_bind_pat_parent);
-    check_pattern_is_applicable(r"fn my_fn() { let m<|> }", has_bind_pat_parent);
+    check_pattern_is_applicable(r"fn my_fn(m$0) {}", has_bind_pat_parent);
+    check_pattern_is_applicable(r"fn my_fn() { let m$0 }", has_bind_pat_parent);
 }
 
 pub(crate) fn has_ref_parent(element: SyntaxElement) -> bool {
@@ -86,8 +86,8 @@ pub(crate) fn has_ref_parent(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_ref_parent() {
-    check_pattern_is_applicable(r"fn my_fn(&m<|>) {}", has_ref_parent);
-    check_pattern_is_applicable(r"fn my() { let &m<|> }", has_ref_parent);
+    check_pattern_is_applicable(r"fn my_fn(&m$0) {}", has_ref_parent);
+    check_pattern_is_applicable(r"fn my() { let &m$0 }", has_ref_parent);
 }
 
 pub(crate) fn has_item_list_or_source_file_parent(element: SyntaxElement) -> bool {
@@ -99,8 +99,8 @@ pub(crate) fn has_item_list_or_source_file_parent(element: SyntaxElement) -> boo
 }
 #[test]
 fn test_has_item_list_or_source_file_parent() {
-    check_pattern_is_applicable(r"i<|>", has_item_list_or_source_file_parent);
-    check_pattern_is_applicable(r"mod foo { f<|> }", has_item_list_or_source_file_parent);
+    check_pattern_is_applicable(r"i$0", has_item_list_or_source_file_parent);
+    check_pattern_is_applicable(r"mod foo { f$0 }", has_item_list_or_source_file_parent);
 }
 
 pub(crate) fn is_match_arm(element: SyntaxElement) -> bool {
@@ -112,7 +112,7 @@ pub(crate) fn is_match_arm(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_is_match_arm() {
-    check_pattern_is_applicable(r"fn my_fn() { match () { () => m<|> } }", is_match_arm);
+    check_pattern_is_applicable(r"fn my_fn() { match () { () => m$0 } }", is_match_arm);
 }
 
 pub(crate) fn unsafe_is_prev(element: SyntaxElement) -> bool {
@@ -124,7 +124,7 @@ pub(crate) fn unsafe_is_prev(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_unsafe_is_prev() {
-    check_pattern_is_applicable(r"unsafe i<|>", unsafe_is_prev);
+    check_pattern_is_applicable(r"unsafe i$0", unsafe_is_prev);
 }
 
 pub(crate) fn if_is_prev(element: SyntaxElement) -> bool {
@@ -144,11 +144,11 @@ pub(crate) fn fn_is_prev(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_fn_is_prev() {
-    check_pattern_is_applicable(r"fn l<|>", fn_is_prev);
+    check_pattern_is_applicable(r"fn l$0", fn_is_prev);
 }
 
 /// Check if the token previous to the previous one is `for`.
-/// For example, `for _ i<|>` => true.
+/// For example, `for _ i$0` => true.
 pub(crate) fn for_is_prev2(element: SyntaxElement) -> bool {
     element
         .into_token()
@@ -159,12 +159,12 @@ pub(crate) fn for_is_prev2(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_for_is_prev2() {
-    check_pattern_is_applicable(r"for i i<|>", for_is_prev2);
+    check_pattern_is_applicable(r"for i i$0", for_is_prev2);
 }
 
 #[test]
 fn test_if_is_prev() {
-    check_pattern_is_applicable(r"if l<|>", if_is_prev);
+    check_pattern_is_applicable(r"if l$0", if_is_prev);
 }
 
 pub(crate) fn has_trait_as_prev_sibling(element: SyntaxElement) -> bool {
@@ -172,7 +172,7 @@ pub(crate) fn has_trait_as_prev_sibling(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_trait_as_prev_sibling() {
-    check_pattern_is_applicable(r"trait A w<|> {}", has_trait_as_prev_sibling);
+    check_pattern_is_applicable(r"trait A w$0 {}", has_trait_as_prev_sibling);
 }
 
 pub(crate) fn has_impl_as_prev_sibling(element: SyntaxElement) -> bool {
@@ -180,7 +180,7 @@ pub(crate) fn has_impl_as_prev_sibling(element: SyntaxElement) -> bool {
 }
 #[test]
 fn test_has_impl_as_prev_sibling() {
-    check_pattern_is_applicable(r"impl A w<|> {}", has_impl_as_prev_sibling);
+    check_pattern_is_applicable(r"impl A w$0 {}", has_impl_as_prev_sibling);
 }
 
 pub(crate) fn is_in_loop_body(element: SyntaxElement) -> bool {
diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs
index ac0b2a513..e93c59f71 100644
--- a/crates/completion/src/render.rs
+++ b/crates/completion/src/render.rs
@@ -11,13 +11,13 @@ pub(crate) mod type_alias;
 mod builder_ext;
 
 use hir::{Documentation, HasAttrs, HirDisplay, Mutability, ScopeDef, Type};
-use ide_db::RootDatabase;
+use ide_db::{helpers::SnippetCap, RootDatabase};
 use syntax::TextRange;
 use test_utils::mark;
 
 use crate::{
-    config::SnippetCap, item::ImportEdit, CompletionContext, CompletionItem, CompletionItemKind,
-    CompletionKind, CompletionScore,
+    item::ImportEdit, CompletionContext, CompletionItem, CompletionItemKind, CompletionKind,
+    CompletionScore,
 };
 
 use crate::render::{enum_variant::render_variant, function::render_fn, macro_::render_macro};
@@ -320,8 +320,8 @@ mod tests {
     use test_utils::mark;
 
     use crate::{
-        test_utils::{check_edit, do_completion, get_all_items},
-        CompletionConfig, CompletionKind, CompletionScore,
+        test_utils::{check_edit, do_completion, get_all_items, TEST_CONFIG},
+        CompletionKind, CompletionScore,
     };
 
     fn check(ra_fixture: &str, expect: Expect) {
@@ -338,7 +338,7 @@ mod tests {
             }
         }
 
-        let mut completions = get_all_items(CompletionConfig::default(), ra_fixture);
+        let mut completions = get_all_items(TEST_CONFIG, ra_fixture);
         completions.sort_by_key(|it| (Reverse(it.score()), it.label().to_string()));
         let actual = completions
             .into_iter()
@@ -358,7 +358,7 @@ mod tests {
             r#"
 enum Foo { Foo { x: i32, y: i32 } }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -381,7 +381,7 @@ fn main() { Foo::Fo<|> }
             r#"
 enum Foo { Foo (i32, i32) }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -406,7 +406,7 @@ fn main() { Foo::Fo<|> }
             r#"
 enum Foo { Foo }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -430,7 +430,7 @@ fn main() { Foo::Fo<|> }
 mod m {
     pub enum Spam { Foo, Bar(i32) }
 }
-fn main() { let _: m::Spam = S<|> }
+fn main() { let _: m::Spam = S$0 }
 "#,
             expect![[r#"
                 [
@@ -483,7 +483,7 @@ fn something_deprecated() {}
 #[deprecated(since = "1.0.0")]
 fn something_else_deprecated() {}
 
-fn main() { som<|> }
+fn main() { som$0 }
 "#,
             expect![[r#"
                 [
@@ -523,7 +523,7 @@ fn main() { som<|> }
         check(
             r#"
 struct A { #[deprecated] the_field: u32 }
-fn foo() { A { the<|> } }
+fn foo() { A { the$0 } }
 "#,
             expect![[r#"
                 [
@@ -551,7 +551,7 @@ struct S {
 }
 impl S {
     /// Method docs
-    fn bar(self) { self.<|> }
+    fn bar(self) { self.$0 }
 }"#,
             expect![[r#"
                 [
@@ -584,7 +584,7 @@ impl S {
 
         check(
             r#"
-use self::my<|>;
+use self::my$0;
 
 /// mod docs
 mod my { }
@@ -643,7 +643,7 @@ impl S {
     #[inline]
     fn the_method(&self) { }
 }
-fn foo(s: S) { s.<|> }
+fn foo(s: S) { s.$0 }
 "#,
             expect![[r#"
                 [
@@ -671,7 +671,7 @@ fn foo(foo: u8, bar: u8) {}
 struct ManualVtable { f: fn(u8, u8) }
 
 fn main() -> ManualVtable {
-    ManualVtable { f: f<|> }
+    ManualVtable { f: f$0 }
 }
 "#,
             r#"
@@ -692,7 +692,7 @@ fn main() -> ManualVtable {
             "foo",
             r#"
 mod m { pub fn foo() {} }
-use crate::m::f<|>;
+use crate::m::f$0;
 "#,
             r#"
 mod m { pub fn foo() {} }
@@ -707,7 +707,7 @@ use crate::m::foo;
             "foo",
             r#"
 fn foo(x: i32) {}
-fn main() { f<|>(); }
+fn main() { f$0(); }
 "#,
             r#"
 fn foo(x: i32) {}
@@ -719,7 +719,7 @@ fn main() { foo(); }
             r#"
 struct Foo;
 impl Foo { fn foo(&self){} }
-fn f(foo: &Foo) { foo.f<|>(); }
+fn f(foo: &Foo) { foo.f$0(); }
 "#,
             r#"
 struct Foo;
@@ -736,7 +736,7 @@ fn f(foo: &Foo) { foo.foo(); }
             "Vec",
             r#"
 struct Vec<T> {}
-fn foo(xs: Ve<|>)
+fn foo(xs: Ve$0)
 "#,
             r#"
 struct Vec<T> {}
@@ -747,7 +747,7 @@ fn foo(xs: Vec<$0>)
             "Vec",
             r#"
 type Vec<T> = (T,);
-fn foo(xs: Ve<|>)
+fn foo(xs: Ve$0)
 "#,
             r#"
 type Vec<T> = (T,);
@@ -758,7 +758,7 @@ fn foo(xs: Vec<$0>)
             "Vec",
             r#"
 struct Vec<T = i128> {}
-fn foo(xs: Ve<|>)
+fn foo(xs: Ve$0)
 "#,
             r#"
 struct Vec<T = i128> {}
@@ -769,7 +769,7 @@ fn foo(xs: Vec)
             "Vec",
             r#"
 struct Vec<T> {}
-fn foo(xs: Ve<|><i128>)
+fn foo(xs: Ve$0<i128>)
 "#,
             r#"
 struct Vec<T> {}
@@ -785,7 +785,7 @@ fn foo(xs: Vec<i128>)
             r#"
 struct S { foo: i64, bar: u32, baz: u32 }
 fn test(bar: u32) { }
-fn foo(s: S) { test(s.<|>) }
+fn foo(s: S) { test(s.$0) }
 "#,
             expect![[r#"
                 fd bar [type+name]
@@ -802,7 +802,7 @@ fn foo(s: S) { test(s.<|>) }
             r#"
 struct A { foo: i64, bar: u32, baz: u32 }
 struct B { x: (), y: f32, bar: u32 }
-fn foo(a: A) { B { bar: a.<|> }; }
+fn foo(a: A) { B { bar: a.$0 }; }
 "#,
             expect![[r#"
                 fd bar [type+name]
@@ -819,7 +819,7 @@ fn foo(a: A) { B { bar: a.<|> }; }
 struct A { foo: i64, bar: u32, baz: u32 }
 struct B { x: (), y: f32, bar: u32 }
 fn f(foo: i64) {  }
-fn foo(a: A) { B { bar: f(a.<|>) }; }
+fn foo(a: A) { B { bar: f(a.$0) }; }
 "#,
             expect![[r#"
                 fd foo [type+name]
@@ -832,7 +832,7 @@ fn foo(a: A) { B { bar: f(a.<|>) }; }
 struct A { foo: i64, bar: u32, baz: u32 }
 struct B { x: (), y: f32, bar: u32 }
 fn f(foo: i64) {  }
-fn foo(a: A) { f(B { bar: a.<|> }); }
+fn foo(a: A) { f(B { bar: a.$0 }); }
 "#,
             expect![[r#"
                 fd bar [type+name]
@@ -847,7 +847,7 @@ fn foo(a: A) { f(B { bar: a.<|> }); }
         check_scores(
             r#"
 struct WorldSnapshot { _f: () };
-fn go(world: &WorldSnapshot) { go(w<|>) }
+fn go(world: &WorldSnapshot) { go(w$0) }
 "#,
             expect![[r#"
                 bn world [type+name]
@@ -862,7 +862,7 @@ fn go(world: &WorldSnapshot) { go(w<|>) }
         check_scores(
             r#"
 struct Foo;
-fn f(foo: &Foo) { f(foo, w<|>) }
+fn f(foo: &Foo) { f(foo, w$0) }
 "#,
             expect![[r#"
                 st Foo []
diff --git a/crates/completion/src/render/enum_variant.rs b/crates/completion/src/render/enum_variant.rs
index 732e139ec..89fb49773 100644
--- a/crates/completion/src/render/enum_variant.rs
+++ b/crates/completion/src/render/enum_variant.rs
@@ -115,7 +115,7 @@ mod tests {
 enum Option<T> { Some(T), None }
 use Option::*;
 fn main() -> Option<i32> {
-    Som<|>
+    Som$0
 }
 "#,
             r#"
diff --git a/crates/completion/src/render/function.rs b/crates/completion/src/render/function.rs
index 081be14f4..f5b0ce3e3 100644
--- a/crates/completion/src/render/function.rs
+++ b/crates/completion/src/render/function.rs
@@ -113,7 +113,7 @@ mod tests {
     use test_utils::mark;
 
     use crate::{
-        test_utils::{check_edit, check_edit_with_config},
+        test_utils::{check_edit, check_edit_with_config, TEST_CONFIG},
         CompletionConfig,
     };
 
@@ -124,7 +124,7 @@ mod tests {
             "no_args",
             r#"
 fn no_args() {}
-fn main() { no_<|> }
+fn main() { no_$0 }
 "#,
             r#"
 fn no_args() {}
@@ -136,7 +136,7 @@ fn main() { no_args()$0 }
             "with_args",
             r#"
 fn with_args(x: i32, y: String) {}
-fn main() { with_<|> }
+fn main() { with_$0 }
 "#,
             r#"
 fn with_args(x: i32, y: String) {}
@@ -151,7 +151,7 @@ struct S;
 impl S {
     fn foo(&self) {}
 }
-fn bar(s: &S) { s.f<|> }
+fn bar(s: &S) { s.f$0 }
 "#,
             r#"
 struct S;
@@ -170,7 +170,7 @@ impl S {
     fn foo(&self, x: i32) {}
 }
 fn bar(s: &S) {
-    s.f<|>
+    s.f$0
 }
 "#,
             r#"
@@ -195,7 +195,7 @@ struct S;
 impl S {
     fn foo(&self) {}
 }
-fn main() { S::f<|> }
+fn main() { S::f$0 }
 "#,
             r#"
 struct S;
@@ -211,11 +211,11 @@ fn main() { S::foo(${1:&self})$0 }
     fn suppress_arg_snippets() {
         mark::check!(suppress_arg_snippets);
         check_edit_with_config(
-            CompletionConfig { add_call_argument_snippets: false, ..CompletionConfig::default() },
+            CompletionConfig { add_call_argument_snippets: false, ..TEST_CONFIG },
             "with_args",
             r#"
 fn with_args(x: i32, y: String) {}
-fn main() { with_<|> }
+fn main() { with_$0 }
 "#,
             r#"
 fn with_args(x: i32, y: String) {}
@@ -230,7 +230,7 @@ fn main() { with_args($0) }
             "foo",
             r#"
 fn foo(_foo: i32, ___bar: bool, ho_ge_: String) {}
-fn main() { f<|> }
+fn main() { f$0 }
 "#,
             r#"
 fn foo(_foo: i32, ___bar: bool, ho_ge_: String) {}
@@ -248,7 +248,7 @@ struct Foo {}
 fn ref_arg(x: &Foo) {}
 fn main() {
     let x = Foo {};
-    ref_ar<|>
+    ref_ar$0
 }
 "#,
             r#"
@@ -271,7 +271,7 @@ struct Foo {}
 fn ref_arg(x: &mut Foo) {}
 fn main() {
     let x = Foo {};
-    ref_ar<|>
+    ref_ar$0
 }
 "#,
             r#"
@@ -299,7 +299,7 @@ impl Bar {
 fn main() {
     let x = Foo {};
     let y = Bar {};
-    y.<|>
+    y.$0
 }
 "#,
             r#"
@@ -326,7 +326,7 @@ fn main() {
 fn take_mutably(mut x: &i32) {}
 
 fn main() {
-    take_m<|>
+    take_m$0
 }
 "#,
             r#"
diff --git a/crates/completion/src/render/macro_.rs b/crates/completion/src/render/macro_.rs
index 6f4f9945c..f893e420a 100644
--- a/crates/completion/src/render/macro_.rs
+++ b/crates/completion/src/render/macro_.rs
@@ -135,7 +135,7 @@ mod tests {
             "frobnicate!",
             r#"
 //- /main.rs crate:main deps:foo
-use foo::<|>;
+use foo::$0;
 //- /foo/lib.rs crate:foo
 #[macro_export]
 macro_rules! frobnicate { () => () }
@@ -149,7 +149,7 @@ use foo::frobnicate;
             "frobnicate!",
             r#"
 macro_rules! frobnicate { () => () }
-fn main() { frob<|>!(); }
+fn main() { frob$0!(); }
 "#,
             r#"
 macro_rules! frobnicate { () => () }
@@ -173,7 +173,7 @@ fn main() { frobnicate!(); }
 /// ```
 macro_rules! vec { () => {} }
 
-fn fn main() { v<|> }
+fn fn main() { v$0 }
 "#,
             r#"
 /// Creates a [`Vec`] containing the arguments.
@@ -198,7 +198,7 @@ fn fn main() { vec![$0] }
 /// Don't call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`,
 /// call as `let _=foo!  { hello world };`
 macro_rules! foo { () => {} }
-fn main() { <|> }
+fn main() { $0 }
 "#,
             r#"
 /// Foo
diff --git a/crates/completion/src/render/pattern.rs b/crates/completion/src/render/pattern.rs
index a3b6a3cac..61d8a17e5 100644
--- a/crates/completion/src/render/pattern.rs
+++ b/crates/completion/src/render/pattern.rs
@@ -1,12 +1,10 @@
 //! Renderer for patterns.
 
 use hir::{db::HirDatabase, HasAttrs, HasVisibility, Name, StructKind};
+use ide_db::helpers::SnippetCap;
 use itertools::Itertools;
 
-use crate::{
-    config::SnippetCap, item::CompletionKind, render::RenderContext, CompletionItem,
-    CompletionItemKind,
-};
+use crate::{item::CompletionKind, render::RenderContext, CompletionItem, CompletionItemKind};
 
 fn visible_fields(
     ctx: &RenderContext<'_>,
diff --git a/crates/completion/src/test_utils.rs b/crates/completion/src/test_utils.rs
index eb0c16f52..3f4b9d4ac 100644
--- a/crates/completion/src/test_utils.rs
+++ b/crates/completion/src/test_utils.rs
@@ -1,8 +1,11 @@
 //! Runs completion for testing purposes.
 
 use hir::Semantics;
-use ide_db::base_db::{fixture::ChangeFixture, FileLoader, FilePosition};
-use ide_db::RootDatabase;
+use ide_db::{
+    base_db::{fixture::ChangeFixture, FileLoader, FilePosition},
+    helpers::{insert_use::MergeBehavior, SnippetCap},
+    RootDatabase,
+};
 use itertools::Itertools;
 use stdx::{format_to, trim_indent};
 use syntax::{AstNode, NodeOrToken, SyntaxElement};
@@ -10,12 +13,21 @@ use test_utils::{assert_eq_text, RangeOrOffset};
 
 use crate::{item::CompletionKind, CompletionConfig, CompletionItem};
 
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig {
+    enable_postfix_completions: true,
+    enable_autoimport_completions: true,
+    add_call_parenthesis: true,
+    add_call_argument_snippets: true,
+    snippet_cap: SnippetCap::new(true),
+    merge: Some(MergeBehavior::Full),
+};
+
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn position(ra_fixture: &str) -> (RootDatabase, FilePosition) {
     let change_fixture = ChangeFixture::parse(ra_fixture);
     let mut database = RootDatabase::default();
     database.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
     let offset = match range_or_offset {
         RangeOrOffset::Range(_) => panic!(),
         RangeOrOffset::Offset(it) => it,
@@ -24,7 +36,7 @@ pub(crate) fn position(ra_fixture: &str) -> (RootDatabase, FilePosition) {
 }
 
 pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> {
-    do_completion_with_config(CompletionConfig::default(), code, kind)
+    do_completion_with_config(TEST_CONFIG, code, kind)
 }
 
 pub(crate) fn do_completion_with_config(
@@ -39,7 +51,7 @@ pub(crate) fn do_completion_with_config(
 }
 
 pub(crate) fn completion_list(code: &str, kind: CompletionKind) -> String {
-    completion_list_with_config(CompletionConfig::default(), code, kind)
+    completion_list_with_config(TEST_CONFIG, code, kind)
 }
 
 pub(crate) fn completion_list_with_config(
@@ -76,7 +88,7 @@ fn monospace_width(s: &str) -> usize {
 }
 
 pub(crate) fn check_edit(what: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
-    check_edit_with_config(CompletionConfig::default(), what, ra_fixture_before, ra_fixture_after)
+    check_edit_with_config(TEST_CONFIG, what, ra_fixture_before, ra_fixture_after)
 }
 
 pub(crate) fn check_edit_with_config(
diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml
index 3d9436d69..1bad64a1b 100644
--- a/crates/flycheck/Cargo.toml
+++ b/crates/flycheck/Cargo.toml
@@ -17,3 +17,4 @@ serde_json = "1.0.48"
 jod-thread = "0.1.1"
 
 toolchain = { path = "../toolchain", version = "0.0.0" }
+stdx = { path = "../stdx", version = "0.0.0"  }
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index d982c5f29..4388e8c67 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -5,13 +5,13 @@
 use std::{
     fmt,
     io::{self, BufReader},
-    ops,
     path::PathBuf,
     process::{self, Command, Stdio},
     time::Duration,
 };
 
 use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
+use stdx::JodChild;
 
 pub use cargo_metadata::diagnostic::{
     Applicability, Diagnostic, DiagnosticCode, DiagnosticLevel, DiagnosticSpan,
@@ -323,24 +323,3 @@ impl CargoActor {
         Ok(read_at_least_one_message)
     }
 }
-
-struct JodChild(process::Child);
-
-impl ops::Deref for JodChild {
-    type Target = process::Child;
-    fn deref(&self) -> &process::Child {
-        &self.0
-    }
-}
-
-impl ops::DerefMut for JodChild {
-    fn deref_mut(&mut self) -> &mut process::Child {
-        &mut self.0
-    }
-}
-
-impl Drop for JodChild {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-    }
-}
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs
index 62eccf475..cc1938333 100644
--- a/crates/hir/src/code_model.rs
+++ b/crates/hir/src/code_model.rs
@@ -5,9 +5,7 @@ use arrayvec::ArrayVec;
 use base_db::{CrateDisplayName, CrateId, Edition, FileId};
 use either::Either;
 use hir_def::{
-    adt::ReprKind,
-    adt::StructKind,
-    adt::VariantData,
+    adt::{ReprKind, StructKind, VariantData},
     builtin_type::BuiltinType,
     expr::{BindingAnnotation, LabelId, Pat, PatId},
     import_map,
@@ -31,7 +29,7 @@ use hir_expand::{
 };
 use hir_ty::{
     autoderef,
-    display::{HirDisplayError, HirFormatter},
+    display::{write_bounds_like_dyn_trait, HirDisplayError, HirFormatter},
     method_resolution,
     traits::{FnTrait, Solution, SolutionVariables},
     ApplicationTy, BoundVar, CallableDefId, Canonical, DebruijnIndex, FnSig, GenericPredicate,
@@ -745,6 +743,18 @@ impl Function {
         db.function_data(self.id).name.clone()
     }
 
+    /// Get this function's return type
+    pub fn ret_type(self, db: &dyn HirDatabase) -> Type {
+        let resolver = self.id.resolver(db.upcast());
+        let ret_type = &db.function_data(self.id).ret_type;
+        let ctx = hir_ty::TyLoweringContext::new(db, &resolver);
+        let environment = TraitEnvironment::lower(db, &resolver);
+        Type {
+            krate: self.id.lookup(db.upcast()).container.module(db.upcast()).krate,
+            ty: InEnvironment { value: Ty::from_hir_ext(&ctx, ret_type).0, environment },
+        }
+    }
+
     pub fn self_param(self, db: &dyn HirDatabase) -> Option<SelfParam> {
         if !db.function_data(self.id).has_self_param {
             return None;
@@ -1278,6 +1288,18 @@ impl TypeParam {
         }
     }
 
+    pub fn trait_bounds(self, db: &dyn HirDatabase) -> Vec<Trait> {
+        db.generic_predicates_for_param(self.id)
+            .into_iter()
+            .filter_map(|pred| match &pred.value {
+                hir_ty::GenericPredicate::Implemented(trait_ref) => {
+                    Some(Trait::from(trait_ref.trait_))
+                }
+                _ => None,
+            })
+            .collect()
+    }
+
     pub fn default(self, db: &dyn HirDatabase) -> Option<Type> {
         let params = db.generic_defaults(self.id.parent);
         let local_idx = hir_ty::param_idx(db, self.id)?;
@@ -1293,6 +1315,20 @@ impl TypeParam {
     }
 }
 
+impl HirDisplay for TypeParam {
+    fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
+        write!(f, "{}", self.name(f.db))?;
+        let bounds = f.db.generic_predicates_for_param(self.id);
+        let substs = Substs::type_params(f.db, self.id.parent);
+        let predicates = bounds.iter().cloned().map(|b| b.subst(&substs)).collect::<Vec<_>>();
+        if !(predicates.is_empty() || f.omit_verbose_types()) {
+            write!(f, ": ")?;
+            write_bounds_like_dyn_trait(&predicates, f)?;
+        }
+        Ok(())
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct LifetimeParam {
     pub(crate) id: LifetimeParamId,
@@ -1331,6 +1367,12 @@ impl ConstParam {
     pub fn parent(self, _db: &dyn HirDatabase) -> GenericDef {
         self.id.parent.into()
     }
+
+    pub fn ty(self, db: &dyn HirDatabase) -> Type {
+        let def = self.id.parent;
+        let krate = def.module(db.upcast()).krate;
+        Type::new(db, krate, def, db.const_param_ty(self.id))
+    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -1600,9 +1642,10 @@ impl Type {
     }
 
     pub fn is_fn(&self) -> bool {
-        matches!(&self.ty.value,
-            Ty::Apply(ApplicationTy { ctor: TypeCtor::FnDef(..), .. }) |
-            Ty::Apply(ApplicationTy { ctor: TypeCtor::FnPtr { .. }, .. })
+        matches!(
+            &self.ty.value,
+            Ty::Apply(ApplicationTy { ctor: TypeCtor::FnDef(..), .. })
+                | Ty::Apply(ApplicationTy { ctor: TypeCtor::FnPtr { .. }, .. })
         )
     }
 
diff --git a/crates/hir/src/diagnostics.rs b/crates/hir/src/diagnostics.rs
index b1c924167..447faa04f 100644
--- a/crates/hir/src/diagnostics.rs
+++ b/crates/hir/src/diagnostics.rs
@@ -4,6 +4,6 @@ pub use hir_expand::diagnostics::{
     Diagnostic, DiagnosticCode, DiagnosticSink, DiagnosticSinkBuilder,
 };
 pub use hir_ty::diagnostics::{
-    IncorrectCase, MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr,
+    IncorrectCase, MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkOrSomeInTailExpr,
     NoSuchField, RemoveThisSemicolon,
 };
diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
index e8b581e2f..7ef966cd2 100644
--- a/crates/hir_def/Cargo.toml
+++ b/crates/hir_def/Cargo.toml
@@ -33,4 +33,4 @@ cfg = { path = "../cfg", version = "0.0.0" }
 tt = { path = "../tt", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs
index 6b79e7bad..9e6426b31 100644
--- a/crates/hir_def/src/attr.rs
+++ b/crates/hir_def/src/attr.rs
@@ -2,6 +2,7 @@
 
 use std::{ops, sync::Arc};
 
+use arena::map::ArenaMap;
 use base_db::CrateId;
 use cfg::{CfgExpr, CfgOptions};
 use either::Either;
@@ -21,7 +22,8 @@ use crate::{
     nameres::ModuleSource,
     path::{ModPath, PathKind},
     src::HasChildSource,
-    AdtId, AttrDefId, GenericParamId, Lookup,
+    AdtId, AttrDefId, EnumId, GenericParamId, HasModule, LocalEnumVariantId, LocalFieldId, Lookup,
+    VariantId,
 };
 
 /// Holds documentation
@@ -210,16 +212,10 @@ impl Attrs {
                 }
             }
             AttrDefId::FieldId(it) => {
-                let src = it.parent.child_source(db);
-                match &src.value[it.local_id] {
-                    Either::Left(_tuple) => RawAttrs::default(),
-                    Either::Right(record) => RawAttrs::from_attrs_owner(db, src.with_value(record)),
-                }
+                return db.fields_attrs(it.parent)[it.local_id].clone();
             }
-            AttrDefId::EnumVariantId(var_id) => {
-                let src = var_id.parent.child_source(db);
-                let src = src.as_ref().map(|it| &it[var_id.local_id]);
-                RawAttrs::from_attrs_owner(db, src.map(|it| it as &dyn AttrsOwner))
+            AttrDefId::EnumVariantId(it) => {
+                return db.variants_attrs(it.parent)[it.local_id].clone();
             }
             AttrDefId::AdtId(it) => match it {
                 AdtId::StructId(it) => attrs_from_item_tree(it.lookup(db).id, db),
@@ -259,6 +255,46 @@ impl Attrs {
         raw_attrs.filter(db, def.krate(db))
     }
 
+    pub(crate) fn variants_attrs_query(
+        db: &dyn DefDatabase,
+        e: EnumId,
+    ) -> Arc<ArenaMap<LocalEnumVariantId, Attrs>> {
+        let krate = e.lookup(db).container.module(db).krate;
+        let src = e.child_source(db);
+        let mut res = ArenaMap::default();
+
+        for (id, var) in src.value.iter() {
+            let attrs = RawAttrs::from_attrs_owner(db, src.with_value(var as &dyn AttrsOwner))
+                .filter(db, krate);
+
+            res.insert(id, attrs)
+        }
+
+        Arc::new(res)
+    }
+
+    pub(crate) fn fields_attrs_query(
+        db: &dyn DefDatabase,
+        v: VariantId,
+    ) -> Arc<ArenaMap<LocalFieldId, Attrs>> {
+        let krate = v.module(db).krate;
+        let src = v.child_source(db);
+        let mut res = ArenaMap::default();
+
+        for (id, fld) in src.value.iter() {
+            let attrs = match fld {
+                Either::Left(_tuple) => Attrs::default(),
+                Either::Right(record) => {
+                    RawAttrs::from_attrs_owner(db, src.with_value(record)).filter(db, krate)
+                }
+            };
+
+            res.insert(id, attrs);
+        }
+
+        Arc::new(res)
+    }
+
     pub fn by_key(&self, key: &'static str) -> AttrQuery<'_> {
         AttrQuery { attrs: self, key }
     }
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index 17c72779b..6be1eaade 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
@@ -695,7 +695,7 @@ impl ExprCollector<'_> {
         self.collect_stmts_items(block.statements());
         let statements =
             block.statements().filter_map(|s| self.collect_stmt(s)).flatten().collect();
-        let tail = block.expr().map(|e| self.collect_expr(e));
+        let tail = block.tail_expr().map(|e| self.collect_expr(e));
         self.alloc_expr(Expr::Block { statements, tail, label: None }, syntax_node_ptr)
     }
 
diff --git a/crates/hir_def/src/body/scope.rs b/crates/hir_def/src/body/scope.rs
index 9142bc05b..065785da7 100644
--- a/crates/hir_def/src/body/scope.rs
+++ b/crates/hir_def/src/body/scope.rs
@@ -194,7 +194,7 @@ mod tests {
             let mut buf = String::new();
             let off: usize = offset.into();
             buf.push_str(&code[..off]);
-            buf.push_str("<|>marker");
+            buf.push_str("$0marker");
             buf.push_str(&code[off..]);
             buf
         };
@@ -231,7 +231,7 @@ mod tests {
             r"
             fn quux(foo: i32) {
                 let f = |bar, baz: i32| {
-                    <|>
+                    $0
                 };
             }",
             &["bar", "baz", "foo"],
@@ -243,7 +243,7 @@ mod tests {
         do_check(
             r"
             fn quux() {
-                f(|x| <|> );
+                f(|x| $0 );
             }",
             &["x"],
         );
@@ -254,7 +254,7 @@ mod tests {
         do_check(
             r"
             fn quux() {
-                z.f(|x| <|> );
+                z.f(|x| $0 );
             }",
             &["x"],
         );
@@ -267,7 +267,7 @@ mod tests {
             fn quux() {
                 loop {
                     let x = ();
-                    <|>
+                    $0
                 };
             }",
             &["x"],
@@ -281,7 +281,7 @@ mod tests {
             fn quux() {
                 match () {
                     Some(x) => {
-                        <|>
+                        $0
                     }
                 };
             }",
@@ -294,7 +294,7 @@ mod tests {
         do_check(
             r"
             fn foo(x: String) {
-                let x : &str = &x<|>;
+                let x : &str = &x$0;
             }",
             &["x"],
         );
@@ -307,7 +307,7 @@ mod tests {
 fn foo() {
     match Some(()) {
         opt @ Some(unit) => {
-            <|>
+            $0
         }
         _ => {}
     }
@@ -330,7 +330,7 @@ fn foo() {
 
             fn foo() {
                 mac!();
-                <|>
+                $0
             }
         ",
             &[],
@@ -343,7 +343,7 @@ fn foo() {
             r"
             fn foo() {
                 trait {}
-                <|>
+                $0
             }
         ",
             &[],
@@ -391,7 +391,7 @@ fn foo(x: i32, y: u32) {
         let z = x * 2;
     }
     {
-        let t = x<|> * 3;
+        let t = x$0 * 3;
     }
 }
 "#,
@@ -404,7 +404,7 @@ fn foo(x: i32, y: u32) {
         do_check_local_name(
             r#"
 fn foo(x: String) {
-    let x : &str = &x<|>;
+    let x : &str = &x$0;
 }
 "#,
             7,
@@ -417,7 +417,7 @@ fn foo(x: String) {
             r"
 fn foo(x: String) {
     let x : &str = &x;
-    x<|>
+    x$0
 }
 ",
             28,
@@ -430,7 +430,7 @@ fn foo(x: String) {
             r"
 fn foo() {
     if let Some(&from) = bar() {
-        from<|>;
+        from$0;
     }
 }
 ",
@@ -446,7 +446,7 @@ fn foo() {
 fn test() {
     let foo: Option<f32> = None;
     while let Option::Some(spam) = foo {
-        spam<|>
+        spam$0
     }
 }
 "#,
diff --git a/crates/hir_def/src/db.rs b/crates/hir_def/src/db.rs
index d1a459066..d3bf5b34c 100644
--- a/crates/hir_def/src/db.rs
+++ b/crates/hir_def/src/db.rs
@@ -1,6 +1,7 @@
 //! Defines database & queries for name resolution.
 use std::sync::Arc;
 
+use arena::map::ArenaMap;
 use base_db::{salsa, CrateId, SourceDatabase, Upcast};
 use hir_expand::{db::AstDatabase, HirFileId};
 use syntax::SmolStr;
@@ -16,8 +17,8 @@ use crate::{
     lang_item::{LangItemTarget, LangItems},
     nameres::CrateDefMap,
     AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, FunctionId, FunctionLoc,
-    GenericDefId, ImplId, ImplLoc, StaticId, StaticLoc, StructId, StructLoc, TraitId, TraitLoc,
-    TypeAliasId, TypeAliasLoc, UnionId, UnionLoc,
+    GenericDefId, ImplId, ImplLoc, LocalEnumVariantId, LocalFieldId, StaticId, StaticLoc, StructId,
+    StructLoc, TraitId, TraitLoc, TypeAliasId, TypeAliasLoc, UnionId, UnionLoc, VariantId,
 };
 
 #[salsa::query_group(InternDatabaseStorage)]
@@ -92,6 +93,12 @@ pub trait DefDatabase: InternDatabase + AstDatabase + Upcast<dyn AstDatabase> {
     #[salsa::invoke(GenericParams::generic_params_query)]
     fn generic_params(&self, def: GenericDefId) -> Arc<GenericParams>;
 
+    #[salsa::invoke(Attrs::variants_attrs_query)]
+    fn variants_attrs(&self, def: EnumId) -> Arc<ArenaMap<LocalEnumVariantId, Attrs>>;
+
+    #[salsa::invoke(Attrs::fields_attrs_query)]
+    fn fields_attrs(&self, def: VariantId) -> Arc<ArenaMap<LocalFieldId, Attrs>>;
+
     #[salsa::invoke(Attrs::attrs_query)]
     fn attrs(&self, def: AttrDefId) -> Attrs;
 
diff --git a/crates/hir_def/src/diagnostics.rs b/crates/hir_def/src/diagnostics.rs
index c71266dc0..ab3f059ce 100644
--- a/crates/hir_def/src/diagnostics.rs
+++ b/crates/hir_def/src/diagnostics.rs
@@ -133,6 +133,10 @@ impl Diagnostic for InactiveCode {
 // This diagnostic is shown when a procedural macro can not be found. This usually means that
 // procedural macro support is simply disabled (and hence is only a weak hint instead of an error),
 // but can also indicate project setup problems.
+//
+// If you are seeing a lot of "proc macro not expanded" warnings, you can add this option to the
+// `rust-analyzer.diagnostics.disabled` list to prevent them from showing. Alternatively you can
+// enable support for procedural macros (see `rust-analyzer.procMacro.enable`).
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct UnresolvedProcMacro {
     pub file: HirFileId,
diff --git a/crates/hir_def/src/find_path.rs b/crates/hir_def/src/find_path.rs
index 02613c4c4..4a212d291 100644
--- a/crates/hir_def/src/find_path.rs
+++ b/crates/hir_def/src/find_path.rs
@@ -410,7 +410,7 @@ mod tests {
         let code = r#"
             //- /main.rs
             struct S;
-            <|>
+            $0
         "#;
         check_found_path(code, "S", "S", "crate::S", "self::S");
     }
@@ -420,7 +420,7 @@ mod tests {
         let code = r#"
             //- /main.rs
             enum E { A }
-            <|>
+            $0
         "#;
         check_found_path(code, "E::A", "E::A", "E::A", "E::A");
     }
@@ -432,7 +432,7 @@ mod tests {
             mod foo {
                 pub struct S;
             }
-            <|>
+            $0
         "#;
         check_found_path(code, "foo::S", "foo::S", "crate::foo::S", "self::foo::S");
     }
@@ -446,7 +446,7 @@ mod tests {
             mod bar;
             struct S;
             //- /foo/bar.rs
-            <|>
+            $0
         "#;
         check_found_path(code, "super::S", "super::S", "crate::foo::S", "super::S");
     }
@@ -457,7 +457,7 @@ mod tests {
             //- /main.rs
             mod foo;
             //- /foo.rs
-            <|>
+            $0
         "#;
         check_found_path(code, "self", "self", "crate::foo", "self");
     }
@@ -468,7 +468,7 @@ mod tests {
             //- /main.rs
             mod foo;
             //- /foo.rs
-            <|>
+            $0
         "#;
         check_found_path(code, "crate", "crate", "crate", "crate");
     }
@@ -480,7 +480,7 @@ mod tests {
             mod foo;
             struct S;
             //- /foo.rs
-            <|>
+            $0
         "#;
         check_found_path(code, "crate::S", "crate::S", "crate::S", "crate::S");
     }
@@ -489,7 +489,7 @@ mod tests {
     fn different_crate() {
         let code = r#"
             //- /main.rs crate:main deps:std
-            <|>
+            $0
             //- /std.rs crate:std
             pub struct S;
         "#;
@@ -501,7 +501,7 @@ mod tests {
         let code = r#"
             //- /main.rs crate:main deps:std
             extern crate std as std_renamed;
-            <|>
+            $0
             //- /std.rs crate:std
             pub struct S;
         "#;
@@ -523,7 +523,7 @@ mod tests {
             //- /main.rs crate:main deps:syntax
 
             use syntax::ast;
-            <|>
+            $0
 
             //- /lib.rs crate:syntax
             pub mod ast {
@@ -543,7 +543,7 @@ mod tests {
         let code = r#"
             //- /main.rs crate:main deps:syntax
 
-            <|>
+            $0
 
             //- /lib.rs crate:syntax
             pub mod ast {
@@ -569,7 +569,7 @@ mod tests {
                 mod foo { pub(super) struct S; }
                 pub(crate) use foo::*;
             }
-            <|>
+            $0
         "#;
         check_found_path(code, "bar::S", "bar::S", "crate::bar::S", "self::bar::S");
     }
@@ -582,7 +582,7 @@ mod tests {
                 mod foo { pub(super) struct S; }
                 pub(crate) use foo::S as U;
             }
-            <|>
+            $0
         "#;
         check_found_path(code, "bar::U", "bar::U", "crate::bar::U", "self::bar::U");
     }
@@ -591,7 +591,7 @@ mod tests {
     fn different_crate_reexport() {
         let code = r#"
             //- /main.rs crate:main deps:std
-            <|>
+            $0
             //- /std.rs crate:std deps:core
             pub use core::S;
             //- /core.rs crate:core
@@ -604,7 +604,7 @@ mod tests {
     fn prelude() {
         let code = r#"
             //- /main.rs crate:main deps:std
-            <|>
+            $0
             //- /std.rs crate:std
             pub mod prelude { pub struct S; }
             #[prelude_import]
@@ -617,7 +617,7 @@ mod tests {
     fn enum_variant_from_prelude() {
         let code = r#"
             //- /main.rs crate:main deps:std
-            <|>
+            $0
             //- /std.rs crate:std
             pub mod prelude {
                 pub enum Option<T> { Some(T), None }
@@ -637,7 +637,7 @@ mod tests {
             pub mod foo;
             pub mod baz;
             struct S;
-            <|>
+            $0
             //- /foo.rs
             pub mod bar { pub struct S; }
             //- /baz.rs
@@ -654,7 +654,7 @@ mod tests {
             pub mod bar { pub struct S; }
             use bar::S;
             //- /foo.rs
-            <|>
+            $0
         "#;
         // crate::S would be shorter, but using private imports seems wrong
         check_found_path(code, "crate::bar::S", "crate::bar::S", "crate::bar::S", "crate::bar::S");
@@ -668,7 +668,7 @@ mod tests {
             pub mod bar;
             pub mod baz;
             //- /bar.rs
-            <|>
+            $0
             //- /foo.rs
             pub use super::baz;
             pub struct S;
@@ -683,7 +683,7 @@ mod tests {
         mark::check!(prefer_std_paths);
         let code = r#"
         //- /main.rs crate:main deps:alloc,std
-        <|>
+        $0
 
         //- /std.rs crate:std deps:alloc
         pub mod sync {
@@ -711,7 +711,7 @@ mod tests {
         //- /main.rs crate:main deps:core,std
         #![no_std]
 
-        <|>
+        $0
 
         //- /std.rs crate:std deps:core
 
@@ -740,7 +740,7 @@ mod tests {
         //- /main.rs crate:main deps:alloc,std
         #![no_std]
 
-        <|>
+        $0
 
         //- /std.rs crate:std deps:alloc
 
@@ -767,7 +767,7 @@ mod tests {
     fn prefer_shorter_paths_if_not_alloc() {
         let code = r#"
         //- /main.rs crate:main deps:megaalloc,std
-        <|>
+        $0
 
         //- /std.rs crate:std deps:megaalloc
         pub mod sync {
@@ -790,7 +790,7 @@ mod tests {
     fn builtins_are_in_scope() {
         let code = r#"
         //- /main.rs
-        <|>
+        $0
 
         pub mod primitive {
             pub use u8;
diff --git a/crates/hir_def/src/import_map.rs b/crates/hir_def/src/import_map.rs
index 30b22f51d..e5368b293 100644
--- a/crates/hir_def/src/import_map.rs
+++ b/crates/hir_def/src/import_map.rs
@@ -7,9 +7,8 @@ use fst::{self, Streamer};
 use hir_expand::name::Name;
 use indexmap::{map::Entry, IndexMap};
 use itertools::Itertools;
-use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
-use smallvec::SmallVec;
-use syntax::SmolStr;
+use rustc_hash::{FxHashSet, FxHasher};
+use test_utils::mark;
 
 use crate::{
     db::DefDatabase, item_scope::ItemInNs, visibility::Visibility, AssocItemId, ModuleDefId,
@@ -25,6 +24,8 @@ pub struct ImportInfo {
     pub path: ImportPath,
     /// The module containing this item.
     pub container: ModuleId,
+    /// Whether the import is a trait associated item or not.
+    pub is_trait_assoc_item: bool,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -64,10 +65,6 @@ pub struct ImportMap {
     /// the index of the first one.
     importables: Vec<ItemInNs>,
     fst: fst::Map<Vec<u8>>,
-
-    /// Maps names of associated items to the item's ID. Only includes items whose defining trait is
-    /// exported.
-    assoc_map: FxHashMap<SmolStr, SmallVec<[AssocItemId; 1]>>,
 }
 
 impl ImportMap {
@@ -108,14 +105,27 @@ impl ImportMap {
 
                 for item in per_ns.iter_items() {
                     let path = mk_path();
+                    let path_len = path.len();
+                    let import_info =
+                        ImportInfo { path, container: module, is_trait_assoc_item: false };
+
+                    if let Some(ModuleDefId::TraitId(tr)) = item.as_module_def_id() {
+                        import_map.collect_trait_assoc_items(
+                            db,
+                            tr,
+                            matches!(item, ItemInNs::Types(_)),
+                            &import_info,
+                        );
+                    }
+
                     match import_map.map.entry(item) {
                         Entry::Vacant(entry) => {
-                            entry.insert(ImportInfo { path, container: module });
+                            entry.insert(import_info);
                         }
                         Entry::Occupied(mut entry) => {
                             // If the new path is shorter, prefer that one.
-                            if path.len() < entry.get().path.len() {
-                                *entry.get_mut() = ImportInfo { path, container: module };
+                            if path_len < entry.get().path.len() {
+                                *entry.get_mut() = import_info;
                             } else {
                                 continue;
                             }
@@ -128,11 +138,6 @@ impl ImportMap {
                     if let Some(ModuleDefId::ModuleId(mod_id)) = item.as_module_def_id() {
                         worklist.push((mod_id, mk_path()));
                     }
-
-                    // If we've added a path to a trait, add the trait's methods to the method map.
-                    if let Some(ModuleDefId::TraitId(tr)) = item.as_module_def_id() {
-                        import_map.collect_trait_methods(db, tr);
-                    }
                 }
             }
         }
@@ -153,12 +158,10 @@ impl ImportMap {
                 }
             }
 
-            let start = last_batch_start;
-            last_batch_start = idx + 1;
-
-            let key = fst_path(&importables[start].1.path);
+            let key = fst_path(&importables[last_batch_start].1.path);
+            builder.insert(key, last_batch_start as u64).unwrap();
 
-            builder.insert(key, start as u64).unwrap();
+            last_batch_start = idx + 1;
         }
 
         import_map.fst = fst::Map::new(builder.into_inner().unwrap()).unwrap();
@@ -176,10 +179,34 @@ impl ImportMap {
         self.map.get(&item)
     }
 
-    fn collect_trait_methods(&mut self, db: &dyn DefDatabase, tr: TraitId) {
-        let data = db.trait_data(tr);
-        for (name, item) in data.items.iter() {
-            self.assoc_map.entry(name.to_string().into()).or_default().push(*item);
+    fn collect_trait_assoc_items(
+        &mut self,
+        db: &dyn DefDatabase,
+        tr: TraitId,
+        is_type_in_ns: bool,
+        original_import_info: &ImportInfo,
+    ) {
+        for (assoc_item_name, item) in &db.trait_data(tr).items {
+            let module_def_id = match item {
+                AssocItemId::FunctionId(f) => ModuleDefId::from(*f),
+                AssocItemId::ConstId(c) => ModuleDefId::from(*c),
+                // cannot use associated type aliases directly: need a `<Struct as Trait>::TypeAlias`
+                // qualifier, ergo no need to store it for imports in import_map
+                AssocItemId::TypeAliasId(_) => {
+                    mark::hit!(type_aliases_ignored);
+                    continue;
+                }
+            };
+            let assoc_item = if is_type_in_ns {
+                ItemInNs::Types(module_def_id)
+            } else {
+                ItemInNs::Values(module_def_id)
+            };
+
+            let mut assoc_item_info = original_import_info.clone();
+            assoc_item_info.path.segments.push(assoc_item_name.to_owned());
+            assoc_item_info.is_trait_assoc_item = true;
+            self.map.insert(assoc_item, assoc_item_info);
         }
     }
 }
@@ -302,38 +329,38 @@ impl Query {
         self.exclude_import_kinds.insert(import_kind);
         self
     }
-}
 
-fn contains_query(query: &Query, input_path: &ImportPath, enforce_lowercase: bool) -> bool {
-    let mut input = if query.name_only {
-        input_path.segments.last().unwrap().to_string()
-    } else {
-        input_path.to_string()
-    };
-    if enforce_lowercase || !query.case_sensitive {
-        input.make_ascii_lowercase();
-    }
-
-    let query_string =
-        if !enforce_lowercase && query.case_sensitive { &query.query } else { &query.lowercased };
-
-    match query.search_mode {
-        SearchMode::Equals => &input == query_string,
-        SearchMode::Contains => input.contains(query_string),
-        SearchMode::Fuzzy => {
-            let mut unchecked_query_chars = query_string.chars();
-            let mut mismatching_query_char = unchecked_query_chars.next();
-
-            for input_char in input.chars() {
-                match mismatching_query_char {
-                    None => return true,
-                    Some(matching_query_char) if matching_query_char == input_char => {
-                        mismatching_query_char = unchecked_query_chars.next();
+    fn import_matches(&self, import: &ImportInfo, enforce_lowercase: bool) -> bool {
+        let mut input = if import.is_trait_assoc_item || self.name_only {
+            import.path.segments.last().unwrap().to_string()
+        } else {
+            import.path.to_string()
+        };
+        if enforce_lowercase || !self.case_sensitive {
+            input.make_ascii_lowercase();
+        }
+
+        let query_string =
+            if !enforce_lowercase && self.case_sensitive { &self.query } else { &self.lowercased };
+
+        match self.search_mode {
+            SearchMode::Equals => &input == query_string,
+            SearchMode::Contains => input.contains(query_string),
+            SearchMode::Fuzzy => {
+                let mut unchecked_query_chars = query_string.chars();
+                let mut mismatching_query_char = unchecked_query_chars.next();
+
+                for input_char in input.chars() {
+                    match mismatching_query_char {
+                        None => return true,
+                        Some(matching_query_char) if matching_query_char == input_char => {
+                            mismatching_query_char = unchecked_query_chars.next();
+                        }
+                        _ => (),
                     }
-                    _ => (),
                 }
+                mismatching_query_char.is_none()
             }
-            mismatching_query_char.is_none()
         }
     }
 }
@@ -366,13 +393,13 @@ pub fn search_dependencies<'a>(
             let import_map = &import_maps[indexed_value.index];
             let importables = &import_map.importables[indexed_value.value as usize..];
 
-            // Path shared by the importable items in this group.
-            let common_importables_path = &import_map.map[&importables[0]].path;
-            if !contains_query(&query, common_importables_path, true) {
+            let common_importable_data = &import_map.map[&importables[0]];
+            if !query.import_matches(common_importable_data, true) {
                 continue;
             }
 
-            let common_importables_path_fst = fst_path(common_importables_path);
+            // Path shared by the importable items in this group.
+            let common_importables_path_fst = fst_path(&common_importable_data.path);
             // Add the items from this `ModPath` group. Those are all subsequent items in
             // `importables` whose paths match `path`.
             let iter = importables
@@ -387,7 +414,7 @@ pub fn search_dependencies<'a>(
                 })
                 .filter(|item| {
                     !query.case_sensitive // we've already checked the common importables path case-insensitively
-                        || contains_query(&query, &import_map.map[item].path, false)
+                        || query.import_matches(&import_map.map[item], false)
                 });
             res.extend(iter);
 
@@ -398,19 +425,6 @@ pub fn search_dependencies<'a>(
         }
     }
 
-    // Add all exported associated items whose names match the query (exactly).
-    for map in &import_maps {
-        if let Some(v) = map.assoc_map.get(&*query.query) {
-            res.extend(v.iter().map(|&assoc| {
-                ItemInNs::Types(match assoc {
-                    AssocItemId::FunctionId(it) => it.into(),
-                    AssocItemId::ConstId(it) => it.into(),
-                    AssocItemId::TypeAliasId(it) => it.into(),
-                })
-            }));
-        }
-    }
-
     res
 }
 
@@ -432,9 +446,9 @@ fn item_import_kind(item: ItemInNs) -> Option<ImportKind> {
 mod tests {
     use base_db::{fixture::WithFixture, SourceDatabase, Upcast};
     use expect_test::{expect, Expect};
-    use stdx::format_to;
+    use test_utils::mark;
 
-    use crate::{data::FunctionData, test_db::TestDB, AssocContainerId, Lookup};
+    use crate::{test_db::TestDB, AssocContainerId, Lookup};
 
     use super::*;
 
@@ -451,46 +465,66 @@ mod tests {
 
         let actual = search_dependencies(db.upcast(), krate, query)
             .into_iter()
-            .filter_map(|item| {
-                let mark = match item {
-                    ItemInNs::Types(ModuleDefId::FunctionId(_))
-                    | ItemInNs::Values(ModuleDefId::FunctionId(_)) => "f",
-                    ItemInNs::Types(_) => "t",
-                    ItemInNs::Values(_) => "v",
-                    ItemInNs::Macros(_) => "m",
+            .filter_map(|dependency| {
+                let dependency_krate = dependency.krate(db.upcast())?;
+                let dependency_imports = db.import_map(dependency_krate);
+
+                let (path, mark) = match assoc_item_path(&db, &dependency_imports, dependency) {
+                    Some(assoc_item_path) => (assoc_item_path, "a"),
+                    None => (
+                        dependency_imports.path_of(dependency)?.to_string(),
+                        match dependency {
+                            ItemInNs::Types(ModuleDefId::FunctionId(_))
+                            | ItemInNs::Values(ModuleDefId::FunctionId(_)) => "f",
+                            ItemInNs::Types(_) => "t",
+                            ItemInNs::Values(_) => "v",
+                            ItemInNs::Macros(_) => "m",
+                        },
+                    ),
                 };
-                item.krate(db.upcast()).map(|krate| {
-                    let map = db.import_map(krate);
-
-                    let path = match assoc_to_trait(&db, item) {
-                        Some(trait_) => {
-                            let mut full_path = map.path_of(trait_).unwrap().to_string();
-                            if let ItemInNs::Types(ModuleDefId::FunctionId(function_id))
-                            | ItemInNs::Values(ModuleDefId::FunctionId(function_id)) = item
-                            {
-                                format_to!(
-                                    full_path,
-                                    "::{}",
-                                    FunctionData::fn_data_query(&db, function_id).name,
-                                );
-                            }
-                            full_path
-                        }
-                        None => map.path_of(item).unwrap().to_string(),
-                    };
-
-                    format!(
-                        "{}::{} ({})\n",
-                        crate_graph[krate].display_name.as_ref().unwrap(),
-                        path,
-                        mark
-                    )
-                })
+
+                Some(format!(
+                    "{}::{} ({})\n",
+                    crate_graph[dependency_krate].display_name.as_ref()?,
+                    path,
+                    mark
+                ))
             })
             .collect::<String>();
         expect.assert_eq(&actual)
     }
 
+    fn assoc_item_path(
+        db: &dyn DefDatabase,
+        dependency_imports: &ImportMap,
+        dependency: ItemInNs,
+    ) -> Option<String> {
+        let dependency_assoc_item_id = match dependency {
+            ItemInNs::Types(ModuleDefId::FunctionId(id))
+            | ItemInNs::Values(ModuleDefId::FunctionId(id)) => AssocItemId::from(id),
+            ItemInNs::Types(ModuleDefId::ConstId(id))
+            | ItemInNs::Values(ModuleDefId::ConstId(id)) => AssocItemId::from(id),
+            ItemInNs::Types(ModuleDefId::TypeAliasId(id))
+            | ItemInNs::Values(ModuleDefId::TypeAliasId(id)) => AssocItemId::from(id),
+            _ => return None,
+        };
+
+        let trait_ = assoc_to_trait(db, dependency)?;
+        if let ModuleDefId::TraitId(tr) = trait_.as_module_def_id()? {
+            let trait_data = db.trait_data(tr);
+            let assoc_item_name =
+                trait_data.items.iter().find_map(|(assoc_item_name, assoc_item_id)| {
+                    if &dependency_assoc_item_id == assoc_item_id {
+                        Some(assoc_item_name)
+                    } else {
+                        None
+                    }
+                })?;
+            return Some(format!("{}::{}", dependency_imports.path_of(trait_)?, assoc_item_name));
+        }
+        None
+    }
+
     fn assoc_to_trait(db: &dyn DefDatabase, item: ItemInNs) -> Option<ItemInNs> {
         let assoc: AssocItemId = match item {
             ItemInNs::Types(it) | ItemInNs::Values(it) => match it {
@@ -749,6 +783,37 @@ mod tests {
     }
 
     #[test]
+    fn fuzzy_import_trait_and_assoc_items() {
+        mark::check!(type_aliases_ignored);
+        let ra_fixture = r#"
+        //- /main.rs crate:main deps:dep
+        //- /dep.rs crate:dep
+        pub mod fmt {
+            pub trait Display {
+                type FmtTypeAlias;
+                const FMT_CONST: bool;
+
+                fn format_function();
+                fn format_method(&self);
+            }
+        }
+    "#;
+
+        check_search(
+            ra_fixture,
+            "main",
+            Query::new("fmt".to_string()).search_mode(SearchMode::Fuzzy),
+            expect![[r#"
+                dep::fmt (t)
+                dep::fmt::Display (t)
+                dep::fmt::Display::FMT_CONST (a)
+                dep::fmt::Display::format_function (a)
+                dep::fmt::Display::format_method (a)
+            "#]],
+        );
+    }
+
+    #[test]
     fn search_mode() {
         let ra_fixture = r#"
             //- /main.rs crate:main deps:dep
@@ -784,8 +849,8 @@ mod tests {
                 dep::Fmt (v)
                 dep::Fmt (m)
                 dep::fmt::Display (t)
+                dep::fmt::Display::fmt (a)
                 dep::format (f)
-                dep::fmt::Display::fmt (f)
             "#]],
         );
 
@@ -798,7 +863,7 @@ mod tests {
                 dep::Fmt (t)
                 dep::Fmt (v)
                 dep::Fmt (m)
-                dep::fmt::Display::fmt (f)
+                dep::fmt::Display::fmt (a)
             "#]],
         );
 
@@ -812,7 +877,7 @@ mod tests {
                 dep::Fmt (v)
                 dep::Fmt (m)
                 dep::fmt::Display (t)
-                dep::fmt::Display::fmt (f)
+                dep::fmt::Display::fmt (a)
             "#]],
         );
     }
@@ -853,7 +918,7 @@ mod tests {
                 dep::Fmt (v)
                 dep::Fmt (m)
                 dep::fmt::Display (t)
-                dep::fmt::Display::fmt (f)
+                dep::fmt::Display::fmt (a)
             "#]],
         );
 
@@ -866,7 +931,7 @@ mod tests {
                 dep::Fmt (t)
                 dep::Fmt (v)
                 dep::Fmt (m)
-                dep::fmt::Display::fmt (f)
+                dep::fmt::Display::fmt (a)
             "#]],
         );
     }
diff --git a/crates/hir_def/src/item_scope.rs b/crates/hir_def/src/item_scope.rs
index 62ab3b2bd..2750e1c91 100644
--- a/crates/hir_def/src/item_scope.rs
+++ b/crates/hir_def/src/item_scope.rs
@@ -10,10 +10,9 @@ use once_cell::sync::Lazy;
 use rustc_hash::{FxHashMap, FxHashSet};
 use test_utils::mark;
 
-use crate::ModuleId;
 use crate::{
     db::DefDatabase, per_ns::PerNs, visibility::Visibility, AdtId, BuiltinType, HasModule, ImplId,
-    LocalModuleId, Lookup, MacroDefId, ModuleDefId, TraitId,
+    LocalModuleId, Lookup, MacroDefId, ModuleDefId, ModuleId, TraitId,
 };
 
 #[derive(Copy, Clone)]
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index a636ec77d..77017e4ea 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -13,7 +13,7 @@ use hir_expand::{
     builtin_macro::find_builtin_macro,
     name::{AsName, Name},
     proc_macro::ProcMacroExpander,
-    HirFileId, MacroCallId, MacroDefId, MacroDefKind,
+    HirFileId, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind,
 };
 use hir_expand::{InFile, MacroCallLoc};
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -860,6 +860,37 @@ impl DefCollector<'_> {
     }
 
     fn finish(mut self) -> CrateDefMap {
+        // Emit diagnostics for all remaining unexpanded macros.
+
+        for directive in &self.unexpanded_macros {
+            let mut error = None;
+            directive.ast_id.as_call_id_with_errors(
+                self.db,
+                self.def_map.krate,
+                |path| {
+                    let resolved_res = self.def_map.resolve_path_fp_with_macro(
+                        self.db,
+                        ResolveMode::Other,
+                        directive.module_id,
+                        &path,
+                        BuiltinShadowMode::Module,
+                    );
+                    resolved_res.resolved_def.take_macros()
+                },
+                &mut |e| {
+                    error.get_or_insert(e);
+                },
+            );
+
+            if let Some(err) = error {
+                self.def_map.diagnostics.push(DefDiagnostic::macro_error(
+                    directive.module_id,
+                    MacroCallKind::FnLike(directive.ast_id.ast_id),
+                    err.to_string(),
+                ));
+            }
+        }
+
         // Emit diagnostics for all remaining unresolved imports.
 
         // We'd like to avoid emitting a diagnostics avalanche when some `extern crate` doesn't
diff --git a/crates/hir_def/src/nameres/tests/incremental.rs b/crates/hir_def/src/nameres/tests/incremental.rs
index 8981fa7c9..509e1bbbc 100644
--- a/crates/hir_def/src/nameres/tests/incremental.rs
+++ b/crates/hir_def/src/nameres/tests/incremental.rs
@@ -28,7 +28,7 @@ fn typing_inside_a_function_should_not_invalidate_def_map() {
     check_def_map_is_not_recomputed(
         r"
         //- /lib.rs
-        mod foo;<|>
+        mod foo;$0
 
         use crate::foo::bar::Baz;
 
@@ -81,7 +81,7 @@ fn typing_inside_a_macro_should_not_invalidate_def_map() {
         pub mod bar;
 
         //- /foo/bar.rs
-        <|>
+        $0
         m!(X);
         ",
     );
diff --git a/crates/hir_def/src/path.rs b/crates/hir_def/src/path.rs
index e2bf85bbc..3dd7c3cbb 100644
--- a/crates/hir_def/src/path.rs
+++ b/crates/hir_def/src/path.rs
@@ -305,6 +305,7 @@ pub use hir_expand::name as __name;
 macro_rules! __known_path {
     (core::iter::IntoIterator) => {};
     (core::result::Result) => {};
+    (core::option::Option) => {};
     (core::ops::Range) => {};
     (core::ops::RangeFrom) => {};
     (core::ops::RangeFull) => {};
diff --git a/crates/hir_expand/src/builtin_derive.rs b/crates/hir_expand/src/builtin_derive.rs
index ad378762a..eb257579f 100644
--- a/crates/hir_expand/src/builtin_derive.rs
+++ b/crates/hir_expand/src/builtin_derive.rs
@@ -277,7 +277,7 @@ mod tests {
         let expander = BuiltinDeriveExpander::find_by_name(&name).unwrap();
         let fixture = format!(
             r#"//- /main.rs crate:main deps:core
-<|>
+$0
 {}
 //- /lib.rs crate:core
 // empty
diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs
index 2f44876a8..95d853b6d 100644
--- a/crates/hir_expand/src/name.rs
+++ b/crates/hir_expand/src/name.rs
@@ -164,6 +164,7 @@ pub mod known {
         future,
         result,
         boxed,
+        option,
         // Components of known path (type name)
         Iterator,
         IntoIterator,
@@ -172,6 +173,7 @@ pub mod known {
         Ok,
         Future,
         Result,
+        Option,
         Output,
         Target,
         Box,
diff --git a/crates/hir_expand/src/proc_macro.rs b/crates/hir_expand/src/proc_macro.rs
index 7c77f6ce0..1923daca5 100644
--- a/crates/hir_expand/src/proc_macro.rs
+++ b/crates/hir_expand/src/proc_macro.rs
@@ -58,7 +58,7 @@ impl ProcMacroExpander {
 }
 
 fn eat_punct(cursor: &mut Cursor, c: char) -> bool {
-    if let Some(tt::TokenTree::Leaf(tt::Leaf::Punct(punct))) = cursor.token_tree() {
+    if let Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Punct(punct), _)) = cursor.token_tree() {
         if punct.char == c {
             *cursor = cursor.bump();
             return true;
@@ -68,7 +68,7 @@ fn eat_punct(cursor: &mut Cursor, c: char) -> bool {
 }
 
 fn eat_subtree(cursor: &mut Cursor, kind: tt::DelimiterKind) -> bool {
-    if let Some(tt::TokenTree::Subtree(subtree)) = cursor.token_tree() {
+    if let Some(tt::buffer::TokenTreeRef::Subtree(subtree, _)) = cursor.token_tree() {
         if Some(kind) == subtree.delimiter_kind() {
             *cursor = cursor.bump_subtree();
             return true;
@@ -78,7 +78,7 @@ fn eat_subtree(cursor: &mut Cursor, kind: tt::DelimiterKind) -> bool {
 }
 
 fn eat_ident(cursor: &mut Cursor, t: &str) -> bool {
-    if let Some(tt::TokenTree::Leaf(tt::Leaf::Ident(ident))) = cursor.token_tree() {
+    if let Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Ident(ident), _)) = cursor.token_tree() {
         if t == ident.text.as_str() {
             *cursor = cursor.bump();
             return true;
@@ -88,7 +88,7 @@ fn eat_ident(cursor: &mut Cursor, t: &str) -> bool {
 }
 
 fn remove_derive_attrs(tt: &tt::Subtree) -> Option<tt::Subtree> {
-    let buffer = TokenBuffer::new(&tt.token_trees);
+    let buffer = TokenBuffer::from_tokens(&tt.token_trees);
     let mut p = buffer.begin();
     let mut result = tt::Subtree::default();
 
@@ -106,7 +106,7 @@ fn remove_derive_attrs(tt: &tt::Subtree) -> Option<tt::Subtree> {
             }
         }
 
-        result.token_trees.push(curr.token_tree()?.clone());
+        result.token_trees.push(curr.token_tree()?.cloned());
         p = curr.bump();
     }
 
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index 2dfccd191..b0a453961 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -17,9 +17,9 @@ ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 scoped-tls = "1"
-chalk-solve = { version = "0.45", default-features = false }
-chalk-ir = "0.45"
-chalk-recursive = "0.45"
+chalk-solve = { version = "0.47", default-features = false }
+chalk-ir = "0.47"
+chalk-recursive = "0.47"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 hir_def = { path = "../hir_def", version = "0.0.0" }
@@ -31,7 +31,7 @@ syntax = { path = "../syntax", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] }
 tracing-tree = { version = "0.1.4" }
diff --git a/crates/hir_ty/src/diagnostics.rs b/crates/hir_ty/src/diagnostics.rs
index 14e18f5a1..c67a289f2 100644
--- a/crates/hir_ty/src/diagnostics.rs
+++ b/crates/hir_ty/src/diagnostics.rs
@@ -186,9 +186,10 @@ impl Diagnostic for MissingMatchArms {
     }
 }
 
-// Diagnostic: missing-ok-in-tail-expr
+// Diagnostic: missing-ok-or-some-in-tail-expr
 //
-// This diagnostic is triggered if block that should return `Result` returns a value not wrapped in `Ok`.
+// This diagnostic is triggered if a block that should return `Result` returns a value not wrapped in `Ok`,
+// or if a block that should return `Option` returns a value not wrapped in `Some`.
 //
 // Example:
 //
@@ -198,17 +199,19 @@ impl Diagnostic for MissingMatchArms {
 // }
 // ```
 #[derive(Debug)]
-pub struct MissingOkInTailExpr {
+pub struct MissingOkOrSomeInTailExpr {
     pub file: HirFileId,
     pub expr: AstPtr<ast::Expr>,
+    // `Some` or `Ok` depending on whether the return type is Result or Option
+    pub required: String,
 }
 
-impl Diagnostic for MissingOkInTailExpr {
+impl Diagnostic for MissingOkOrSomeInTailExpr {
     fn code(&self) -> DiagnosticCode {
-        DiagnosticCode("missing-ok-in-tail-expr")
+        DiagnosticCode("missing-ok-or-some-in-tail-expr")
     }
     fn message(&self) -> String {
-        "wrap return expression in Ok".to_string()
+        format!("wrap return expression in {}", self.required)
     }
     fn display_source(&self) -> InFile<SyntaxNodePtr> {
         InFile { file_id: self.file, value: self.expr.clone().into() }
diff --git a/crates/hir_ty/src/diagnostics/expr.rs b/crates/hir_ty/src/diagnostics/expr.rs
index b4e453411..a1c484fdf 100644
--- a/crates/hir_ty/src/diagnostics/expr.rs
+++ b/crates/hir_ty/src/diagnostics/expr.rs
@@ -11,8 +11,8 @@ use crate::{
     db::HirDatabase,
     diagnostics::{
         match_check::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
-        MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
-        RemoveThisSemicolon,
+        MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkOrSomeInTailExpr,
+        MissingPatFields, RemoveThisSemicolon,
     },
     utils::variant_data,
     ApplicationTy, InferenceResult, Ty, TypeCtor,
@@ -306,27 +306,40 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
         };
 
         let core_result_path = path![core::result::Result];
+        let core_option_path = path![core::option::Option];
 
         let resolver = self.owner.resolver(db.upcast());
         let core_result_enum = match resolver.resolve_known_enum(db.upcast(), &core_result_path) {
             Some(it) => it,
             _ => return,
         };
+        let core_option_enum = match resolver.resolve_known_enum(db.upcast(), &core_option_path) {
+            Some(it) => it,
+            _ => return,
+        };
 
         let core_result_ctor = TypeCtor::Adt(AdtId::EnumId(core_result_enum));
-        let params = match &mismatch.expected {
+        let core_option_ctor = TypeCtor::Adt(AdtId::EnumId(core_option_enum));
+
+        let (params, required) = match &mismatch.expected {
             Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_result_ctor => {
-                parameters
+                (parameters, "Ok".to_string())
+            }
+            Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_option_ctor => {
+                (parameters, "Some".to_string())
             }
             _ => return,
         };
 
-        if params.len() == 2 && params[0] == mismatch.actual {
+        if params.len() > 0 && params[0] == mismatch.actual {
             let (_, source_map) = db.body_with_source_map(self.owner.into());
 
             if let Ok(source_ptr) = source_map.expr_syntax(id) {
-                self.sink
-                    .push(MissingOkInTailExpr { file: source_ptr.file_id, expr: source_ptr.value });
+                self.sink.push(MissingOkOrSomeInTailExpr {
+                    file: source_ptr.file_id,
+                    expr: source_ptr.value,
+                    required,
+                });
             }
         }
     }
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 0e827a29e..e9e949c47 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -168,7 +168,7 @@ pub enum DisplayTarget {
 
 impl DisplayTarget {
     fn is_source_code(&self) -> bool {
-        matches!(self, Self::SourceCode {..})
+        matches!(self, Self::SourceCode { .. })
     }
     fn is_test(&self) -> bool {
         matches!(self, Self::Test)
@@ -595,7 +595,7 @@ impl HirDisplay for FnSig {
     }
 }
 
-fn write_bounds_like_dyn_trait(
+pub fn write_bounds_like_dyn_trait(
     predicates: &[GenericPredicate],
     f: &mut HirFormatter,
 ) -> Result<(), HirDisplayError> {
diff --git a/crates/hir_ty/src/tests.rs b/crates/hir_ty/src/tests.rs
index 0a400cb70..3b1675f0b 100644
--- a/crates/hir_ty/src/tests.rs
+++ b/crates/hir_ty/src/tests.rs
@@ -314,7 +314,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
         "
         //- /lib.rs
         fn foo() -> i32 {
-            <|>1 + 1
+            $01 + 1
         }
     ",
     );
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index f1544dbe0..bb28cca4d 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -36,4 +36,4 @@ completion = { path = "../completion", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/ide/src/call_hierarchy.rs b/crates/ide/src/call_hierarchy.rs
index 3c2d39f5d..4d8983cb2 100644
--- a/crates/ide/src/call_hierarchy.rs
+++ b/crates/ide/src/call_hierarchy.rs
@@ -178,7 +178,7 @@ mod tests {
 //- /lib.rs
 fn callee() {}
 fn caller() {
-    call<|>ee();
+    call$0ee();
 }
 "#,
             "callee Function FileId(0) 0..14 3..9",
@@ -192,7 +192,7 @@ fn caller() {
         check_hierarchy(
             r#"
 //- /lib.rs
-fn call<|>ee() {}
+fn call$0ee() {}
 fn caller() {
     callee();
 }
@@ -210,7 +210,7 @@ fn caller() {
 //- /lib.rs
 fn callee() {}
 fn caller() {
-    call<|>ee();
+    call$0ee();
     callee();
 }
 "#,
@@ -227,7 +227,7 @@ fn caller() {
 //- /lib.rs
 fn callee() {}
 fn caller1() {
-    call<|>ee();
+    call$0ee();
 }
 
 fn caller2() {
@@ -250,7 +250,7 @@ fn caller2() {
 //- /lib.rs cfg:test
 fn callee() {}
 fn caller1() {
-    call<|>ee();
+    call$0ee();
 }
 
 #[cfg(test)]
@@ -281,7 +281,7 @@ mod foo;
 use foo::callee;
 
 fn caller() {
-    call<|>ee();
+    call$0ee();
 }
 
 //- /foo/mod.rs
@@ -299,7 +299,7 @@ pub fn callee() {}
             r#"
 //- /lib.rs
 fn callee() {}
-fn call<|>er() {
+fn call$0er() {
     callee();
     callee();
 }
@@ -318,7 +318,7 @@ fn call<|>er() {
 mod foo;
 use foo::callee;
 
-fn call<|>er() {
+fn call$0er() {
     callee();
 }
 
@@ -337,7 +337,7 @@ pub fn callee() {}
             r#"
 //- /lib.rs
 fn caller1() {
-    call<|>er2();
+    call$0er2();
 }
 
 fn caller2() {
@@ -365,7 +365,7 @@ fn a() {
 fn b() {}
 
 fn main() {
-    a<|>()
+    a$0()
 }
 "#,
             "a Function FileId(0) 0..18 3..4",
@@ -376,7 +376,7 @@ fn main() {
         check_hierarchy(
             r#"
 fn a() {
-    b<|>()
+    b$0()
 }
 
 fn b() {}
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 79d126ff2..055c0a79c 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -125,7 +125,7 @@ pub(crate) fn diagnostics(
         .on::<hir::diagnostics::MissingFields, _>(|d| {
             res.borrow_mut().push(diagnostic_with_fix(d, &sema));
         })
-        .on::<hir::diagnostics::MissingOkInTailExpr, _>(|d| {
+        .on::<hir::diagnostics::MissingOkOrSomeInTailExpr, _>(|d| {
             res.borrow_mut().push(diagnostic_with_fix(d, &sema));
         })
         .on::<hir::diagnostics::NoSuchField, _>(|d| {
@@ -305,6 +305,40 @@ mod tests {
     }
 
     #[test]
+    fn test_wrap_return_type_option() {
+        check_fix(
+            r#"
+//- /main.rs crate:main deps:core
+use core::option::Option::{self, Some, None};
+
+fn div(x: i32, y: i32) -> Option<i32> {
+    if y == 0 {
+        return None;
+    }
+    x / y$0
+}
+//- /core/lib.rs crate:core
+pub mod result {
+    pub enum Result<T, E> { Ok(T), Err(E) }
+}
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
+"#,
+            r#"
+use core::option::Option::{self, Some, None};
+
+fn div(x: i32, y: i32) -> Option<i32> {
+    if y == 0 {
+        return None;
+    }
+    Some(x / y)
+}
+"#,
+        );
+    }
+
+    #[test]
     fn test_wrap_return_type() {
         check_fix(
             r#"
@@ -315,12 +349,15 @@ fn div(x: i32, y: i32) -> Result<i32, ()> {
     if y == 0 {
         return Err(());
     }
-    x / y<|>
+    x / y$0
 }
 //- /core/lib.rs crate:core
 pub mod result {
     pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
             r#"
 use core::result::Result::{self, Ok, Err};
@@ -346,12 +383,15 @@ fn div<T>(x: T) -> Result<T, i32> {
     if x == 0 {
         return Err(7);
     }
-    <|>x
+    $0x
 }
 //- /core/lib.rs crate:core
 pub mod result {
     pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
             r#"
 use core::result::Result::{self, Ok, Err};
@@ -379,12 +419,15 @@ fn div(x: i32, y: i32) -> MyResult<i32> {
     if y == 0 {
         return Err(());
     }
-    x <|>/ y
+    x $0/ y
 }
 //- /core/lib.rs crate:core
 pub mod result {
     pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
             r#"
 use core::result::Result::{self, Ok, Err};
@@ -414,12 +457,15 @@ fn foo() -> Result<(), i32> { 0 }
 pub mod result {
     pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
         );
     }
 
     #[test]
-    fn test_wrap_return_type_not_applicable_when_return_type_is_not_result() {
+    fn test_wrap_return_type_not_applicable_when_return_type_is_not_result_or_option() {
         check_no_diagnostics(
             r#"
 //- /main.rs crate:main deps:core
@@ -433,6 +479,9 @@ fn foo() -> SomeOtherEnum { 0 }
 pub mod result {
     pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
         );
     }
@@ -444,7 +493,7 @@ pub mod result {
 struct TestStruct { one: i32, two: i64 }
 
 fn test_fn() {
-    let s = TestStruct {<|>};
+    let s = TestStruct {$0};
 }
 "#,
             r#"
@@ -464,7 +513,7 @@ fn test_fn() {
 struct TestStruct { one: i32 }
 
 impl TestStruct {
-    fn test_fn() { let s = Self {<|>}; }
+    fn test_fn() { let s = Self {$0}; }
 }
 "#,
             r#"
@@ -487,7 +536,7 @@ enum Expr {
 
 impl Expr {
     fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-        Expr::Bin {<|> }
+        Expr::Bin {$0 }
     }
 }
 "#,
@@ -512,7 +561,7 @@ impl Expr {
 struct TestStruct { one: i32, two: i64 }
 
 fn test_fn() {
-    let s = TestStruct{ two: 2<|> };
+    let s = TestStruct{ two: 2$0 };
 }
 "#,
             r"
@@ -608,7 +657,7 @@ fn here() {}
 macro_rules! id { ($($tt:tt)*) => { $($tt)*}; }
 
 fn main() {
-    let _x = id![Foo { a: <|>42 }];
+    let _x = id![Foo { a: $042 }];
 }
 
 pub struct Foo { pub a: i32, pub b: i32 }
@@ -663,7 +712,7 @@ mod a {
         check_fix(
             r"
             mod b {}
-            use {<|>b};
+            use {$0b};
             ",
             r"
             mod b {}
@@ -673,7 +722,7 @@ mod a {
         check_fix(
             r"
             mod b {}
-            use {b<|>};
+            use {b$0};
             ",
             r"
             mod b {}
@@ -683,7 +732,7 @@ mod a {
         check_fix(
             r"
             mod a { mod c {} }
-            use a::{c<|>};
+            use a::{c$0};
             ",
             r"
             mod a { mod c {} }
@@ -693,7 +742,7 @@ mod a {
         check_fix(
             r"
             mod a {}
-            use a::{self<|>};
+            use a::{self$0};
             ",
             r"
             mod a {}
@@ -703,7 +752,7 @@ mod a {
         check_fix(
             r"
             mod a { mod c {} mod d { mod e {} } }
-            use a::{c, d::{e<|>}};
+            use a::{c, d::{e$0}};
             ",
             r"
             mod a { mod c {} mod d { mod e {} } }
@@ -717,7 +766,7 @@ mod a {
         check_fix(
             r"
 fn main() {
-    Foo { bar: 3, baz<|>: false};
+    Foo { bar: 3, baz$0: false};
 }
 struct Foo {
     bar: i32
@@ -743,7 +792,7 @@ struct Foo {
 mod foo;
 
 fn main() {
-    foo::Foo { bar: 3, <|>baz: false};
+    foo::Foo { bar: 3, $0baz: false};
 }
 //- /foo.rs
 struct Foo {
@@ -777,7 +826,7 @@ struct Foo {
     fn test_rename_incorrect_case() {
         check_fix(
             r#"
-pub struct test_struct<|> { one: i32 }
+pub struct test_struct$0 { one: i32 }
 
 pub fn some_fn(val: test_struct) -> test_struct {
     test_struct { one: val.one + 1 }
@@ -794,7 +843,7 @@ pub fn some_fn(val: TestStruct) -> TestStruct {
 
         check_fix(
             r#"
-pub fn some_fn(NonSnakeCase<|>: u8) -> u8 {
+pub fn some_fn(NonSnakeCase$0: u8) -> u8 {
     NonSnakeCase
 }
 "#,
@@ -807,7 +856,7 @@ pub fn some_fn(non_snake_case: u8) -> u8 {
 
         check_fix(
             r#"
-pub fn SomeFn<|>(val: u8) -> u8 {
+pub fn SomeFn$0(val: u8) -> u8 {
     if val != 0 { SomeFn(val - 1) } else { val }
 }
 "#,
@@ -821,7 +870,7 @@ pub fn some_fn(val: u8) -> u8 {
         check_fix(
             r#"
 fn some_fn() {
-    let whatAWeird_Formatting<|> = 10;
+    let whatAWeird_Formatting$0 = 10;
     another_func(whatAWeird_Formatting);
 }
 "#,
@@ -839,7 +888,7 @@ fn some_fn() {
         check_no_diagnostics(
             r#"
 fn foo() {
-    const ANOTHER_ITEM<|>: &str = "some_item";
+    const ANOTHER_ITEM$0: &str = "some_item";
 }
 "#,
         );
@@ -852,7 +901,7 @@ fn foo() {
 pub struct TestStruct;
 
 impl TestStruct {
-    pub fn SomeFn<|>() -> TestStruct {
+    pub fn SomeFn$0() -> TestStruct {
         TestStruct
     }
 }
@@ -871,7 +920,7 @@ impl TestStruct {
 
     #[test]
     fn test_single_incorrect_case_diagnostic_in_function_name_issue_6970() {
-        let input = r#"fn FOO<|>() {}"#;
+        let input = r#"fn FOO$0() {}"#;
         let expected = r#"fn foo() {}"#;
 
         let (analysis, file_position) = fixture::position(input);
diff --git a/crates/ide/src/diagnostics/field_shorthand.rs b/crates/ide/src/diagnostics/field_shorthand.rs
index f41bcd619..16c6ea827 100644
--- a/crates/ide/src/diagnostics/field_shorthand.rs
+++ b/crates/ide/src/diagnostics/field_shorthand.rs
@@ -120,7 +120,7 @@ fn main() { A { 0: 0 } }
 struct A { a: &'static str }
 fn main() {
     let a = "haha";
-    A { a<|>: a }
+    A { a$0: a }
 }
 "#,
             r#"
@@ -138,7 +138,7 @@ struct A { a: &'static str, b: &'static str }
 fn main() {
     let a = "haha";
     let b = "bb";
-    A { a<|>: a, b }
+    A { a$0: a, b }
 }
 "#,
             r#"
@@ -171,7 +171,7 @@ fn f(a: A) { let A { 0: 0 } = a; }
             r#"
 struct A { a: &'static str }
 fn f(a: A) {
-    let A { a<|>: a } = a;
+    let A { a$0: a } = a;
 }
 "#,
             r#"
@@ -186,7 +186,7 @@ fn f(a: A) {
             r#"
 struct A { a: &'static str, b: &'static str }
 fn f(a: A) {
-    let A { a<|>: a, b } = a;
+    let A { a$0: a, b } = a;
 }
 "#,
             r#"
diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs
index ec0f840e9..d7ad88ed5 100644
--- a/crates/ide/src/diagnostics/fixes.rs
+++ b/crates/ide/src/diagnostics/fixes.rs
@@ -3,7 +3,7 @@
 use hir::{
     db::AstDatabase,
     diagnostics::{
-        Diagnostic, IncorrectCase, MissingFields, MissingOkInTailExpr, NoSuchField,
+        Diagnostic, IncorrectCase, MissingFields, MissingOkOrSomeInTailExpr, NoSuchField,
         RemoveThisSemicolon, UnresolvedModule,
     },
     HasSource, HirDisplay, InFile, Semantics, VariantDef,
@@ -94,15 +94,17 @@ impl DiagnosticWithFix for MissingFields {
     }
 }
 
-impl DiagnosticWithFix for MissingOkInTailExpr {
+impl DiagnosticWithFix for MissingOkOrSomeInTailExpr {
     fn fix(&self, sema: &Semantics<RootDatabase>) -> Option<Fix> {
         let root = sema.db.parse_or_expand(self.file)?;
         let tail_expr = self.expr.to_node(&root);
         let tail_expr_range = tail_expr.syntax().text_range();
-        let edit = TextEdit::replace(tail_expr_range, format!("Ok({})", tail_expr.syntax()));
+        let replacement = format!("{}({})", self.required, tail_expr.syntax());
+        let edit = TextEdit::replace(tail_expr_range, replacement);
         let source_change =
             SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into();
-        Some(Fix::new("Wrap with ok", source_change, tail_expr_range))
+        let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" };
+        Some(Fix::new(name, source_change, tail_expr_range))
     }
 }
 
@@ -156,7 +158,6 @@ fn missing_record_expr_field_fix(
     let record_fields = match VariantDef::from(def_id) {
         VariantDef::Struct(s) => {
             module = s.module(sema.db);
-            #[allow(deprecated)]
             let source = s.source(sema.db)?;
             def_file_id = source.file_id;
             let fields = source.value.field_list()?;
@@ -164,14 +165,12 @@ fn missing_record_expr_field_fix(
         }
         VariantDef::Union(u) => {
             module = u.module(sema.db);
-            #[allow(deprecated)]
             let source = u.source(sema.db)?;
             def_file_id = source.file_id;
             source.value.record_field_list()?
         }
         VariantDef::Variant(e) => {
             module = e.module(sema.db);
-            #[allow(deprecated)]
             let source = e.source(sema.db)?;
             def_file_id = source.file_id;
             let fields = source.value.field_list()?;
diff --git a/crates/ide/src/display/short_label.rs b/crates/ide/src/display/short_label.rs
index ea49d9f97..990f740b8 100644
--- a/crates/ide/src/display/short_label.rs
+++ b/crates/ide/src/display/short_label.rs
@@ -87,6 +87,17 @@ impl ShortLabel for ast::Variant {
     }
 }
 
+impl ShortLabel for ast::ConstParam {
+    fn short_label(&self) -> Option<String> {
+        let mut buf = "const ".to_owned();
+        buf.push_str(self.name()?.text().as_str());
+        if let Some(type_ref) = self.ty() {
+            format_to!(buf, ": {}", type_ref.syntax());
+        }
+        Some(buf)
+    }
+}
+
 fn short_label_from_ty<T>(node: &T, ty: Option<ast::Type>, prefix: &str) -> Option<String>
 where
     T: NameOwner + VisibilityOwner,
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 367fac05e..1ff818de2 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -464,7 +464,7 @@ mod tests {
     fn test_doc_url_struct() {
         check(
             r#"
-pub struct Fo<|>o;
+pub struct Fo$0o;
 "#,
             expect![[r#"https://docs.rs/test/*/test/struct.Foo.html"#]],
         );
@@ -474,7 +474,7 @@ pub struct Fo<|>o;
     fn test_doc_url_fn() {
         check(
             r#"
-pub fn fo<|>o() {}
+pub fn fo$0o() {}
 "#,
             expect![[r##"https://docs.rs/test/*/test/fn.foo.html#method.foo"##]],
         );
@@ -487,7 +487,7 @@ pub fn fo<|>o() {}
 pub struct Foo;
 
 impl Foo {
-    pub fn met<|>hod() {}
+    pub fn met$0hod() {}
 }
 
 "#,
@@ -500,7 +500,7 @@ impl Foo {
         check(
             r#"
 pub trait Bar {
-    fn met<|>hod() {}
+    fn met$0hod() {}
 }
 
 "#,
@@ -513,7 +513,7 @@ pub trait Bar {
         check(
             r#"
 pub trait Foo {
-    fn met<|>hod();
+    fn met$0hod();
 }
 
 "#,
@@ -526,7 +526,7 @@ pub trait Foo {
         check(
             r#"
 pub struct Foo {
-    pub fie<|>ld: ()
+    pub fie$0ld: ()
 }
 
 "#,
@@ -539,7 +539,7 @@ pub struct Foo {
         check(
             r#"
 pub mod foo {
-    pub mod ba<|>r {}
+    pub mod ba$0r {}
 }
         "#,
             expect![[r#"https://docs.rs/test/*/test/foo/bar/index.html"#]],
@@ -564,7 +564,7 @@ pub mod wrapper {
 }
 
 fn foo() {
-    let bar: wrapper::It<|>em;
+    let bar: wrapper::It$0em;
 }
         "#,
             expect![[r#"https://docs.rs/test/*/test/wrapper/module/struct.Item.html"#]],
diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs
index 8d75e0f05..ffb3a6f7d 100644
--- a/crates/ide/src/expand_macro.rs
+++ b/crates/ide/src/expand_macro.rs
@@ -144,7 +144,7 @@ macro_rules! foo {
 macro_rules! baz {
     () => { foo!(); }
 }
-f<|>oo!();
+f$0oo!();
 "#,
             expect![[r#"
                 foo
@@ -165,7 +165,7 @@ macro_rules! foo {
         }
     }
 }
-f<|>oo!();
+f$0oo!();
         "#,
             expect![[r#"
             foo
@@ -192,7 +192,7 @@ macro_rules! match_ast {
 }
 
 fn main() {
-    mat<|>ch_ast! {
+    mat$0ch_ast! {
         match container {
             ast::TraitDef(it) => {},
             ast::ImplDef(it) => {},
@@ -226,7 +226,7 @@ macro_rules! match_ast {
 
 fn main() {
     let p = f(|it| {
-        let res = mat<|>ch_ast! { match c {}};
+        let res = mat$0ch_ast! { match c {}};
         Some(res)
     })?;
 }
@@ -250,7 +250,7 @@ macro_rules! foo {
 }
 
 fn main() {
-    let res = fo<|>o!();
+    let res = fo$0o!();
 }
 "#,
             expect![[r#"
@@ -272,7 +272,7 @@ macro_rules! foo {
 }
 
 fn main() {
-    let res = fo<|>o!();
+    let res = fo$0o!();
 }
 "#,
             expect![[r#"
diff --git a/crates/ide/src/extend_selection.rs b/crates/ide/src/extend_selection.rs
index 6f3022dfd..56418c960 100644
--- a/crates/ide/src/extend_selection.rs
+++ b/crates/ide/src/extend_selection.rs
@@ -334,29 +334,29 @@ mod tests {
 
     #[test]
     fn test_extend_selection_arith() {
-        do_check(r#"fn foo() { <|>1 + 1 }"#, &["1", "1 + 1", "{ 1 + 1 }"]);
+        do_check(r#"fn foo() { $01 + 1 }"#, &["1", "1 + 1", "{ 1 + 1 }"]);
     }
 
     #[test]
     fn test_extend_selection_list() {
-        do_check(r#"fn foo(<|>x: i32) {}"#, &["x", "x: i32"]);
-        do_check(r#"fn foo(<|>x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
-        do_check(r#"fn foo(<|>x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,", "(x: i32,y: i32)"]);
-        do_check(r#"fn foo(x: i32, <|>y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
-        do_check(r#"fn foo(x: i32, <|>y: i32, ) {}"#, &["y", "y: i32", "y: i32, "]);
-        do_check(r#"fn foo(x: i32,<|>y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
+        do_check(r#"fn foo($0x: i32) {}"#, &["x", "x: i32"]);
+        do_check(r#"fn foo($0x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
+        do_check(r#"fn foo($0x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,", "(x: i32,y: i32)"]);
+        do_check(r#"fn foo(x: i32, $0y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
+        do_check(r#"fn foo(x: i32, $0y: i32, ) {}"#, &["y", "y: i32", "y: i32, "]);
+        do_check(r#"fn foo(x: i32,$0y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
 
-        do_check(r#"const FOO: [usize; 2] = [ 22<|> , 33];"#, &["22", "22 , "]);
-        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|>];"#, &["33", ", 33"]);
-        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#, &["33", "33 ,", "[ 22 , 33 ,]"]);
+        do_check(r#"const FOO: [usize; 2] = [ 22$0 , 33];"#, &["22", "22 , "]);
+        do_check(r#"const FOO: [usize; 2] = [ 22 , 33$0];"#, &["33", ", 33"]);
+        do_check(r#"const FOO: [usize; 2] = [ 22 , 33$0 ,];"#, &["33", "33 ,", "[ 22 , 33 ,]"]);
 
-        do_check(r#"fn main() { (1, 2<|>) }"#, &["2", ", 2", "(1, 2)"]);
+        do_check(r#"fn main() { (1, 2$0) }"#, &["2", ", 2", "(1, 2)"]);
 
         do_check(
             r#"
 const FOO: [usize; 2] = [
     22,
-    <|>33,
+    $033,
 ]"#,
             &["33", "33,"],
         );
@@ -365,7 +365,7 @@ const FOO: [usize; 2] = [
             r#"
 const FOO: [usize; 2] = [
     22
-    , 33<|>,
+    , 33$0,
 ]"#,
             &["33", "33,"],
         );
@@ -376,7 +376,7 @@ const FOO: [usize; 2] = [
         do_check(
             r#"
 impl S {
-<|>    fn foo() {
+$0    fn foo() {
 
     }
 }"#,
@@ -393,7 +393,7 @@ struct A;
 /// bla
 /// bla
 struct B {
-    <|>
+    $0
 }
             "#,
             &["\n    \n", "{\n    \n}", "/// bla\n/// bla\nstruct B {\n    \n}"],
@@ -407,7 +407,7 @@ struct B {
 fn bar(){}
 
 // fn foo() {
-// 1 + <|>1
+// 1 + $01
 // }
 
 // fn foo(){}
@@ -419,7 +419,7 @@ fn bar(){}
             r#"
 // #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 // pub enum Direction {
-//  <|>   Next,
+//  $0   Next,
 //     Prev
 // }
 "#,
@@ -433,27 +433,27 @@ fn bar(){}
             r#"
 /*
 foo
-_bar1<|>*/
+_bar1$0*/
 "#,
             &["_bar1", "/*\nfoo\n_bar1*/"],
         );
 
-        do_check(r#"//!<|>foo_2 bar"#, &["foo_2", "//!foo_2 bar"]);
+        do_check(r#"//!$0foo_2 bar"#, &["foo_2", "//!foo_2 bar"]);
 
-        do_check(r#"/<|>/foo bar"#, &["//foo bar"]);
+        do_check(r#"/$0/foo bar"#, &["//foo bar"]);
     }
 
     #[test]
     fn test_extend_selection_prefer_idents() {
         do_check(
             r#"
-fn main() { foo<|>+bar;}
+fn main() { foo$0+bar;}
 "#,
             &["foo", "foo+bar"],
         );
         do_check(
             r#"
-fn main() { foo+<|>bar;}
+fn main() { foo+$0bar;}
 "#,
             &["bar", "foo+bar"],
         );
@@ -461,18 +461,18 @@ fn main() { foo+<|>bar;}
 
     #[test]
     fn test_extend_selection_prefer_lifetimes() {
-        do_check(r#"fn foo<<|>'a>() {}"#, &["'a", "<'a>"]);
-        do_check(r#"fn foo<'a<|>>() {}"#, &["'a", "<'a>"]);
+        do_check(r#"fn foo<$0'a>() {}"#, &["'a", "<'a>"]);
+        do_check(r#"fn foo<'a$0>() {}"#, &["'a", "<'a>"]);
     }
 
     #[test]
     fn test_extend_selection_select_first_word() {
-        do_check(r#"// foo bar b<|>az quxx"#, &["baz", "// foo bar baz quxx"]);
+        do_check(r#"// foo bar b$0az quxx"#, &["baz", "// foo bar baz quxx"]);
         do_check(
             r#"
 impl S {
 fn foo() {
-// hel<|>lo world
+// hel$0lo world
 }
 }
 "#,
@@ -486,7 +486,7 @@ fn foo() {
             r#"
 fn bar(){}
 
-" fn f<|>oo() {"
+" fn f$0oo() {"
 "#,
             &["foo", "\" fn foo() {\""],
         );
@@ -499,7 +499,7 @@ fn bar(){}
 fn foo<R>()
     where
         R: req::Request + 'static,
-        R::Params: DeserializeOwned<|> + panic::UnwindSafe + 'static,
+        R::Params: DeserializeOwned$0 + panic::UnwindSafe + 'static,
         R::Result: Serialize + 'static,
 "#,
             &[
@@ -510,26 +510,26 @@ fn foo<R>()
                 "R::Params: DeserializeOwned + panic::UnwindSafe + 'static,",
             ],
         );
-        do_check(r#"fn foo<T>() where T: <|>Copy"#, &["Copy"]);
-        do_check(r#"fn foo<T>() where T: <|>Copy + Display"#, &["Copy", "Copy + "]);
-        do_check(r#"fn foo<T>() where T: <|>Copy +Display"#, &["Copy", "Copy +"]);
-        do_check(r#"fn foo<T>() where T: <|>Copy+Display"#, &["Copy", "Copy+"]);
-        do_check(r#"fn foo<T>() where T: Copy + <|>Display"#, &["Display", "+ Display"]);
-        do_check(r#"fn foo<T>() where T: Copy + <|>Display + Sync"#, &["Display", "Display + "]);
-        do_check(r#"fn foo<T>() where T: Copy +<|>Display"#, &["Display", "+Display"]);
+        do_check(r#"fn foo<T>() where T: $0Copy"#, &["Copy"]);
+        do_check(r#"fn foo<T>() where T: $0Copy + Display"#, &["Copy", "Copy + "]);
+        do_check(r#"fn foo<T>() where T: $0Copy +Display"#, &["Copy", "Copy +"]);
+        do_check(r#"fn foo<T>() where T: $0Copy+Display"#, &["Copy", "Copy+"]);
+        do_check(r#"fn foo<T>() where T: Copy + $0Display"#, &["Display", "+ Display"]);
+        do_check(r#"fn foo<T>() where T: Copy + $0Display + Sync"#, &["Display", "Display + "]);
+        do_check(r#"fn foo<T>() where T: Copy +$0Display"#, &["Display", "+Display"]);
     }
 
     #[test]
     fn test_extend_trait_bounds_list_inline() {
-        do_check(r#"fn foo<T: <|>Copy>() {}"#, &["Copy"]);
-        do_check(r#"fn foo<T: <|>Copy + Display>() {}"#, &["Copy", "Copy + "]);
-        do_check(r#"fn foo<T: <|>Copy +Display>() {}"#, &["Copy", "Copy +"]);
-        do_check(r#"fn foo<T: <|>Copy+Display>() {}"#, &["Copy", "Copy+"]);
-        do_check(r#"fn foo<T: Copy + <|>Display>() {}"#, &["Display", "+ Display"]);
-        do_check(r#"fn foo<T: Copy + <|>Display + Sync>() {}"#, &["Display", "Display + "]);
-        do_check(r#"fn foo<T: Copy +<|>Display>() {}"#, &["Display", "+Display"]);
+        do_check(r#"fn foo<T: $0Copy>() {}"#, &["Copy"]);
+        do_check(r#"fn foo<T: $0Copy + Display>() {}"#, &["Copy", "Copy + "]);
+        do_check(r#"fn foo<T: $0Copy +Display>() {}"#, &["Copy", "Copy +"]);
+        do_check(r#"fn foo<T: $0Copy+Display>() {}"#, &["Copy", "Copy+"]);
+        do_check(r#"fn foo<T: Copy + $0Display>() {}"#, &["Display", "+ Display"]);
+        do_check(r#"fn foo<T: Copy + $0Display + Sync>() {}"#, &["Display", "Display + "]);
+        do_check(r#"fn foo<T: Copy +$0Display>() {}"#, &["Display", "+Display"]);
         do_check(
-            r#"fn foo<T: Copy<|> + Display, U: Copy>() {}"#,
+            r#"fn foo<T: Copy$0 + Display, U: Copy>() {}"#,
             &[
                 "Copy",
                 "Copy + ",
@@ -544,19 +544,19 @@ fn foo<R>()
     #[test]
     fn test_extend_selection_on_tuple_in_type() {
         do_check(
-            r#"fn main() { let _: (krate, <|>_crate_def_map, module_id) = (); }"#,
+            r#"fn main() { let _: (krate, $0_crate_def_map, module_id) = (); }"#,
             &["_crate_def_map", "_crate_def_map, ", "(krate, _crate_def_map, module_id)"],
         );
         // white space variations
         do_check(
-            r#"fn main() { let _: (krate,<|>_crate_def_map,module_id) = (); }"#,
+            r#"fn main() { let _: (krate,$0_crate_def_map,module_id) = (); }"#,
             &["_crate_def_map", "_crate_def_map,", "(krate,_crate_def_map,module_id)"],
         );
         do_check(
             r#"
 fn main() { let _: (
     krate,
-    _crate<|>_def_map,
+    _crate$0_def_map,
     module_id
 ) = (); }"#,
             &[
@@ -570,19 +570,19 @@ fn main() { let _: (
     #[test]
     fn test_extend_selection_on_tuple_in_rvalue() {
         do_check(
-            r#"fn main() { let var = (krate, _crate_def_map<|>, module_id); }"#,
+            r#"fn main() { let var = (krate, _crate_def_map$0, module_id); }"#,
             &["_crate_def_map", "_crate_def_map, ", "(krate, _crate_def_map, module_id)"],
         );
         // white space variations
         do_check(
-            r#"fn main() { let var = (krate,_crate<|>_def_map,module_id); }"#,
+            r#"fn main() { let var = (krate,_crate$0_def_map,module_id); }"#,
             &["_crate_def_map", "_crate_def_map,", "(krate,_crate_def_map,module_id)"],
         );
         do_check(
             r#"
 fn main() { let var = (
     krate,
-    _crate_def_map<|>,
+    _crate_def_map$0,
     module_id
 ); }"#,
             &[
@@ -596,19 +596,19 @@ fn main() { let var = (
     #[test]
     fn test_extend_selection_on_tuple_pat() {
         do_check(
-            r#"fn main() { let (krate, _crate_def_map<|>, module_id) = var; }"#,
+            r#"fn main() { let (krate, _crate_def_map$0, module_id) = var; }"#,
             &["_crate_def_map", "_crate_def_map, ", "(krate, _crate_def_map, module_id)"],
         );
         // white space variations
         do_check(
-            r#"fn main() { let (krate,_crate<|>_def_map,module_id) = var; }"#,
+            r#"fn main() { let (krate,_crate$0_def_map,module_id) = var; }"#,
             &["_crate_def_map", "_crate_def_map,", "(krate,_crate_def_map,module_id)"],
         );
         do_check(
             r#"
 fn main() { let (
     krate,
-    _crate_def_map<|>,
+    _crate_def_map$0,
     module_id
 ) = var; }"#,
             &[
@@ -623,7 +623,7 @@ fn main() { let (
     fn extend_selection_inside_macros() {
         do_check(
             r#"macro_rules! foo { ($item:item) => {$item} }
-                foo!{fn hello(na<|>me:usize){}}"#,
+                foo!{fn hello(na$0me:usize){}}"#,
             &[
                 "name",
                 "name:usize",
@@ -640,7 +640,7 @@ fn main() { let (
         do_check(
             r#" macro_rules! foo2 { ($item:item) => {$item} }
                 macro_rules! foo { ($item:item) => {foo2!($item);} }
-                foo!{fn hello(na<|>me:usize){}}"#,
+                foo!{fn hello(na$0me:usize){}}"#,
             &[
                 "name",
                 "name:usize",
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index eb57f9224..cc8218885 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -20,12 +20,12 @@ pub(crate) fn files(ra_fixture: &str) -> (Analysis, Vec<FileId>) {
     (host.analysis(), change_fixture.files)
 }
 
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) {
     let mut host = AnalysisHost::default();
     let change_fixture = ChangeFixture::parse(ra_fixture);
     host.db.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
     let offset = match range_or_offset {
         RangeOrOffset::Range(_) => panic!(),
         RangeOrOffset::Offset(it) => it,
@@ -33,12 +33,12 @@ pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) {
     (host.analysis(), FilePosition { file_id, offset })
 }
 
-/// Creates analysis for a single file, returns range marked with a pair of <|>.
+/// Creates analysis for a single file, returns range marked with a pair of $0.
 pub(crate) fn range(ra_fixture: &str) -> (Analysis, FileRange) {
     let mut host = AnalysisHost::default();
     let change_fixture = ChangeFixture::parse(ra_fixture);
     host.db.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
     let range = match range_or_offset {
         RangeOrOffset::Range(it) => it,
         RangeOrOffset::Offset(_) => panic!(),
@@ -46,12 +46,12 @@ pub(crate) fn range(ra_fixture: &str) -> (Analysis, FileRange) {
     (host.analysis(), FileRange { file_id, range })
 }
 
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn annotations(ra_fixture: &str) -> (Analysis, FilePosition, Vec<(FileRange, String)>) {
     let mut host = AnalysisHost::default();
     let change_fixture = ChangeFixture::parse(ra_fixture);
     host.db.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
     let offset = match range_or_offset {
         RangeOrOffset::Range(_) => panic!(),
         RangeOrOffset::Offset(it) => it,
diff --git a/crates/ide/src/fn_references.rs b/crates/ide/src/fn_references.rs
index 5cbbe306e..f6e5a522b 100644
--- a/crates/ide/src/fn_references.rs
+++ b/crates/ide/src/fn_references.rs
@@ -34,7 +34,7 @@ mod tests {
     fn test_find_all_methods() {
         let (analysis, pos) = fixture::position(
             r#"
-            fn private_fn() {<|>}
+            fn private_fn() {$0}
 
             pub fn pub_fn() {}
 
@@ -51,7 +51,7 @@ mod tests {
         let (analysis, pos) = fixture::position(
             r#"
             trait Foo {
-                fn bar() {<|>}
+                fn bar() {$0}
                 fn baz() {}
             }
         "#,
@@ -67,7 +67,7 @@ mod tests {
             r#"
             //- /lib.rs
             #[test]
-            fn foo() {<|>}
+            fn foo() {$0}
 
             pub fn pub_fn() {}
 
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs
index 912144f8b..95b4cb9e3 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/crates/ide/src/goto_definition.rs
@@ -166,7 +166,7 @@ mod tests {
         check(
             r#"
             //- /main.rs crate:main deps:std
-            extern crate std<|>;
+            extern crate std$0;
             //- /std/lib.rs crate:std
             // empty
             //^ file
@@ -179,7 +179,7 @@ mod tests {
         check(
             r#"
             //- /main.rs crate:main deps:std
-            extern crate std as abc<|>;
+            extern crate std as abc$0;
             //- /std/lib.rs crate:std
             // empty
             //^ file
@@ -193,7 +193,7 @@ mod tests {
             r#"
 struct Foo;
      //^^^
-enum E { X(Foo<|>) }
+enum E { X(Foo$0) }
 "#,
         );
     }
@@ -204,7 +204,7 @@ enum E { X(Foo<|>) }
             r#"
 struct Foo;
      //^^^
-enum E { X(<|>Foo) }
+enum E { X($0Foo) }
 "#,
         );
     }
@@ -217,7 +217,7 @@ enum E { X(<|>Foo) }
 use a::Foo;
 mod a;
 mod b;
-enum E { X(Foo<|>) }
+enum E { X(Foo$0) }
 
 //- /a.rs
 struct Foo;
@@ -233,7 +233,7 @@ struct Foo;
         check(
             r#"
 //- /lib.rs
-mod <|>foo;
+mod $0foo;
 
 //- /foo.rs
 // empty
@@ -244,7 +244,7 @@ mod <|>foo;
         check(
             r#"
 //- /lib.rs
-mod <|>foo;
+mod $0foo;
 
 //- /foo/mod.rs
 // empty
@@ -260,7 +260,7 @@ mod <|>foo;
 macro_rules! foo { () => { () } }
            //^^^
 fn bar() {
-    <|>foo!();
+    $0foo!();
 }
 "#,
         );
@@ -273,7 +273,7 @@ fn bar() {
 //- /lib.rs
 use foo::foo;
 fn bar() {
-    <|>foo!();
+    $0foo!();
 }
 
 //- /foo/lib.rs
@@ -289,7 +289,7 @@ macro_rules! foo { () => { () } }
         check(
             r#"
 //- /lib.rs
-use foo::foo<|>;
+use foo::foo$0;
 
 //- /foo/lib.rs
 #[macro_export]
@@ -312,7 +312,7 @@ define_fn!(foo);
          //^^^
 
 fn bar() {
-   <|>foo();
+   $0foo();
 }
 "#,
         );
@@ -331,7 +331,7 @@ macro_rules! define_fn {
 //^^^^^^^^^^^^^
 
 fn bar() {
-   <|>foo();
+   $0foo();
 }
 "#,
         );
@@ -347,7 +347,7 @@ macro_rules! foo {() => {0}}
 
 fn bar() {
     match (0,1) {
-        (<|>foo!(), _) => {}
+        ($0foo!(), _) => {}
     }
 }
 "#,
@@ -363,7 +363,7 @@ macro_rules! foo {() => {0}}
            //^^^
 fn bar() {
     match 0 {
-        <|>foo!() => {}
+        $0foo!() => {}
     }
 }
 "#,
@@ -375,7 +375,7 @@ fn bar() {
         check(
             r#"
 //- /lib.rs crate:main deps:foo
-use foo as bar<|>;
+use foo as bar$0;
 
 //- /foo/lib.rs crate:foo
 // empty
@@ -389,7 +389,7 @@ use foo as bar<|>;
         check(
             r#"
 //- /lib.rs crate:main deps:foo
-use foo::foo as bar<|>;
+use foo::foo as bar$0;
 
 //- /foo/lib.rs crate:foo
 #[macro_export]
@@ -410,7 +410,7 @@ impl Foo {
 }
 
 fn bar(foo: &Foo) {
-    foo.frobnicate<|>();
+    foo.frobnicate$0();
 }
 "#,
         );
@@ -425,7 +425,7 @@ struct Foo {
 } //^^^^
 
 fn bar(foo: &Foo) {
-    foo.spam<|>;
+    foo.spam$0;
 }
 "#,
         );
@@ -442,7 +442,7 @@ struct Foo {
 
 fn bar() -> Foo {
     Foo {
-        spam<|>: 0,
+        spam$0: 0,
     }
 }
 "#,
@@ -459,7 +459,7 @@ struct Foo {
 } //^^^^
 
 fn bar(foo: Foo) -> Foo {
-    let Foo { spam<|>: _, } = foo
+    let Foo { spam$0: _, } = foo
 }
 "#,
         );
@@ -474,7 +474,7 @@ struct Foo { spam: u32 }
            //^^^^
 
 fn bar() -> Foo {
-    Foo { spam<|>: m!() }
+    Foo { spam$0: m!() }
 }
 ",
         );
@@ -489,7 +489,7 @@ struct Foo(u32);
 
 fn bar() {
     let foo = Foo(0);
-    foo.<|>0;
+    foo.$00;
 }
 "#,
         );
@@ -505,7 +505,7 @@ impl Foo {
 }    //^^^^^^^^^^
 
 fn bar(foo: &Foo) {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
         );
@@ -520,7 +520,7 @@ trait Foo {
 }    //^^^^^^^^^^
 
 fn bar() {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
         );
@@ -537,7 +537,7 @@ trait Trait {
 impl Trait for Foo {}
 
 fn bar() {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
         );
@@ -551,7 +551,7 @@ struct Foo;
 impl Foo {
    //^^^
     pub fn new() -> Self {
-        Self<|> {}
+        Self$0 {}
     }
 }
 "#,
@@ -561,7 +561,7 @@ impl Foo {
 struct Foo;
 impl Foo {
    //^^^
-    pub fn new() -> Self<|> {
+    pub fn new() -> Self$0 {
         Self {}
     }
 }
@@ -573,7 +573,7 @@ impl Foo {
 enum Foo { A }
 impl Foo {
    //^^^
-    pub fn new() -> Self<|> {
+    pub fn new() -> Self$0 {
         Foo::A
     }
 }
@@ -585,7 +585,7 @@ impl Foo {
 enum Foo { A }
 impl Foo {
    //^^^
-    pub fn thing(a: &Self<|>) {
+    pub fn thing(a: &Self$0) {
     }
 }
 "#,
@@ -603,7 +603,7 @@ trait Make {
 impl Make for Foo {
             //^^^
     fn new() -> Self {
-        Self<|> {}
+        Self$0 {}
     }
 }
 "#,
@@ -617,7 +617,7 @@ trait Make {
 }
 impl Make for Foo {
             //^^^
-    fn new() -> Self<|> {
+    fn new() -> Self$0 {
         Self {}
     }
 }
@@ -629,7 +629,7 @@ impl Make for Foo {
     fn goto_def_when_used_on_definition_name_itself() {
         check(
             r#"
-struct Foo<|> { value: u32 }
+struct Foo$0 { value: u32 }
      //^^^
             "#,
         );
@@ -637,21 +637,21 @@ struct Foo<|> { value: u32 }
         check(
             r#"
 struct Foo {
-    field<|>: string,
+    field$0: string,
 } //^^^^^
 "#,
         );
 
         check(
             r#"
-fn foo_test<|>() { }
+fn foo_test$0() { }
  //^^^^^^^^
 "#,
         );
 
         check(
             r#"
-enum Foo<|> { Variant }
+enum Foo$0 { Variant }
    //^^^
 "#,
         );
@@ -660,7 +660,7 @@ enum Foo<|> { Variant }
             r#"
 enum Foo {
     Variant1,
-    Variant2<|>,
+    Variant2$0,
   //^^^^^^^^
     Variant3,
 }
@@ -669,35 +669,35 @@ enum Foo {
 
         check(
             r#"
-static INNER<|>: &str = "";
+static INNER$0: &str = "";
      //^^^^^
 "#,
         );
 
         check(
             r#"
-const INNER<|>: &str = "";
+const INNER$0: &str = "";
     //^^^^^
 "#,
         );
 
         check(
             r#"
-type Thing<|> = Option<()>;
+type Thing$0 = Option<()>;
    //^^^^^
 "#,
         );
 
         check(
             r#"
-trait Foo<|> { }
+trait Foo$0 { }
     //^^^
 "#,
         );
 
         check(
             r#"
-mod bar<|> { }
+mod bar$0 { }
   //^^^
 "#,
         );
@@ -714,7 +714,7 @@ fn foo() {}
  //^^^
 id! {
     fn bar() {
-        fo<|>o();
+        fo$0o();
     }
 }
 mod confuse_index { fn foo(); }
@@ -743,7 +743,7 @@ pub mod __export {
 fn foo() -> i8 {}
  //^^^
 fn test() {
-    format!("{}", fo<|>o())
+    format!("{}", fo$0o())
 }
 "#,
         );
@@ -761,7 +761,7 @@ macro_rules! include {}
 //^^^^^^^^^^^^^^^^^^^
 
 fn f() {
-    foo<|>();
+    foo$0();
 }
 
 mod confuse_index {
@@ -778,7 +778,7 @@ fn foo() {}
     fn goto_for_type_param() {
         check(
             r#"
-struct Foo<T: Clone> { t: <|>T }
+struct Foo<T: Clone> { t: $0T }
          //^
 "#,
         );
@@ -796,7 +796,7 @@ fn foo() {
     let x = 1;
       //^
     id!({
-        let y = <|>x;
+        let y = $0x;
         let z = y;
     });
 }
@@ -814,7 +814,7 @@ fn foo() {
     id!({
         let y = x;
           //^
-        let z = <|>y;
+        let z = $0y;
     });
 }
 "#,
@@ -829,7 +829,7 @@ fn main() {
     fn foo() {
         let x = 92;
           //^
-        <|>x;
+        $0x;
     }
 }
 "#,
@@ -843,7 +843,7 @@ fn main() {
 fn bar() {
     macro_rules! foo { () => { () } }
                //^^^
-    <|>foo!();
+    $0foo!();
 }
 "#,
         );
@@ -857,7 +857,7 @@ struct Foo { x: i32 }
 fn main() {
     let x = 92;
       //^
-    Foo { x<|> };
+    Foo { x$0 };
 }
 "#,
         )
@@ -872,7 +872,7 @@ enum Foo {
 }       //^
 fn baz(foo: Foo) {
     match foo {
-        Foo::Bar { x<|> } => x
+        Foo::Bar { x$0 } => x
     };
 }
 "#,
@@ -887,7 +887,7 @@ enum Foo { Bar }
          //^^^
 impl Foo {
     fn baz(self) {
-        match self { Self::Bar<|> => {} }
+        match self { Self::Bar$0 => {} }
     }
 }
 "#,
@@ -902,7 +902,7 @@ enum Foo { Bar { val: i32 } }
          //^^^
 impl Foo {
     fn baz(self) -> i32 {
-        match self { Self::Bar<|> { val } => {} }
+        match self { Self::Bar$0 { val } => {} }
     }
 }
 "#,
@@ -916,7 +916,7 @@ impl Foo {
 enum Foo { Bar }
          //^^^
 impl Foo {
-    fn baz(self) { Self::Bar<|>; }
+    fn baz(self) { Self::Bar$0; }
 }
 "#,
         );
@@ -929,7 +929,7 @@ impl Foo {
 enum Foo { Bar { val: i32 } }
          //^^^
 impl Foo {
-    fn baz(self) { Self::Bar<|> {val: 4}; }
+    fn baz(self) { Self::Bar$0 {val: 4}; }
 }
 "#,
         );
@@ -939,7 +939,7 @@ impl Foo {
     fn goto_def_for_type_alias_generic_parameter() {
         check(
             r#"
-type Alias<T> = T<|>;
+type Alias<T> = T$0;
          //^
 "#,
         )
@@ -950,7 +950,7 @@ type Alias<T> = T<|>;
         check(
             r#"
 //- /lib.rs
-foo::module<|>::mac!();
+foo::module$0::mac!();
 
 //- /foo/lib.rs
 pub mod module {
@@ -972,7 +972,7 @@ trait Iterator {
        //^^^^
 }
 
-fn f() -> impl Iterator<Item<|> = u8> {}
+fn f() -> impl Iterator<Item$0 = u8> {}
 "#,
         );
     }
@@ -987,7 +987,7 @@ trait Iterator {
     type B;
 }
 
-fn f() -> impl Iterator<A<|> = u8, B = ()> {}
+fn f() -> impl Iterator<A$0 = u8, B = ()> {}
 "#,
         );
         check(
@@ -998,7 +998,7 @@ trait Iterator {
        //^
 }
 
-fn f() -> impl Iterator<A = u8, B<|> = ()> {}
+fn f() -> impl Iterator<A = u8, B$0 = ()> {}
 "#,
         );
     }
@@ -1012,7 +1012,7 @@ trait Iterator {
        //^^^^
 }
 
-fn g() -> <() as Iterator<Item<|> = ()>>::Item {}
+fn g() -> <() as Iterator<Item$0 = ()>>::Item {}
 "#,
         );
     }
@@ -1027,7 +1027,7 @@ trait Iterator {
     type B;
 }
 
-fn g() -> <() as Iterator<A<|> = (), B = u8>>::B {}
+fn g() -> <() as Iterator<A$0 = (), B = u8>>::B {}
 "#,
         );
         check(
@@ -1038,7 +1038,7 @@ trait Iterator {
        //^
 }
 
-fn g() -> <() as Iterator<A = (), B<|> = u8>>::A {}
+fn g() -> <() as Iterator<A = (), B$0 = u8>>::A {}
 "#,
         );
     }
@@ -1052,7 +1052,7 @@ struct Foo {}
 impl Foo {
     fn bar(self: &Foo) {
          //^^^^
-        let foo = sel<|>f;
+        let foo = sel$0f;
     }
 }"#,
         )
@@ -1065,7 +1065,7 @@ impl Foo {
 struct Foo {}
 
 impl Foo {
-    fn bar(&self<|>) {
+    fn bar(&self$0) {
           //^^^^
     }
 }"#,
@@ -1076,7 +1076,7 @@ impl Foo {
     fn goto_lifetime_param_on_decl() {
         check(
             r#"
-fn foo<'foobar<|>>(_: &'foobar ()) {
+fn foo<'foobar$0>(_: &'foobar ()) {
      //^^^^^^^
 }"#,
         )
@@ -1086,7 +1086,7 @@ fn foo<'foobar<|>>(_: &'foobar ()) {
     fn goto_lifetime_param_decl() {
         check(
             r#"
-fn foo<'foobar>(_: &'foobar<|> ()) {
+fn foo<'foobar>(_: &'foobar$0 ()) {
      //^^^^^^^
 }"#,
         )
@@ -1097,7 +1097,7 @@ fn foo<'foobar>(_: &'foobar<|> ()) {
         check(
             r#"
 fn foo<'foobar>(_: &'foobar ()) {
-    fn foo<'foobar>(_: &'foobar<|> ()) {}
+    fn foo<'foobar>(_: &'foobar$0 ()) {}
          //^^^^^^^
 }"#,
         )
@@ -1108,13 +1108,13 @@ fn foo<'foobar>(_: &'foobar ()) {
     fn goto_lifetime_hrtb() {
         check(
             r#"trait Foo<T> {}
-fn foo<T>() where for<'a> T: Foo<&'a<|> (u8, u16)>, {}
+fn foo<T>() where for<'a> T: Foo<&'a$0 (u8, u16)>, {}
                     //^^
 "#,
         );
         check(
             r#"trait Foo<T> {}
-fn foo<T>() where for<'a<|>> T: Foo<&'a (u8, u16)>, {}
+fn foo<T>() where for<'a$0> T: Foo<&'a (u8, u16)>, {}
                     //^^
 "#,
         );
@@ -1125,7 +1125,7 @@ fn foo<T>() where for<'a<|>> T: Foo<&'a (u8, u16)>, {}
     fn goto_lifetime_hrtb_for_type() {
         check(
             r#"trait Foo<T> {}
-fn foo<T>() where T: for<'a> Foo<&'a<|> (u8, u16)>, {}
+fn foo<T>() where T: for<'a> Foo<&'a$0 (u8, u16)>, {}
                        //^^
 "#,
         );
@@ -1139,7 +1139,7 @@ fn foo<'foo>(_: &'foo ()) {
     'foo: {
   //^^^^
         'bar: loop {
-            break 'foo<|>;
+            break 'foo$0;
         }
     }
 }"#,
diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs
index da9378a97..761a98b2c 100644
--- a/crates/ide/src/goto_implementation.rs
+++ b/crates/ide/src/goto_implementation.rs
@@ -107,7 +107,7 @@ mod tests {
     fn goto_implementation_works() {
         check(
             r#"
-struct Foo<|>;
+struct Foo$0;
 impl Foo {}
    //^^^
 "#,
@@ -118,7 +118,7 @@ impl Foo {}
     fn goto_implementation_works_multiple_blocks() {
         check(
             r#"
-struct Foo<|>;
+struct Foo$0;
 impl Foo {}
    //^^^
 impl Foo {}
@@ -131,7 +131,7 @@ impl Foo {}
     fn goto_implementation_works_multiple_mods() {
         check(
             r#"
-struct Foo<|>;
+struct Foo$0;
 mod a {
     impl super::Foo {}
        //^^^^^^^^^^
@@ -149,7 +149,7 @@ mod b {
         check(
             r#"
 //- /lib.rs
-struct Foo<|>;
+struct Foo$0;
 mod a;
 mod b;
 //- /a.rs
@@ -166,7 +166,7 @@ impl crate::Foo {}
     fn goto_implementation_for_trait() {
         check(
             r#"
-trait T<|> {}
+trait T$0 {}
 struct Foo;
 impl T for Foo {}
          //^^^
@@ -179,7 +179,7 @@ impl T for Foo {}
         check(
             r#"
 //- /lib.rs
-trait T<|> {};
+trait T$0 {};
 struct Foo;
 mod a;
 mod b;
@@ -199,7 +199,7 @@ impl crate::T for crate::Foo {}
             r#"
 //- /lib.rs
 trait T {}
-struct Foo<|>;
+struct Foo$0;
 impl Foo {}
    //^^^
 impl T for Foo {}
@@ -216,7 +216,7 @@ impl T for &Foo {}
             r#"
   #[derive(Copy)]
 //^^^^^^^^^^^^^^^
-struct Foo<|>;
+struct Foo$0;
 
 mod marker {
     trait Copy {}
diff --git a/crates/ide/src/goto_type_definition.rs b/crates/ide/src/goto_type_definition.rs
index 7e84e06be..369a59820 100644
--- a/crates/ide/src/goto_type_definition.rs
+++ b/crates/ide/src/goto_type_definition.rs
@@ -76,7 +76,7 @@ mod tests {
 struct Foo;
      //^^^
 fn foo() {
-    let f: Foo; f<|>
+    let f: Foo; f$0
 }
 "#,
         );
@@ -89,7 +89,7 @@ fn foo() {
 struct Foo;
      //^^^
 fn foo() {
-    let f: &Foo; f<|>
+    let f: &Foo; f$0
 }
 "#,
         );
@@ -103,7 +103,7 @@ macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
 struct Foo {}
      //^^^
 id! {
-    fn bar() { let f<|> = Foo {}; }
+    fn bar() { let f$0 = Foo {}; }
 }
 "#,
         );
@@ -115,7 +115,7 @@ id! {
             r#"
 struct Foo;
      //^^^
-fn foo(<|>f: Foo) {}
+fn foo($0f: Foo) {}
 "#,
         );
     }
@@ -129,7 +129,7 @@ struct Foo;
 struct Bar(Foo);
 fn foo() {
     let bar = Bar(Foo);
-    bar.<|>0;
+    bar.$00;
 }
 "#,
         );
@@ -142,7 +142,7 @@ fn foo() {
 struct Foo;
      //^^^
 impl Foo {
-    fn f(&self<|>) {}
+    fn f(&self$0) {}
 }
 "#,
         )
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 2737c900f..8cb4a51d8 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -17,7 +17,7 @@ use crate::{
     doc_links::{remove_links, rewrite_links},
     markdown_remove::remove_markdown,
     markup::Markup,
-    runnables::runnable,
+    runnables::{runnable, runnable_fn},
     FileId, FilePosition, NavigationTarget, RangeInfo, Runnable,
 };
 
@@ -31,19 +31,6 @@ pub struct HoverConfig {
     pub markdown: bool,
 }
 
-impl Default for HoverConfig {
-    fn default() -> Self {
-        Self {
-            implementations: true,
-            run: true,
-            debug: true,
-            goto_type_def: true,
-            links_in_hover: true,
-            markdown: true,
-        }
-    }
-}
-
 impl HoverConfig {
     pub const NO_ACTIONS: Self = Self {
         implementations: false,
@@ -70,7 +57,7 @@ impl HoverConfig {
 #[derive(Debug, Clone)]
 pub enum HoverAction {
     Runnable(Runnable),
-    Implementaion(FilePosition),
+    Implementation(FilePosition),
     GoToType(Vec<HoverGotoTypeData>),
 }
 
@@ -116,12 +103,13 @@ pub(crate) fn hover(
     };
     if let Some(definition) = definition {
         if let Some(markup) = hover_for_definition(db, definition) {
+            let markup = markup.as_str();
             let markup = if !markdown {
-                remove_markdown(&markup.as_str())
+                remove_markdown(markup)
             } else if links_in_hover {
-                rewrite_links(db, &markup.as_str(), &definition)
+                rewrite_links(db, markup, &definition)
             } else {
-                remove_links(&markup.as_str())
+                remove_links(markup)
             };
             res.markup = Markup::from(markup);
             if let Some(action) = show_implementations_action(db, definition) {
@@ -175,22 +163,24 @@ pub(crate) fn hover(
 
 fn show_implementations_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
     fn to_action(nav_target: NavigationTarget) -> HoverAction {
-        HoverAction::Implementaion(FilePosition {
+        HoverAction::Implementation(FilePosition {
             file_id: nav_target.file_id,
             offset: nav_target.focus_or_full_range().start(),
         })
     }
 
-    match def {
-        Definition::ModuleDef(it) => match it {
-            ModuleDef::Adt(Adt::Struct(it)) => Some(to_action(it.try_to_nav(db)?)),
-            ModuleDef::Adt(Adt::Union(it)) => Some(to_action(it.try_to_nav(db)?)),
-            ModuleDef::Adt(Adt::Enum(it)) => Some(to_action(it.try_to_nav(db)?)),
-            ModuleDef::Trait(it) => Some(to_action(it.try_to_nav(db)?)),
-            _ => None,
-        },
+    let adt = match def {
+        Definition::ModuleDef(ModuleDef::Trait(it)) => return it.try_to_nav(db).map(to_action),
+        Definition::ModuleDef(ModuleDef::Adt(it)) => Some(it),
+        Definition::SelfType(it) => it.target_ty(db).as_adt(),
         _ => None,
+    }?;
+    match adt {
+        Adt::Struct(it) => it.try_to_nav(db),
+        Adt::Union(it) => it.try_to_nav(db),
+        Adt::Enum(it) => it.try_to_nav(db),
     }
+    .map(to_action)
 }
 
 fn runnable_action(
@@ -201,22 +191,20 @@ fn runnable_action(
     match def {
         Definition::ModuleDef(it) => match it {
             ModuleDef::Module(it) => match it.definition_source(sema.db).value {
-                ModuleSource::Module(it) => runnable(&sema, it.syntax().clone(), file_id)
-                    .map(|it| HoverAction::Runnable(it)),
+                ModuleSource::Module(it) => {
+                    runnable(&sema, it.syntax().clone()).map(|it| HoverAction::Runnable(it))
+                }
                 _ => None,
             },
-            ModuleDef::Function(it) => {
-                #[allow(deprecated)]
-                let src = it.source(sema.db)?;
+            ModuleDef::Function(func) => {
+                let src = func.source(sema.db)?;
                 if src.file_id != file_id.into() {
                     mark::hit!(hover_macro_generated_struct_fn_doc_comment);
                     mark::hit!(hover_macro_generated_struct_fn_doc_attr);
-
                     return None;
                 }
 
-                runnable(&sema, src.value.syntax().clone(), file_id)
-                    .map(|it| HoverAction::Runnable(it))
+                runnable_fn(&sema, func).map(HoverAction::Runnable)
             }
             _ => None,
         },
@@ -225,45 +213,46 @@ fn runnable_action(
 }
 
 fn goto_type_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
-    match def {
-        Definition::Local(it) => {
-            let mut targets: Vec<ModuleDef> = Vec::new();
-            let mut push_new_def = |item: ModuleDef| {
-                if !targets.contains(&item) {
-                    targets.push(item);
-                }
-            };
-
-            it.ty(db).walk(db, |t| {
-                if let Some(adt) = t.as_adt() {
-                    push_new_def(adt.into());
-                } else if let Some(trait_) = t.as_dyn_trait() {
-                    push_new_def(trait_.into());
-                } else if let Some(traits) = t.as_impl_traits(db) {
-                    traits.into_iter().for_each(|it| push_new_def(it.into()));
-                } else if let Some(trait_) = t.as_associated_type_parent_trait(db) {
-                    push_new_def(trait_.into());
-                }
-            });
-
-            let targets = targets
-                .into_iter()
-                .filter_map(|it| {
-                    Some(HoverGotoTypeData {
-                        mod_path: render_path(
-                            db,
-                            it.module(db)?,
-                            it.name(db).map(|name| name.to_string()),
-                        ),
-                        nav: it.try_to_nav(db)?,
-                    })
-                })
-                .collect();
-
-            Some(HoverAction::GoToType(targets))
+    let mut targets: Vec<ModuleDef> = Vec::new();
+    let mut push_new_def = |item: ModuleDef| {
+        if !targets.contains(&item) {
+            targets.push(item);
         }
-        _ => None,
+    };
+
+    if let Definition::TypeParam(it) = def {
+        it.trait_bounds(db).into_iter().for_each(|it| push_new_def(it.into()));
+    } else {
+        let ty = match def {
+            Definition::Local(it) => it.ty(db),
+            Definition::ConstParam(it) => it.ty(db),
+            _ => return None,
+        };
+
+        ty.walk(db, |t| {
+            if let Some(adt) = t.as_adt() {
+                push_new_def(adt.into());
+            } else if let Some(trait_) = t.as_dyn_trait() {
+                push_new_def(trait_.into());
+            } else if let Some(traits) = t.as_impl_traits(db) {
+                traits.into_iter().for_each(|it| push_new_def(it.into()));
+            } else if let Some(trait_) = t.as_associated_type_parent_trait(db) {
+                push_new_def(trait_.into());
+            }
+        });
     }
+
+    let targets = targets
+        .into_iter()
+        .filter_map(|it| {
+            Some(HoverGotoTypeData {
+                mod_path: render_path(db, it.module(db)?, it.name(db).map(|name| name.to_string())),
+                nav: it.try_to_nav(db)?,
+            })
+        })
+        .collect();
+
+    Some(HoverAction::GoToType(targets))
 }
 
 fn hover_markup(
@@ -331,7 +320,6 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
             from_def_source_labeled(db, it, Some(label), mod_path)
         }
         Definition::Field(def) => {
-            #[allow(deprecated)]
             let src = def.source(db)?.value;
             if let FieldSource::Named(it) = src {
                 from_def_source_labeled(db, def, it.short_label(), mod_path)
@@ -370,10 +358,8 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
         }
         Definition::Label(it) => Some(Markup::fenced_block(&it.name(db))),
         Definition::LifetimeParam(it) => Some(Markup::fenced_block(&it.name(db))),
-        Definition::TypeParam(_) | Definition::ConstParam(_) => {
-            // FIXME: Hover for generic param
-            None
-        }
+        Definition::TypeParam(type_param) => Some(Markup::fenced_block(&type_param.display(db))),
+        Definition::ConstParam(it) => from_def_source(db, it, None),
     };
 
     fn from_def_source<A, D>(db: &RootDatabase, def: D, mod_path: Option<String>) -> Option<Markup>
@@ -381,7 +367,6 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
         D: HasSource<Ast = A> + HasAttrs + Copy,
         A: ShortLabel,
     {
-        #[allow(deprecated)]
         let short_label = def.source(db)?.value.short_label();
         from_def_source_labeled(db, def, short_label, mod_path)
     }
@@ -472,7 +457,7 @@ mod tests {
 pub fn foo() -> u32 { 1 }
 
 fn main() {
-    let foo_test = foo()<|>;
+    let foo_test = foo()$0;
 }
 "#,
             expect![[r#"
@@ -491,7 +476,7 @@ fn main() {
 pub fn foo() -> u32 { 1 }
 
 fn main() {
-    let foo_test = foo()<|>;
+    let foo_test = foo()$0;
 }
 "#,
             expect![[r#"
@@ -521,7 +506,7 @@ fn main() {
         Option::Some(*memo + value)
     };
     let number = 5u32;
-    let mut iter<|> = scan(OtherStruct { i: num }, closure, number);
+    let mut iter$0 = scan(OtherStruct { i: num }, closure, number);
 }
 "#,
             expect![[r#"
@@ -541,7 +526,7 @@ fn main() {
             r#"
 pub fn foo() -> u32 { 1 }
 
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
 "#,
             expect![[r#"
                 *foo*
@@ -573,7 +558,7 @@ mod a;
 mod b;
 mod c;
 
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
         "#,
             expect![[r#"
                 *foo*
@@ -590,7 +575,7 @@ fn main() { let foo_test = fo<|>o(); }
             r#"
 pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str { }
 
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
         "#,
             expect![[r#"
                 *foo*
@@ -610,7 +595,7 @@ fn main() { let foo_test = fo<|>o(); }
     fn hover_shows_fn_signature_on_fn_name() {
         check(
             r#"
-pub fn foo<|>(a: u32, b: u32) -> u32 {}
+pub fn foo$0(a: u32, b: u32) -> u32 {}
 
 fn main() { }
 "#,
@@ -638,7 +623,7 @@ fn main() { }
 /// #
 /// foo(Path::new("hello, world!"))
 /// ```
-pub fn foo<|>(_: &Path) {}
+pub fn foo$0(_: &Path) {}
 
 fn main() { }
 "#,
@@ -671,7 +656,7 @@ fn main() { }
         check(
             r##"
 #[doc = r#"Raw string doc attr"#]
-pub fn foo<|>(_: &Path) {}
+pub fn foo$0(_: &Path) {}
 
 fn main() { }
 "##,
@@ -701,7 +686,7 @@ fn main() { }
 struct Foo { field_a: u32 }
 
 fn main() {
-    let foo = Foo { field_a<|>: 0, };
+    let foo = Foo { field_a$0: 0, };
 }
 "#,
             expect![[r#"
@@ -720,7 +705,7 @@ fn main() {
         // Hovering over the field in the definition
         check(
             r#"
-struct Foo { field_a<|>: u32 }
+struct Foo { field_a$0: u32 }
 
 fn main() {
     let foo = Foo { field_a: 0 };
@@ -743,7 +728,7 @@ fn main() {
     #[test]
     fn hover_const_static() {
         check(
-            r#"const foo<|>: u32 = 123;"#,
+            r#"const foo$0: u32 = 123;"#,
             expect![[r#"
                 *foo*
 
@@ -757,7 +742,7 @@ fn main() {
             "#]],
         );
         check(
-            r#"static foo<|>: u32 = 456;"#,
+            r#"static foo$0: u32 = 456;"#,
             expect![[r#"
                 *foo*
 
@@ -779,7 +764,7 @@ fn main() {
 struct Test<K, T = u8> { k: K, t: T }
 
 fn main() {
-    let zz<|> = Test { t: 23u8, k: 33 };
+    let zz$0 = Test { t: 23u8, k: 33 };
 }"#,
             expect![[r#"
                 *zz*
@@ -798,7 +783,7 @@ fn main() {
 enum Option<T> { Some(T) }
 use Option::Some;
 
-fn main() { So<|>me(12); }
+fn main() { So$0me(12); }
 "#,
             expect![[r#"
                 *Some*
@@ -818,7 +803,7 @@ fn main() { So<|>me(12); }
 enum Option<T> { Some(T) }
 use Option::Some;
 
-fn main() { let b<|>ar = Some(12); }
+fn main() { let b$0ar = Some(12); }
 "#,
             expect![[r#"
                 *bar*
@@ -836,7 +821,7 @@ fn main() { let b<|>ar = Some(12); }
             r#"
 enum Option<T> {
     /// The None variant
-    Non<|>e
+    Non$0e
 }
 "#,
             expect![[r#"
@@ -863,7 +848,7 @@ enum Option<T> {
     Some(T)
 }
 fn main() {
-    let s = Option::Som<|>e(12);
+    let s = Option::Som$0e(12);
 }
 "#,
             expect![[r#"
@@ -887,7 +872,7 @@ fn main() {
     #[test]
     fn hover_for_local_variable() {
         check(
-            r#"fn func(foo: i32) { fo<|>o; }"#,
+            r#"fn func(foo: i32) { fo$0o; }"#,
             expect![[r#"
                 *foo*
 
@@ -901,7 +886,7 @@ fn main() {
     #[test]
     fn hover_for_local_variable_pat() {
         check(
-            r#"fn func(fo<|>o: i32) {}"#,
+            r#"fn func(fo$0o: i32) {}"#,
             expect![[r#"
                 *foo*
 
@@ -915,7 +900,7 @@ fn main() {
     #[test]
     fn hover_local_var_edge() {
         check(
-            r#"fn func(foo: i32) { if true { <|>foo; }; }"#,
+            r#"fn func(foo: i32) { if true { $0foo; }; }"#,
             expect![[r#"
                 *foo*
 
@@ -929,7 +914,7 @@ fn main() {
     #[test]
     fn hover_for_param_edge() {
         check(
-            r#"fn func(<|>foo: i32) {}"#,
+            r#"fn func($0foo: i32) {}"#,
             expect![[r#"
                 *foo*
 
@@ -949,7 +934,7 @@ fn main() {
             trait DerefMut {
                 type Target: ?Sized;
             }
-            fn f(_x<|>: impl Deref<Target=u8> + DerefMut<Target=u8>) {}"#,
+            fn f(_x$0: impl Deref<Target=u8> + DerefMut<Target=u8>) {}"#,
             expect![[r#"
                 *_x*
 
@@ -970,7 +955,7 @@ impl Thing {
     fn new() -> Thing { Thing { x: 0 } }
 }
 
-fn main() { let foo_<|>test = Thing::new(); }
+fn main() { let foo_$0test = Thing::new(); }
             "#,
             expect![[r#"
                 *foo_test*
@@ -994,7 +979,7 @@ mod wrapper {
     }
 }
 
-fn main() { let foo_test = wrapper::Thing::new<|>(); }
+fn main() { let foo_test = wrapper::Thing::new$0(); }
 "#,
             expect![[r#"
                 *new*
@@ -1021,7 +1006,7 @@ impl X {
 
 fn main() {
     match 1 {
-        X::C<|> => {},
+        X::C$0 => {},
         2 => {},
         _ => {}
     };
@@ -1047,7 +1032,7 @@ fn main() {
             r#"
 struct Thing { x: u32 }
 impl Thing {
-    fn new() -> Self { Self<|> { x: 0 } }
+    fn new() -> Self { Self$0 { x: 0 } }
 }
 "#,
             expect![[r#"
@@ -1066,7 +1051,7 @@ impl Thing {
             r#"
 struct Thing { x: u32 }
 impl Thing {
-    fn new() -> Self<|> { Self { x: 0 } }
+    fn new() -> Self$0 { Self { x: 0 } }
 }
 "#,
             expect![[r#"
@@ -1085,7 +1070,7 @@ impl Thing {
             r#"
 enum Thing { A }
 impl Thing {
-    pub fn new() -> Self<|> { Thing::A }
+    pub fn new() -> Self$0 { Thing::A }
 }
 "#,
             expect![[r#"
@@ -1104,7 +1089,7 @@ impl Thing {
             r#"
         enum Thing { A }
         impl Thing {
-            pub fn thing(a: Self<|>) {}
+            pub fn thing(a: Self$0) {}
         }
         "#,
             expect![[r#"
@@ -1129,7 +1114,7 @@ fn x() {}
 
 fn y() {
     let x = 0i32;
-    x<|>;
+    x$0;
 }
 "#,
             expect![[r#"
@@ -1148,7 +1133,7 @@ fn y() {
             r#"
 macro_rules! foo { () => {} }
 
-fn f() { fo<|>o!(); }
+fn f() { fo$0o!(); }
 "#,
             expect![[r#"
                 *foo*
@@ -1167,7 +1152,7 @@ fn f() { fo<|>o!(); }
     #[test]
     fn test_hover_tuple_field() {
         check(
-            r#"struct TS(String, i32<|>);"#,
+            r#"struct TS(String, i32$0);"#,
             expect![[r#"
                 *i32*
 
@@ -1185,7 +1170,7 @@ fn f() { fo<|>o!(); }
 macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
 fn foo() {}
 id! {
-    fn bar() { fo<|>o(); }
+    fn bar() { fo$0o(); }
 }
 "#,
             expect![[r#"
@@ -1207,7 +1192,7 @@ id! {
         check(
             r#"
 macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
-fn foo(bar:u32) { let a = id!(ba<|>r); }
+fn foo(bar:u32) { let a = id!(ba$0r); }
 "#,
             expect![[r#"
                 *bar*
@@ -1225,7 +1210,7 @@ fn foo(bar:u32) { let a = id!(ba<|>r); }
             r#"
 macro_rules! id_deep { ($($tt:tt)*) => { $($tt)* } }
 macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
-fn foo(bar:u32) { let a = id!(ba<|>r); }
+fn foo(bar:u32) { let a = id!(ba$0r); }
 "#,
             expect![[r#"
                 *bar*
@@ -1244,7 +1229,7 @@ fn foo(bar:u32) { let a = id!(ba<|>r); }
 macro_rules! id_deep { ($($tt:tt)*) => { $($tt)* } }
 macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
 fn bar() -> u32 { 0 }
-fn foo() { let a = id!([0u32, bar(<|>)] ); }
+fn foo() { let a = id!([0u32, bar($0)] ); }
 "#,
             expect![[r#"
                 *bar()*
@@ -1262,7 +1247,7 @@ fn foo() { let a = id!([0u32, bar(<|>)] ); }
 macro_rules! arr { ($($tt:tt)*) => { [$($tt)*)] } }
 fn foo() {
     let mastered_for_itunes = "";
-    let _ = arr!("Tr<|>acks", &mastered_for_itunes);
+    let _ = arr!("Tr$0acks", &mastered_for_itunes);
 }
 "#,
             expect![[r#"
@@ -1283,7 +1268,7 @@ macro_rules! assert {}
 
 fn bar() -> bool { true }
 fn foo() {
-    assert!(ba<|>r());
+    assert!(ba$0r());
 }
 "#,
             expect![[r#"
@@ -1308,7 +1293,7 @@ fn foo() {
             macro_rules! format {}
 
             fn foo() {
-                format!("hel<|>lo {}", 0);
+                format!("hel$0lo {}", 0);
             }
             "#,
         );
@@ -1321,7 +1306,7 @@ fn foo() {
 ///　<- `\u{3000}` here
 fn foo() { }
 
-fn bar() { fo<|>o(); }
+fn bar() { fo$0o(); }
 ",
             expect![[r#"
                 *foo*
@@ -1344,7 +1329,7 @@ fn bar() { fo<|>o(); }
     #[test]
     fn test_hover_function_show_qualifiers() {
         check(
-            r#"async fn foo<|>() {}"#,
+            r#"async fn foo$0() {}"#,
             expect![[r#"
                 *foo*
 
@@ -1358,7 +1343,7 @@ fn bar() { fo<|>o(); }
             "#]],
         );
         check(
-            r#"pub const unsafe fn foo<|>() {}"#,
+            r#"pub const unsafe fn foo$0() {}"#,
             expect![[r#"
                 *foo*
 
@@ -1372,7 +1357,7 @@ fn bar() { fo<|>o(); }
             "#]],
         );
         check(
-            r#"pub(crate) async unsafe extern "C" fn foo<|>() {}"#,
+            r#"pub(crate) async unsafe extern "C" fn foo$0() {}"#,
             expect![[r#"
                 *foo*
 
@@ -1390,10 +1375,10 @@ fn bar() { fo<|>o(); }
     #[test]
     fn test_hover_trait_show_qualifiers() {
         check_actions(
-            r"unsafe trait foo<|>() {}",
+            r"unsafe trait foo$0() {}",
             expect![[r#"
                 [
-                    Implementaion(
+                    Implementation(
                         FilePosition {
                             file_id: FileId(
                                 0,
@@ -1411,7 +1396,7 @@ fn bar() { fo<|>o(); }
         check(
             r#"
 //- /main.rs crate:main deps:std
-extern crate st<|>d;
+extern crate st$0d;
 //- /std/lib.rs crate:std
 //! Standard library for this test
 //!
@@ -1429,7 +1414,7 @@ extern crate st<|>d;
         check(
             r#"
 //- /main.rs crate:main deps:std
-extern crate std as ab<|>c;
+extern crate std as ab$0c;
 //- /std/lib.rs crate:std
 //! Standard library for this test
 //!
@@ -1450,7 +1435,7 @@ extern crate std as ab<|>c;
     fn test_hover_mod_with_same_name_as_function() {
         check(
             r#"
-use self::m<|>y::Bar;
+use self::m$0y::Bar;
 mod my { pub struct Bar; }
 
 fn my() {}
@@ -1476,7 +1461,7 @@ fn my() {}
 /// bar docs
 struct Bar;
 
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
             expect![[r#"
                 *Bar*
@@ -1503,7 +1488,7 @@ fn foo() { let bar = Ba<|>r; }
 #[doc = "bar docs"]
 struct Bar;
 
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
             expect![[r#"
                 *Bar*
@@ -1532,7 +1517,7 @@ fn foo() { let bar = Ba<|>r; }
 #[doc = "bar docs 2"]
 struct Bar;
 
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
             expect![[r#"
                 *Bar*
@@ -1560,7 +1545,7 @@ fn foo() { let bar = Ba<|>r; }
             r#"
 pub struct Foo;
 /// [Foo](struct.Foo.html)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1586,7 +1571,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [struct Foo](struct.Foo.html)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1614,7 +1599,7 @@ pub struct B<|>ar
 pub struct Foo;
 pub struct Bar {
     /// [Foo](struct.Foo.html)
-    fie<|>ld: ()
+    fie$0ld: ()
 }
 "#,
             expect![[r#"
@@ -1643,7 +1628,7 @@ pub mod foo {
     pub struct Foo;
 }
 /// [Foo](foo::Foo)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1673,7 +1658,7 @@ pub mod foo {
     pub struct Foo;
 }
 /// [Foo](foo::Foo)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1699,7 +1684,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [Foo]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1725,7 +1710,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [`Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1752,7 +1737,7 @@ pub struct B<|>ar
 pub struct Foo;
 fn Foo() {}
 /// [Foo()]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1778,7 +1763,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [`struct Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1804,7 +1789,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [`struct@Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1832,7 +1817,7 @@ pub struct Foo;
 /// [my Foo][foo]
 ///
 /// [foo]: Foo
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1858,7 +1843,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [external](https://www.google.com)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1885,7 +1870,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [baz](Baz)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1911,7 +1896,7 @@ pub struct B<|>ar
             r#"
 enum E {
     /// [E]
-    V<|> { field: i32 }
+    V$0 { field: i32 }
 }
 "#,
             expect![[r#"
@@ -1938,7 +1923,7 @@ enum E {
             r#"
 struct S {
     /// [`S`]
-    field<|>: i32
+    field$0: i32
 }
 "#,
             expect![[r#"
@@ -1984,7 +1969,7 @@ struct S {
 ///
 /// [`Result`]: ../../std/result/enum.Result.html
 /// [^example]: https://www.example.com/
-pub fn fo<|>o() {}
+pub fn fo$0o() {}
 "#,
             expect![[r#"
                 *foo*
@@ -2041,7 +2026,7 @@ macro_rules! bar {
 
 bar!();
 
-fn foo() { let bar = Bar; bar.fo<|>o(); }
+fn foo() { let bar = Bar; bar.fo$0o(); }
 "#,
             expect![[r#"
                 *foo*
@@ -2079,7 +2064,7 @@ macro_rules! bar {
 
 bar!();
 
-fn foo() { let bar = Bar; bar.fo<|>o(); }
+fn foo() { let bar = Bar; bar.fo$0o(); }
 "#,
             expect![[r#"
                 *foo*
@@ -2102,10 +2087,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
     #[test]
     fn test_hover_trait_has_impl_action() {
         check_actions(
-            r#"trait foo<|>() {}"#,
+            r#"trait foo$0() {}"#,
             expect![[r#"
                 [
-                    Implementaion(
+                    Implementation(
                         FilePosition {
                             file_id: FileId(
                                 0,
@@ -2121,10 +2106,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
     #[test]
     fn test_hover_struct_has_impl_action() {
         check_actions(
-            r"struct foo<|>() {}",
+            r"struct foo$0() {}",
             expect![[r#"
                 [
-                    Implementaion(
+                    Implementation(
                         FilePosition {
                             file_id: FileId(
                                 0,
@@ -2140,10 +2125,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
     #[test]
     fn test_hover_union_has_impl_action() {
         check_actions(
-            r#"union foo<|>() {}"#,
+            r#"union foo$0() {}"#,
             expect![[r#"
                 [
-                    Implementaion(
+                    Implementation(
                         FilePosition {
                             file_id: FileId(
                                 0,
@@ -2159,10 +2144,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
     #[test]
     fn test_hover_enum_has_impl_action() {
         check_actions(
-            r"enum foo<|>() { A, B }",
+            r"enum foo$0() { A, B }",
             expect![[r#"
                 [
-                    Implementaion(
+                    Implementation(
                         FilePosition {
                             file_id: FileId(
                                 0,
@@ -2176,11 +2161,30 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
     }
 
     #[test]
+    fn test_hover_self_has_impl_action() {
+        check_actions(
+            r#"struct foo where Self$0:;"#,
+            expect![[r#"
+                [
+                    Implementation(
+                        FilePosition {
+                            file_id: FileId(
+                                0,
+                            ),
+                            offset: 7,
+                        },
+                    ),
+                ]
+            "#]],
+        );
+    }
+
+    #[test]
     fn test_hover_test_has_action() {
         check_actions(
             r#"
 #[test]
-fn foo_<|>test() {}
+fn foo_$0test() {}
 "#,
             expect![[r#"
                 [
@@ -2215,7 +2219,7 @@ fn foo_<|>test() {}
     fn test_hover_test_mod_has_action() {
         check_actions(
             r#"
-mod tests<|> {
+mod tests$0 {
     #[test]
     fn foo_test() {}
 }
@@ -2250,7 +2254,7 @@ mod tests<|> {
             r#"
 struct S{ f1: u32 }
 
-fn main() { let s<|>t = S{ f1:0 }; }
+fn main() { let s$0t = S{ f1:0 }; }
             "#,
             expect![[r#"
                 [
@@ -2283,7 +2287,7 @@ fn main() { let s<|>t = S{ f1:0 }; }
 struct Arg(u32);
 struct S<T>{ f1: T }
 
-fn main() { let s<|>t = S{ f1:Arg(0) }; }
+fn main() { let s$0t = S{ f1:Arg(0) }; }
 "#,
             expect![[r#"
                 [
@@ -2329,7 +2333,7 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
 struct Arg(u32);
 struct S<T>{ f1: T }
 
-fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
+fn main() { let s$0t = S{ f1: S{ f1: Arg(0) } }; }
             "#,
             expect![[r#"
                 [
@@ -2378,7 +2382,7 @@ mod M {
     pub struct C(u32);
 }
 
-fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
+fn main() { let s$0t = (A(1), B(2), M::C(3) ); }
 "#,
             expect![[r#"
                 [
@@ -2437,7 +2441,7 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
 trait Foo {}
 fn foo() -> impl Foo {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
             expect![[r#"
                 [
@@ -2471,7 +2475,7 @@ trait Foo<T> {}
 struct S;
 fn foo() -> impl Foo<S> {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
             expect![[r#"
                 [
@@ -2518,7 +2522,7 @@ trait Foo {}
 trait Bar {}
 fn foo() -> impl Foo + Bar {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
             "#,
             expect![[r#"
                 [
@@ -2568,7 +2572,7 @@ struct S2 {}
 
 fn foo() -> impl Foo<S1> + Bar<S2> {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
             expect![[r#"
                 [
@@ -2638,7 +2642,7 @@ fn main() { let s<|>t = foo(); }
         check_actions(
             r#"
 trait Foo {}
-fn foo(ar<|>g: &impl Foo) {}
+fn foo(ar$0g: &impl Foo) {}
 "#,
             expect![[r#"
                 [
@@ -2672,7 +2676,7 @@ trait Foo {}
 trait Bar<T> {}
 struct S{}
 
-fn foo(ar<|>g: &impl Foo + Bar<S>) {}
+fn foo(ar$0g: &impl Foo + Bar<S>) {}
 "#,
             expect![[r#"
                 [
@@ -2730,7 +2734,7 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
             r#"
 struct S;
 fn foo() {
-    let fo<|>o = async { S };
+    let fo$0o = async { S };
 }
 
 #[prelude_import] use future::*;
@@ -2782,7 +2786,7 @@ mod future {
             r#"
 trait Foo<T> {}
 struct S {}
-fn foo(ar<|>g: &impl Foo<S>) {}
+fn foo(ar$0g: &impl Foo<S>) {}
 "#,
             expect![[r#"
                 [
@@ -2832,7 +2836,7 @@ impl Foo for S {}
 struct B<T>{}
 fn foo() -> B<dyn Foo> {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
             expect![[r#"
                 [
@@ -2876,7 +2880,7 @@ fn main() { let s<|>t = foo(); }
         check_actions(
             r#"
 trait Foo {}
-fn foo(ar<|>g: &dyn Foo) {}
+fn foo(ar$0g: &dyn Foo) {}
 "#,
             expect![[r#"
                 [
@@ -2908,7 +2912,7 @@ fn foo(ar<|>g: &dyn Foo) {}
             r#"
 trait Foo<T> {}
 struct S {}
-fn foo(ar<|>g: &dyn Foo<S>) {}
+fn foo(ar$0g: &dyn Foo<S>) {}
 "#,
             expect![[r#"
                 [
@@ -2956,7 +2960,7 @@ trait DynTrait<T> {}
 struct B<T> {}
 struct S {}
 
-fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
+fn foo(a$0rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
             "#,
             expect![[r#"
                 [
@@ -3037,7 +3041,7 @@ impl Foo for S { type Item = Bar; }
 
 fn test() -> impl Foo { S {} }
 
-fn main() { let s<|>t = test().get(); }
+fn main() { let s$0t = test().get(); }
 "#,
             expect![[r#"
                 [
@@ -3064,6 +3068,71 @@ fn main() { let s<|>t = test().get(); }
     }
 
     #[test]
+    fn test_hover_const_param_has_goto_type_action() {
+        check_actions(
+            r#"
+struct Bar;
+struct Foo<const BAR: Bar>;
+
+impl<const BAR: Bar> Foo<BAR$0> {}
+"#,
+            expect![[r#"
+                [
+                    GoToType(
+                        [
+                            HoverGotoTypeData {
+                                mod_path: "test::Bar",
+                                nav: NavigationTarget {
+                                    file_id: FileId(
+                                        0,
+                                    ),
+                                    full_range: 0..11,
+                                    focus_range: 7..10,
+                                    name: "Bar",
+                                    kind: Struct,
+                                    description: "struct Bar",
+                                },
+                            },
+                        ],
+                    ),
+                ]
+            "#]],
+        );
+    }
+
+    #[test]
+    fn test_hover_type_param_has_goto_type_action() {
+        check_actions(
+            r#"
+trait Foo {}
+
+fn foo<T: Foo>(t: T$0){}
+"#,
+            expect![[r#"
+                [
+                    GoToType(
+                        [
+                            HoverGotoTypeData {
+                                mod_path: "test::Foo",
+                                nav: NavigationTarget {
+                                    file_id: FileId(
+                                        0,
+                                    ),
+                                    full_range: 0..12,
+                                    focus_range: 6..9,
+                                    name: "Foo",
+                                    kind: Trait,
+                                    description: "trait Foo",
+                                },
+                            },
+                        ],
+                    ),
+                ]
+            "#]],
+        );
+    }
+
+    #[test]
     fn hover_displays_normalized_crate_names() {
         check(
             r#"
@@ -3077,7 +3146,7 @@ pub mod wrapper {
 }
 
 //- /main.rs crate:main deps:name-with-dashes
-fn main() { let foo_test = name_with_dashes::wrapper::Thing::new<|>(); }
+fn main() { let foo_test = name_with_dashes::wrapper::Thing::new$0(); }
 "#,
             expect![[r#"
             *new*
@@ -3103,7 +3172,7 @@ struct S {
 
 fn main() {
     let s = S { f: 0 };
-    let S { f<|> } = &s;
+    let S { f$0 } = &s;
 }
 "#,
             expect![[r#"
@@ -3122,7 +3191,7 @@ fn main() {
             r#"
 struct Foo {}
 impl Foo {
-    fn bar(&sel<|>f) {}
+    fn bar(&sel$0f) {}
 }
 "#,
             expect![[r#"
@@ -3141,7 +3210,7 @@ impl Foo {
 struct Arc<T>(T);
 struct Foo {}
 impl Foo {
-    fn bar(sel<|>f: Arc<Foo>) {}
+    fn bar(sel$0f: Arc<Foo>) {}
 }
 "#,
             expect![[r#"
@@ -3158,7 +3227,7 @@ impl Foo {
         check(
             r#"
 /// Be quick;
-mod Foo<|> {
+mod Foo$0 {
     //! time is mana
 
     /// This comment belongs to the function
@@ -3189,7 +3258,7 @@ mod Foo<|> {
         check(
             r#"
 #[doc = "Be quick;"]
-mod Foo<|> {
+mod Foo$0 {
     #![doc = "time is mana"]
 
     #[doc = "This comment belongs to the function"]
@@ -3220,7 +3289,7 @@ mod Foo<|> {
         check_hover_no_result(
             r#"
 fn no_hover() {
-    // no<|>hover
+    // no$0hover
 }
 "#,
         );
@@ -3231,7 +3300,7 @@ fn no_hover() {
         check(
             r#"
 fn foo() {
-    'label<|>: loop {}
+    'label$0: loop {}
 }
 "#,
             expect![[r#"
@@ -3247,7 +3316,7 @@ fn foo() {
     #[test]
     fn hover_lifetime() {
         check(
-            r#"fn foo<'lifetime>(_: &'lifetime<|> ()) {}"#,
+            r#"fn foo<'lifetime>(_: &'lifetime$0 ()) {}"#,
             expect![[r#"
             *'lifetime*
 
@@ -3257,4 +3326,68 @@ fn foo() {
             "#]],
         );
     }
+
+    #[test]
+    fn hover_type_param() {
+        check(
+            r#"
+struct Foo<T>(T);
+trait Copy {}
+trait Clone {}
+trait Sized {}
+impl<T: Copy + Clone> Foo<T$0> where T: Sized {}
+"#,
+            expect![[r#"
+                *T*
+
+                ```rust
+                T: Copy + Clone + Sized
+                ```
+            "#]],
+        );
+        check(
+            r#"
+struct Foo<T>(T);
+impl<T> Foo<T$0> {}
+"#,
+            expect![[r#"
+                *T*
+
+                ```rust
+                T
+                ```
+                "#]],
+        );
+        // lifetimes aren't being substituted yet
+        check(
+            r#"
+struct Foo<T>(T);
+impl<T: 'static> Foo<T$0> {}
+"#,
+            expect![[r#"
+                *T*
+
+                ```rust
+                T: {error}
+                ```
+                "#]],
+        );
+    }
+
+    #[test]
+    fn hover_const_param() {
+        check(
+            r#"
+struct Foo<const LEN: usize>;
+impl<const LEN: usize> Foo<LEN$0> {}
+"#,
+            expect![[r#"
+                *LEN*
+
+                ```rust
+                const LEN: usize
+                ```
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 65df7979c..fe60abfc8 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -18,12 +18,6 @@ pub struct InlayHintsConfig {
     pub max_length: Option<usize>,
 }
 
-impl Default for InlayHintsConfig {
-    fn default() -> Self {
-        Self { type_hints: true, parameter_hints: true, chaining_hints: true, max_length: None }
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum InlayKind {
     TypeHint,
@@ -433,8 +427,15 @@ mod tests {
 
     use crate::{fixture, inlay_hints::InlayHintsConfig};
 
+    const TEST_CONFIG: InlayHintsConfig = InlayHintsConfig {
+        type_hints: true,
+        parameter_hints: true,
+        chaining_hints: true,
+        max_length: None,
+    };
+
     fn check(ra_fixture: &str) {
-        check_with_config(InlayHintsConfig::default(), ra_fixture);
+        check_with_config(TEST_CONFIG, ra_fixture);
     }
 
     fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) {
@@ -748,7 +749,7 @@ fn main() {
     #[test]
     fn hint_truncation() {
         check_with_config(
-            InlayHintsConfig { max_length: Some(8), ..Default::default() },
+            InlayHintsConfig { max_length: Some(8), ..TEST_CONFIG },
             r#"
 struct Smol<T>(T);
 
@@ -831,7 +832,7 @@ fn main() {
     #[test]
     fn omitted_parameters_hints_heuristics() {
         check_with_config(
-            InlayHintsConfig { max_length: Some(8), ..Default::default() },
+            InlayHintsConfig { max_length: Some(8), ..TEST_CONFIG },
             r#"
 fn map(f: i32) {}
 fn filter(predicate: i32) {}
@@ -924,7 +925,7 @@ fn main() {
     #[test]
     fn unit_structs_have_no_type_hints() {
         check_with_config(
-            InlayHintsConfig { max_length: Some(8), ..Default::default() },
+            InlayHintsConfig { max_length: Some(8), ..TEST_CONFIG },
             r#"
 enum Result<T, E> { Ok(T), Err(E) }
 use Result::*;
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index b5a6f66fd..05380f2a1 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -104,7 +104,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextS
     // Special case that turns something like:
     //
     // ```
-    // my_function({<|>
+    // my_function({$0
     //    <some-expr>
     // })
     // ```
@@ -116,7 +116,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextS
     // ditto for
     //
     // ```
-    // use foo::{<|>
+    // use foo::{$0
     //    bar
     // };
     // ```
@@ -198,8 +198,8 @@ mod tests {
 
     use super::*;
 
-    fn check_join_lines(before: &str, after: &str) {
-        let (before_cursor_pos, before) = extract_offset(before);
+    fn check_join_lines(ra_fixture_before: &str, ra_fixture_after: &str) {
+        let (before_cursor_pos, before) = extract_offset(ra_fixture_before);
         let file = SourceFile::parse(&before).ok().unwrap();
 
         let range = TextRange::empty(before_cursor_pos);
@@ -214,7 +214,7 @@ mod tests {
             .apply_to_offset(before_cursor_pos)
             .expect("cursor position is affected by the edit");
         let actual = add_cursor(&actual, actual_cursor_pos);
-        assert_eq_text!(after, &actual);
+        assert_eq_text!(ra_fixture_after, &actual);
     }
 
     #[test]
@@ -222,13 +222,13 @@ mod tests {
         check_join_lines(
             r"
 fn foo() {
-    <|>foo(1,
+    $0foo(1,
     )
 }
 ",
             r"
 fn foo() {
-    <|>foo(1)
+    $0foo(1)
 }
 ",
         );
@@ -239,14 +239,14 @@ fn foo() {
         check_join_lines(
             r"
 pub fn reparse(&self, edit: &AtomTextEdit) -> File {
-    <|>self.incremental_reparse(edit).unwrap_or_else(|| {
+    $0self.incremental_reparse(edit).unwrap_or_else(|| {
         self.full_reparse(edit)
     })
 }
 ",
             r"
 pub fn reparse(&self, edit: &AtomTextEdit) -> File {
-    <|>self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
+    $0self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
 }
 ",
         );
@@ -257,13 +257,13 @@ pub fn reparse(&self, edit: &AtomTextEdit) -> File {
         check_join_lines(
             r"
 fn foo() {
-    foo(<|>{
+    foo($0{
         92
     })
 }",
             r"
 fn foo() {
-    foo(<|>92)
+    foo($092)
 }",
         );
     }
@@ -274,7 +274,7 @@ fn foo() {
             fn foo() {
                 loop {
                     match x {
-                        92 => <|>{
+                        92 => $0{
                             continue;
                         }
                     }
@@ -285,7 +285,7 @@ fn foo() {
             fn foo() {
                 loop {
                     match x {
-                        92 => <|>continue,
+                        92 => $0continue,
                     }
                 }
             }
@@ -299,7 +299,7 @@ fn foo() {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
             u.foo()
         }
         Err(v) => v,
@@ -308,7 +308,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>u.foo(),
+        Ok(u) => $0u.foo(),
         Err(v) => v,
     }
 }",
@@ -321,7 +321,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo() {
     match ty {
-        <|> Some(ty) => {
+        $0 Some(ty) => {
             match ty {
                 _ => false,
             }
@@ -333,7 +333,7 @@ fn foo() {
             r"
 fn foo() {
     match ty {
-        <|> Some(ty) => match ty {
+        $0 Some(ty) => match ty {
                 _ => false,
             },
         _ => true,
@@ -350,7 +350,7 @@ fn foo() {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
             u.foo()
         },
         Err(v) => v,
@@ -359,7 +359,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>u.foo(),
+        Ok(u) => $0u.foo(),
         Err(v) => v,
     }
 }",
@@ -370,7 +370,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
             u.foo()
         }    ,
         Err(v) => v,
@@ -379,7 +379,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>u.foo()    ,
+        Ok(u) => $0u.foo()    ,
         Err(v) => v,
     }
 }",
@@ -390,7 +390,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
             u.foo()
         }
         ,
@@ -400,7 +400,7 @@ fn foo(e: Result<U, V>) {
             r"
 fn foo(e: Result<U, V>) {
     match e {
-        Ok(u) => <|>u.foo()
+        Ok(u) => $0u.foo()
         ,
         Err(v) => v,
     }
@@ -414,13 +414,13 @@ fn foo(e: Result<U, V>) {
         check_join_lines(
             r"
 fn foo() {
-    let x = (<|>{
+    let x = ($0{
        4
     },);
 }",
             r"
 fn foo() {
-    let x = (<|>4,);
+    let x = ($04,);
 }",
         );
 
@@ -428,13 +428,13 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    let x = (<|>{
+    let x = ($0{
        4
     }   ,);
 }",
             r"
 fn foo() {
-    let x = (<|>4   ,);
+    let x = ($04   ,);
 }",
         );
 
@@ -442,14 +442,14 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    let x = (<|>{
+    let x = ($0{
        4
     }
     ,);
 }",
             r"
 fn foo() {
-    let x = (<|>4
+    let x = ($04
     ,);
 }",
         );
@@ -460,11 +460,11 @@ fn foo() {
         // No space after the '{'
         check_join_lines(
             r"
-<|>use syntax::{
+$0use syntax::{
     TextSize, TextRange,
 };",
             r"
-<|>use syntax::{TextSize, TextRange,
+$0use syntax::{TextSize, TextRange,
 };",
         );
     }
@@ -475,11 +475,11 @@ fn foo() {
         check_join_lines(
             r"
 use syntax::{
-<|>    TextSize, TextRange
+$0    TextSize, TextRange
 };",
             r"
 use syntax::{
-<|>    TextSize, TextRange};",
+$0    TextSize, TextRange};",
         );
     }
 
@@ -489,11 +489,11 @@ use syntax::{
         check_join_lines(
             r"
 use syntax::{
-<|>    TextSize, TextRange,
+$0    TextSize, TextRange,
 };",
             r"
 use syntax::{
-<|>    TextSize, TextRange};",
+$0    TextSize, TextRange};",
         );
     }
 
@@ -502,14 +502,14 @@ use syntax::{
         check_join_lines(
             r"
 use syntax::{
-    algo::<|>{
+    algo::$0{
         find_token_at_offset,
     },
     ast,
 };",
             r"
 use syntax::{
-    algo::<|>find_token_at_offset,
+    algo::$0find_token_at_offset,
     ast,
 };",
         );
@@ -520,13 +520,13 @@ use syntax::{
         check_join_lines(
             r"
 fn foo() {
-    // Hello<|>
+    // Hello$0
     // world!
 }
 ",
             r"
 fn foo() {
-    // Hello<|> world!
+    // Hello$0 world!
 }
 ",
         );
@@ -537,13 +537,13 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    /// Hello<|>
+    /// Hello$0
     /// world!
 }
 ",
             r"
 fn foo() {
-    /// Hello<|> world!
+    /// Hello$0 world!
 }
 ",
         );
@@ -554,13 +554,13 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    //! Hello<|>
+    //! Hello$0
     //! world!
 }
 ",
             r"
 fn foo() {
-    //! Hello<|> world!
+    //! Hello$0 world!
 }
 ",
         );
@@ -571,13 +571,13 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    // Hello<|>
+    // Hello$0
     /* world! */
 }
 ",
             r"
 fn foo() {
-    // Hello<|> world! */
+    // Hello$0 world! */
 }
 ",
         );
@@ -588,7 +588,7 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    // The<|>
+    // The$0
     /* quick
     brown
     fox! */
@@ -596,7 +596,7 @@ fn foo() {
 ",
             r"
 fn foo() {
-    // The<|> quick
+    // The$0 quick
     brown
     fox! */
 }
@@ -604,8 +604,8 @@ fn foo() {
         );
     }
 
-    fn check_join_lines_sel(before: &str, after: &str) {
-        let (sel, before) = extract_range(before);
+    fn check_join_lines_sel(ra_fixture_before: &str, ra_fixture_after: &str) {
+        let (sel, before) = extract_range(ra_fixture_before);
         let parse = SourceFile::parse(&before);
         let result = join_lines(&parse.tree(), sel);
         let actual = {
@@ -613,7 +613,7 @@ fn foo() {
             result.apply(&mut actual);
             actual
         };
-        assert_eq_text!(after, &actual);
+        assert_eq_text!(ra_fixture_after, &actual);
     }
 
     #[test]
@@ -621,10 +621,10 @@ fn foo() {
         check_join_lines_sel(
             r"
 fn foo() {
-    <|>foo(1,
+    $0foo(1,
         2,
         3,
-    <|>)
+    $0)
 }
     ",
             r"
@@ -639,9 +639,9 @@ fn foo() {
     fn test_join_lines_selection_struct() {
         check_join_lines_sel(
             r"
-struct Foo <|>{
+struct Foo $0{
     f: u32,
-}<|>
+}$0
     ",
             r"
 struct Foo { f: u32 }
@@ -654,9 +654,9 @@ struct Foo { f: u32 }
         check_join_lines_sel(
             r"
 fn foo() {
-    join(<|>type_params.type_params()
+    join($0type_params.type_params()
             .filter_map(|it| it.name())
-            .map(|it| it.text())<|>)
+            .map(|it| it.text())$0)
 }",
             r"
 fn foo() {
@@ -671,9 +671,9 @@ fn foo() {
             r"
 pub fn handle_find_matching_brace() {
     params.offsets
-        .map(|offset| <|>{
+        .map(|offset| $0{
             world.analysis().matching_brace(&file, offset).unwrap_or(offset)
-        }<|>)
+        }$0)
         .collect();
 }",
             r"
@@ -691,7 +691,7 @@ pub fn handle_find_matching_brace() {
             r"
 fn main() {
     let _ = {
-        // <|>foo
+        // $0foo
         // bar
         92
     };
@@ -700,7 +700,7 @@ fn main() {
             r"
 fn main() {
     let _ = {
-        // <|>foo bar
+        // $0foo bar
         92
     };
 }
@@ -712,12 +712,12 @@ fn main() {
     fn join_lines_mandatory_blocks_block() {
         check_join_lines(
             r"
-<|>fn foo() {
+$0fn foo() {
     92
 }
         ",
             r"
-<|>fn foo() { 92
+$0fn foo() { 92
 }
         ",
         );
@@ -725,14 +725,14 @@ fn main() {
         check_join_lines(
             r"
 fn foo() {
-    <|>if true {
+    $0if true {
         92
     }
 }
         ",
             r"
 fn foo() {
-    <|>if true { 92
+    $0if true { 92
     }
 }
         ",
@@ -741,14 +741,14 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    <|>loop {
+    $0loop {
         92
     }
 }
         ",
             r"
 fn foo() {
-    <|>loop { 92
+    $0loop { 92
     }
 }
         ",
@@ -757,14 +757,14 @@ fn foo() {
         check_join_lines(
             r"
 fn foo() {
-    <|>unsafe {
+    $0unsafe {
         92
     }
 }
         ",
             r"
 fn foo() {
-    <|>unsafe { 92
+    $0unsafe { 92
     }
 }
         ",
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index a450794f3..cea2a13c8 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -80,10 +80,10 @@ pub use crate::{
         HighlightedRange,
     },
 };
-pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
+pub use assists::{Assist, AssistConfig, AssistId, AssistKind, InsertUseConfig};
 pub use completion::{
-    CompletionConfig, CompletionItem, CompletionItemKind, CompletionResolveCapability,
-    CompletionScore, ImportEdit, InsertTextFormat,
+    CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
+    InsertTextFormat,
 };
 pub use hir::{Documentation, Semantics};
 pub use ide_db::base_db::{
diff --git a/crates/ide/src/matching_brace.rs b/crates/ide/src/matching_brace.rs
index d70248afe..1bfa1439d 100644
--- a/crates/ide/src/matching_brace.rs
+++ b/crates/ide/src/matching_brace.rs
@@ -58,15 +58,15 @@ mod tests {
             assert_eq_text!(after, &actual);
         }
 
-        do_check("struct Foo { a: i32, }<|>", "struct Foo <|>{ a: i32, }");
-        do_check("fn main() { |x: i32|<|> x * 2;}", "fn main() { <|>|x: i32| x * 2;}");
-        do_check("fn main() { <|>|x: i32| x * 2;}", "fn main() { |x: i32<|>| x * 2;}");
+        do_check("struct Foo { a: i32, }$0", "struct Foo $0{ a: i32, }");
+        do_check("fn main() { |x: i32|$0 x * 2;}", "fn main() { $0|x: i32| x * 2;}");
+        do_check("fn main() { $0|x: i32| x * 2;}", "fn main() { |x: i32$0| x * 2;}");
 
         {
             mark::check!(pipes_not_braces);
             do_check(
-                "fn main() { match 92 { 1 | 2 |<|> 3 => 92 } }",
-                "fn main() { match 92 { 1 | 2 |<|> 3 => 92 } }",
+                "fn main() { match 92 { 1 | 2 |$0 3 => 92 } }",
+                "fn main() { match 92 { 1 | 2 |$0 3 => 92 } }",
             );
         }
     }
diff --git a/crates/ide/src/parent_module.rs b/crates/ide/src/parent_module.rs
index be344a09b..d343638fb 100644
--- a/crates/ide/src/parent_module.rs
+++ b/crates/ide/src/parent_module.rs
@@ -74,7 +74,7 @@ mod tests {
             //- /lib.rs
             mod foo;
             //- /foo.rs
-            <|>// empty
+            $0// empty
             ",
         );
         let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
@@ -90,7 +90,7 @@ mod tests {
             mod foo;
 
             //- /foo.rs
-            mod <|>bar;
+            mod $0bar;
 
             //- /foo/bar.rs
             // empty
@@ -107,7 +107,7 @@ mod tests {
             //- /lib.rs
             mod foo {
                 mod bar {
-                    mod baz { <|> }
+                    mod baz { $0 }
                 }
             }
             ",
@@ -123,7 +123,7 @@ mod tests {
 //- /main.rs
 mod foo;
 //- /foo.rs
-<|>
+$0
 "#,
         );
         assert_eq!(analysis.crate_for(file_id).unwrap().len(), 1);
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index fa58fc319..c95ed669c 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -331,7 +331,7 @@ mod tests {
     fn test_struct_literal_after_space() {
         check(
             r#"
-struct Foo <|>{
+struct Foo $0{
     a: i32,
 }
 impl Foo {
@@ -354,7 +354,7 @@ fn main() {
     fn test_struct_literal_before_space() {
         check(
             r#"
-struct Foo<|> {}
+struct Foo$0 {}
     fn main() {
     let f: Foo;
     f = Foo {};
@@ -373,7 +373,7 @@ struct Foo<|> {}
     fn test_struct_literal_with_generic_type() {
         check(
             r#"
-struct Foo<T> <|>{}
+struct Foo<T> $0{}
     fn main() {
     let f: Foo::<i32>;
     f = Foo {};
@@ -391,7 +391,7 @@ struct Foo<T> <|>{}
     fn test_struct_literal_for_tuple() {
         check(
             r#"
-struct Foo<|>(i32);
+struct Foo$0(i32);
 
 fn main() {
     let f: Foo;
@@ -410,7 +410,7 @@ fn main() {
     fn test_enum_after_space() {
         check(
             r#"
-enum Foo <|>{
+enum Foo $0{
     A,
     B,
 }
@@ -431,7 +431,7 @@ fn main() {
     fn test_enum_before_space() {
         check(
             r#"
-enum Foo<|> {
+enum Foo$0 {
     A,
     B,
 }
@@ -453,7 +453,7 @@ fn main() {
     fn test_enum_with_generic_type() {
         check(
             r#"
-enum Foo<T> <|>{
+enum Foo<T> $0{
     A(T),
     B,
 }
@@ -474,7 +474,7 @@ fn main() {
     fn test_enum_for_tuple() {
         check(
             r#"
-enum Foo<|>{
+enum Foo$0{
     A(i8),
     B(i8),
 }
@@ -498,7 +498,7 @@ fn main() {
 fn main() {
     let mut i = 1;
     let j = 1;
-    i = i<|> + j;
+    i = i$0 + j;
 
     {
         i = 0;
@@ -522,7 +522,7 @@ fn main() {
         check(
             r#"
 fn foo() {
-    let spam<|> = 92;
+    let spam$0 = 92;
     spam + spam
 }
 fn bar() {
@@ -543,7 +543,7 @@ fn bar() {
     fn test_find_all_refs_for_param_inside() {
         check(
             r#"
-fn foo(i : u32) -> u32 { i<|> }
+fn foo(i : u32) -> u32 { i$0 }
 "#,
             expect![[r#"
                 i ValueParam FileId(0) 7..8 Other
@@ -557,7 +557,7 @@ fn foo(i : u32) -> u32 { i<|> }
     fn test_find_all_refs_for_fn_param() {
         check(
             r#"
-fn foo(i<|> : u32) -> u32 { i }
+fn foo(i$0 : u32) -> u32 { i }
 "#,
             expect![[r#"
                 i ValueParam FileId(0) 7..8 Other
@@ -573,7 +573,7 @@ fn foo(i<|> : u32) -> u32 { i }
             r#"
 //- /lib.rs
 struct Foo {
-    pub spam<|>: u32,
+    pub spam$0: u32,
 }
 
 fn main(s: Foo) {
@@ -594,7 +594,7 @@ fn main(s: Foo) {
             r#"
 struct Foo;
 impl Foo {
-    fn f<|>(&self) {  }
+    fn f$0(&self) {  }
 }
 "#,
             expect![[r#"
@@ -610,7 +610,7 @@ impl Foo {
             r#"
 enum Foo {
     A,
-    B<|>,
+    B$0,
     C,
 }
 "#,
@@ -627,7 +627,7 @@ enum Foo {
             r#"
 enum Foo {
     A,
-    B { field<|>: u8 },
+    B { field$0: u8 },
     C,
 }
 "#,
@@ -669,7 +669,7 @@ pub struct Bar {
 }
 
 fn f() {
-    let i = foo::Foo<|> { n: 5 };
+    let i = foo::Foo$0 { n: 5 };
 }
 "#,
             expect![[r#"
@@ -689,7 +689,7 @@ fn f() {
         check(
             r#"
 //- /lib.rs
-mod foo<|>;
+mod foo$0;
 
 use foo::Foo;
 
@@ -726,7 +726,7 @@ fn f() {
 }
 
 //- /foo/some.rs
-pub(super) struct Foo<|> {
+pub(super) struct Foo$0 {
     pub n: u32,
 }
 "#,
@@ -746,7 +746,7 @@ pub(super) struct Foo<|> {
             mod foo;
             mod bar;
 
-            pub fn quux<|>() {}
+            pub fn quux$0() {}
 
             //- /foo.rs
             fn f() { super::quux(); }
@@ -782,7 +782,7 @@ pub(super) struct Foo<|> {
         check(
             r#"
 #[macro_export]
-macro_rules! m1<|> { () => (()) }
+macro_rules! m1$0 { () => (()) }
 
 fn foo() {
     m1();
@@ -803,7 +803,7 @@ fn foo() {
         check(
             r#"
 fn foo() {
-    let mut i<|> = 0;
+    let mut i$0 = 0;
     i = i + 1;
 }
 "#,
@@ -826,7 +826,7 @@ struct S {
 
 fn foo() {
     let mut s = S{f: 0};
-    s.f<|> = 0;
+    s.f$0 = 0;
 }
 "#,
             expect![[r#"
@@ -843,7 +843,7 @@ fn foo() {
         check(
             r#"
 fn foo() {
-    let i<|>;
+    let i$0;
     i = 1;
 }
 "#,
@@ -863,7 +863,7 @@ mod foo {
     pub struct Foo;
 
     impl Foo {
-        pub fn new<|>() -> Foo { Foo }
+        pub fn new$0() -> Foo { Foo }
     }
 }
 
@@ -886,7 +886,7 @@ fn main() {
 //- /lib.rs
 mod foo { mod bar; }
 
-fn f<|>() {}
+fn f$0() {}
 
 //- /foo/bar.rs
 use crate::f;
@@ -907,7 +907,7 @@ fn g() { f(); }
         check(
             r#"
 struct S {
-    field<|>: u8,
+    field$0: u8,
 }
 
 fn f(s: S) {
@@ -930,7 +930,7 @@ fn f(s: S) {
             r#"
 enum En {
     Variant {
-        field<|>: u8,
+        field$0: u8,
     }
 }
 
@@ -955,7 +955,7 @@ fn f(e: En) {
 mod m {
     pub enum En {
         Variant {
-            field<|>: u8,
+            field$0: u8,
         }
     }
 }
@@ -980,7 +980,7 @@ struct Foo { bar: i32 }
 
 impl Foo {
     fn foo(self) {
-        let x = self<|>.bar;
+        let x = self$0.bar;
         if true {
             let _ = match () {
                 () => self,
@@ -1032,7 +1032,7 @@ impl Foo {
             r#"
 trait Foo<'a> {}
 impl<'a> Foo<'a> for &'a () {}
-fn foo<'a, 'b: 'a>(x: &'a<|> ()) -> &'a () where &'a (): Foo<'a> {
+fn foo<'a, 'b: 'a>(x: &'a$0 ()) -> &'a () where &'a (): Foo<'a> {
     fn bar<'a>(_: &'a ()) {}
     x
 }
@@ -1053,7 +1053,7 @@ fn foo<'a, 'b: 'a>(x: &'a<|> ()) -> &'a () where &'a (): Foo<'a> {
     fn test_find_lifetimes_type_alias() {
         check(
             r#"
-type Foo<'a, T> where T: 'a<|> = &'a T;
+type Foo<'a, T> where T: 'a$0 = &'a T;
 "#,
             expect![[r#"
                 'a LifetimeParam FileId(0) 9..11 9..11 Lifetime
@@ -1072,7 +1072,7 @@ trait Foo<'a> {
     fn foo() -> &'a ();
 }
 impl<'a> Foo<'a> for &'a () {
-    fn foo() -> &'a<|> () {
+    fn foo() -> &'a$0 () {
         unimplemented!()
     }
 }
@@ -1093,7 +1093,7 @@ impl<'a> Foo<'a> for &'a () {
             r#"
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
-    let a<|> = "test";
+    let a$0 = "test";
     foo!(a);
 }
 "#,
@@ -1112,7 +1112,7 @@ fn main() {
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
     let a = "test";
-    foo!(a<|>);
+    foo!(a$0);
 }
 "#,
             expect![[r#"
@@ -1130,7 +1130,7 @@ fn main() {
 fn foo<'a>() -> &'a () {
     'a: loop {
         'b: loop {
-            continue 'a<|>;
+            continue 'a$0;
         }
         break 'a;
     }
@@ -1149,7 +1149,7 @@ fn foo<'a>() -> &'a () {
     fn test_find_const_param() {
         check(
             r#"
-fn foo<const FOO<|>: usize>() -> usize {
+fn foo<const FOO$0: usize>() -> usize {
     FOO
 }
 "#,
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 854bf194e..53d79333c 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -493,19 +493,19 @@ mod tests {
 
     #[test]
     fn test_rename_to_underscore() {
-        check("_", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let _ = 1; }"#);
+        check("_", r#"fn main() { let i$0 = 1; }"#, r#"fn main() { let _ = 1; }"#);
     }
 
     #[test]
     fn test_rename_to_raw_identifier() {
-        check("r#fn", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
+        check("r#fn", r#"fn main() { let i$0 = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
     }
 
     #[test]
     fn test_rename_to_invalid_identifier1() {
         check(
             "invalid!",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
             "error: Invalid name `invalid!`: not an identifier",
         );
     }
@@ -514,7 +514,7 @@ mod tests {
     fn test_rename_to_invalid_identifier2() {
         check(
             "multiple tokens",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
             "error: Invalid name `multiple tokens`: not an identifier",
         );
     }
@@ -523,7 +523,7 @@ mod tests {
     fn test_rename_to_invalid_identifier3() {
         check(
             "let",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
             "error: Invalid name `let`: not an identifier",
         );
     }
@@ -532,7 +532,7 @@ mod tests {
     fn test_rename_to_invalid_identifier_lifetime() {
         check(
             "'foo",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
             "error: Invalid name `'foo`: not an identifier",
         );
     }
@@ -541,7 +541,7 @@ mod tests {
     fn test_rename_to_invalid_identifier_lifetime2() {
         check(
             "foo",
-            r#"fn main<'a>(_: &'a<|> ()) {}"#,
+            r#"fn main<'a>(_: &'a$0 ()) {}"#,
             "error: Invalid name `foo`: not a lifetime identifier",
         );
     }
@@ -554,7 +554,7 @@ mod tests {
 fn main() {
     let mut i = 1;
     let j = 1;
-    i = i<|> + j;
+    i = i$0 + j;
 
     { i = 0; }
 
@@ -579,7 +579,7 @@ fn main() {
     fn test_rename_unresolved_reference() {
         check(
             "new_name",
-            r#"fn main() { let _ = unresolved_ref<|>; }"#,
+            r#"fn main() { let _ = unresolved_ref$0; }"#,
             "error: No references found at position",
         );
     }
@@ -591,7 +591,7 @@ fn main() {
             r#"
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
-    let a<|> = "test";
+    let a$0 = "test";
     foo!(a);
 }
 "#,
@@ -613,7 +613,7 @@ fn main() {
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
     let a = "test";
-    foo!(a<|>);
+    foo!(a$0);
 }
 "#,
             r#"
@@ -634,7 +634,7 @@ fn main() {
 macro_rules! define_fn {($id:ident) => { fn $id{} }}
 define_fn!(foo);
 fn main() {
-    fo<|>o();
+    fo$0o();
 }
 "#,
             r#"
@@ -653,7 +653,7 @@ fn main() {
             "bar",
             r#"
 macro_rules! define_fn {($id:ident) => { fn $id{} }}
-define_fn!(fo<|>o);
+define_fn!(fo$0o);
 fn main() {
     foo();
 }
@@ -670,17 +670,17 @@ fn main() {
 
     #[test]
     fn test_rename_for_param_inside() {
-        check("j", r#"fn foo(i : u32) -> u32 { i<|> }"#, r#"fn foo(j : u32) -> u32 { j }"#);
+        check("j", r#"fn foo(i : u32) -> u32 { i$0 }"#, r#"fn foo(j : u32) -> u32 { j }"#);
     }
 
     #[test]
     fn test_rename_refs_for_fn_param() {
-        check("j", r#"fn foo(i<|> : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
+        check("j", r#"fn foo(i$0 : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
     }
 
     #[test]
     fn test_rename_for_mut_param() {
-        check("j", r#"fn foo(mut i<|> : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
+        check("j", r#"fn foo(mut i$0 : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
     }
 
     #[test]
@@ -688,7 +688,7 @@ fn main() {
         check(
             "j",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 
 impl Foo {
     fn new(i: i32) -> Self {
@@ -714,7 +714,7 @@ impl Foo {
         check(
             "j",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 
 impl Foo {
     fn new(i: i32) -> Self {
@@ -743,7 +743,7 @@ impl Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn new(i<|>: i32) -> Self {
+    fn new(i$0: i32) -> Self {
         Self { i }
     }
 }
@@ -765,7 +765,7 @@ impl Foo {
         check(
             "j",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 struct Bar { i: i32 }
 
 impl Bar {
@@ -794,7 +794,7 @@ impl Bar {
             r#"
 struct Foo { i: i32 }
 
-fn baz(i<|>: i32) -> Self {
+fn baz(i$0: i32) -> Self {
      let x = Foo { i };
      {
          let i = 0;
@@ -825,7 +825,7 @@ fn baz(j: i32) -> Self {
 mod bar;
 
 //- /bar.rs
-mod foo<|>;
+mod foo$0;
 
 //- /bar/foo.rs
 // empty
@@ -883,7 +883,7 @@ fn main() {}
 pub struct FooContent;
 
 //- /bar.rs
-use crate::foo<|>::FooContent;
+use crate::foo$0::FooContent;
 "#,
             expect![[r#"
                 RangeInfo {
@@ -943,7 +943,7 @@ use crate::foo<|>::FooContent;
             "foo2",
             r#"
 //- /lib.rs
-mod fo<|>o;
+mod fo$0o;
 //- /foo/mod.rs
 // emtpy
 "#,
@@ -992,7 +992,7 @@ mod fo<|>o;
             "bar",
             r#"
 //- /lib.rs
-mod outer { mod fo<|>o; }
+mod outer { mod fo$0o; }
 
 //- /outer/foo.rs
 // emtpy
@@ -1041,7 +1041,7 @@ mod outer { mod fo<|>o; }
         check(
             "baz",
             r#"
-mod <|>foo { pub fn bar() {} }
+mod $0foo { pub fn bar() {} }
 
 fn main() { foo::bar(); }
 "#,
@@ -1065,7 +1065,7 @@ fn f() {
 }
 
 //- /bar.rs
-pub mod foo<|>;
+pub mod foo$0;
 
 //- /bar/foo.rs
 // pub fn fun() {}
@@ -1128,7 +1128,7 @@ pub mod foo<|>;
             "Baz",
             r#"
 mod foo {
-    pub enum Foo { Bar<|> }
+    pub enum Foo { Bar$0 }
 }
 
 fn func(f: foo::Foo) {
@@ -1157,7 +1157,7 @@ fn func(f: foo::Foo) {
             "baz",
             r#"
 mod foo {
-    pub struct Foo { pub bar<|>: uint }
+    pub struct Foo { pub bar$0: uint }
 }
 
 fn foo(f: foo::Foo) {
@@ -1184,7 +1184,7 @@ fn foo(f: foo::Foo) {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(foo<|>: &mut Foo) -> i32 {
+    fn f(foo$0: &mut Foo) -> i32 {
         foo.i
     }
 }
@@ -1205,7 +1205,7 @@ impl Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(foo<|>: Foo) -> i32 {
+    fn f(foo$0: Foo) -> i32 {
         foo.i
     }
 }
@@ -1229,7 +1229,7 @@ impl Foo {
             r#"
 struct Foo { i: i32 }
 
-fn f(foo<|>: &mut Foo) -> i32 {
+fn f(foo$0: &mut Foo) -> i32 {
     foo.i
 }
 "#,
@@ -1242,7 +1242,7 @@ struct Foo { i: i32 }
 struct Bar;
 
 impl Bar {
-    fn f(foo<|>: &mut Foo) -> i32 {
+    fn f(foo$0: &mut Foo) -> i32 {
         foo.i
     }
 }
@@ -1258,7 +1258,7 @@ impl Bar {
             r#"
 struct Foo { i: i32 }
 impl Foo {
-    fn f(x: (), foo<|>: &mut Foo) -> i32 {
+    fn f(x: (), foo$0: &mut Foo) -> i32 {
         foo.i
     }
 }
@@ -1274,7 +1274,7 @@ impl Foo {
             r#"
 struct Foo { i: i32 }
 impl &Foo {
-    fn f(foo<|>: &Foo) -> i32 {
+    fn f(foo$0: &Foo) -> i32 {
         foo.i
     }
 }
@@ -1298,7 +1298,7 @@ impl &Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(&mut <|>self) -> i32 {
+    fn f(&mut $0self) -> i32 {
         self.i
     }
 }
@@ -1323,7 +1323,7 @@ impl Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(<|>self) -> i32 {
+    fn f($0self) -> i32 {
         self.i
     }
 }
@@ -1350,7 +1350,7 @@ struct Foo { i: i32 }
 impl Foo {
     fn f(&self) -> i32 {
         let self_var = 1;
-        self<|>.i
+        self$0.i
     }
 }
 "#,
@@ -1373,7 +1373,7 @@ impl Foo {
         check(
             "bar",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 
 fn foo(bar: i32) -> Foo {
     Foo { i: bar }
@@ -1394,7 +1394,7 @@ fn foo(bar: i32) -> Foo {
         check(
             "baz",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 
 fn foo(foo: Foo) {
     let Foo { i: baz } = foo;
@@ -1433,7 +1433,7 @@ struct Foo {
 
 fn foo(foo: Foo) {
     let Foo { i: b } = foo;
-    let _ = b<|>;
+    let _ = b$0;
 }
 "#,
             expected_fixture,
@@ -1447,7 +1447,7 @@ struct Foo {
 
 fn foo(foo: Foo) {
     let Foo { i } = foo;
-    let _ = i<|>;
+    let _ = i$0;
 }
 "#,
             expected_fixture,
@@ -1464,7 +1464,7 @@ struct Foo {
 }
 
 fn foo(Foo { i }: foo) -> i32 {
-    i<|>
+    i$0
 }
 "#,
             r#"
@@ -1488,7 +1488,7 @@ trait Foo<'a> {
     fn foo() -> &'a ();
 }
 impl<'a> Foo<'a> for &'a () {
-    fn foo() -> &'a<|> () {
+    fn foo() -> &'a$0 () {
         unimplemented!()
     }
 }
@@ -1520,7 +1520,7 @@ fn main() {
     let test_variable = CustomOption::Some(22);
 
     match test_variable {
-        CustomOption::Some(foo<|>) if foo == 11 => {}
+        CustomOption::Some(foo$0) if foo == 11 => {}
         _ => (),
     }
 }"#,
@@ -1549,7 +1549,7 @@ fn main() {
 fn foo<'a>() -> &'a () {
     'a: {
         'b: loop {
-            break 'a<|>;
+            break 'a$0;
         }
     }
 }
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index c893afc7c..557563d7e 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -2,11 +2,11 @@ use std::fmt;
 
 use assists::utils::test_related_attribute;
 use cfg::CfgExpr;
-use hir::{AsAssocItem, HasAttrs, InFile, Semantics};
+use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
 use ide_db::RootDatabase;
 use itertools::Itertools;
 use syntax::{
-    ast::{self, AstNode, AttrsOwner, ModuleItemOwner, NameOwner},
+    ast::{self, AstNode, AttrsOwner, ModuleItemOwner},
     match_ast, SyntaxNode,
 };
 
@@ -96,17 +96,16 @@ impl Runnable {
 pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
     let sema = Semantics::new(db);
     let source_file = sema.parse(file_id);
-    source_file.syntax().descendants().filter_map(|i| runnable(&sema, i, file_id)).collect()
+    source_file.syntax().descendants().filter_map(|i| runnable(&sema, i)).collect()
 }
 
-pub(crate) fn runnable(
-    sema: &Semantics<RootDatabase>,
-    item: SyntaxNode,
-    file_id: FileId,
-) -> Option<Runnable> {
+pub(crate) fn runnable(sema: &Semantics<RootDatabase>, item: SyntaxNode) -> Option<Runnable> {
     let runnable_item = match_ast! {
         match (item.clone()) {
-            ast::Fn(it) => runnable_fn(sema, it, file_id),
+            ast::Fn(func) => {
+                let def = sema.to_def(&func)?;
+                runnable_fn(sema, def)
+            },
             ast::Module(it) => runnable_mod(sema, it),
             _ => None,
         }
@@ -114,23 +113,23 @@ pub(crate) fn runnable(
     runnable_item.or_else(|| runnable_doctest(sema, item))
 }
 
-fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) -> Option<Runnable> {
-    let def = sema.to_def(&func)?;
-    let name_string = func.name()?.text().to_string();
+pub(crate) fn runnable_fn(sema: &Semantics<RootDatabase>, def: hir::Function) -> Option<Runnable> {
+    let func = def.source(sema.db)?;
+    let name_string = def.name(sema.db).to_string();
 
     let kind = if name_string == "main" {
         RunnableKind::Bin
     } else {
-        let canonical_path = sema.to_def(&func).and_then(|def| {
+        let canonical_path = {
             let def: hir::ModuleDef = def.into();
             def.canonical_path(sema.db)
-        });
+        };
         let test_id = canonical_path.map(TestId::Path).unwrap_or(TestId::Name(name_string));
 
-        if test_related_attribute(&func).is_some() {
-            let attr = TestAttr::from_fn(&func);
+        if test_related_attribute(&func.value).is_some() {
+            let attr = TestAttr::from_fn(&func.value);
             RunnableKind::Test { test_id, attr }
-        } else if func.has_atom_attr("bench") {
+        } else if func.value.has_atom_attr("bench") {
             RunnableKind::Bench { test_id }
         } else {
             return None;
@@ -139,7 +138,7 @@ fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) -
 
     let nav = NavigationTarget::from_named(
         sema.db,
-        InFile::new(file_id.into(), &func),
+        func.as_ref().map(|it| it as &dyn ast::NameOwner),
         SymbolKind::Function,
     );
     let cfg = def.attrs(sema.db).cfg();
@@ -330,7 +329,7 @@ mod tests {
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 
 #[test]
@@ -426,7 +425,7 @@ fn bench() {}
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 
 /// ```
@@ -574,7 +573,7 @@ struct StructWithRunnable(String);
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 
 struct Data;
@@ -626,7 +625,7 @@ impl Data {
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 mod test_mod {
     #[test]
     fn test_foo1() {}
@@ -680,7 +679,7 @@ mod test_mod {
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 mod root_tests {
     mod nested_tests_0 {
         mod nested_tests_1 {
@@ -820,7 +819,7 @@ mod root_tests {
         check(
             r#"
 //- /lib.rs crate:foo cfg:feature=foo
-<|>
+$0
 #[test]
 #[cfg(feature = "foo")]
 fn test_foo1() {}
@@ -865,7 +864,7 @@ fn test_foo1() {}
         check(
             r#"
 //- /lib.rs crate:foo cfg:feature=foo,feature=bar
-<|>
+$0
 #[test]
 #[cfg(all(feature = "foo", feature = "bar"))]
 fn test_foo1() {}
@@ -920,7 +919,7 @@ fn test_foo1() {}
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 mod test_mod {
     fn foo1() {}
 }
@@ -939,7 +938,7 @@ mod test_mod {
 //- /lib.rs
 mod foo;
 //- /foo.rs
-struct Foo;<|>
+struct Foo;$0
 impl Foo {
     /// ```
     /// let x = 5;
diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs
index 6cbd683c6..d6be9708d 100644
--- a/crates/ide/src/syntax_highlighting/injection.rs
+++ b/crates/ide/src/syntax_highlighting/injection.rs
@@ -22,7 +22,8 @@ pub(super) fn highlight_injection(
         return None;
     }
     let value = literal.value()?;
-    let (analysis, tmp_file_id) = Analysis::from_single_file(value.into_owned());
+    let marker_info = MarkerInfo::new(&*value);
+    let (analysis, tmp_file_id) = Analysis::from_single_file(marker_info.cleaned_text.clone());
 
     if let Some(range) = literal.open_quote_text_range() {
         acc.add(HighlightedRange {
@@ -33,9 +34,10 @@ pub(super) fn highlight_injection(
     }
 
     for mut h in analysis.highlight(tmp_file_id).unwrap() {
-        if let Some(r) = literal.map_range_up(h.range) {
-            h.range = r;
-            acc.add(h)
+        let range = marker_info.map_range_up(h.range);
+        if let Some(range) = literal.map_range_up(range) {
+            h.range = range;
+            acc.add(h);
         }
     }
 
@@ -50,6 +52,52 @@ pub(super) fn highlight_injection(
     Some(())
 }
 
+/// Data to remove `$0` from string and map ranges
+#[derive(Default, Debug)]
+struct MarkerInfo {
+    cleaned_text: String,
+    markers: Vec<TextRange>,
+}
+
+impl MarkerInfo {
+    fn new(mut text: &str) -> Self {
+        let marker = "$0";
+
+        let mut res = MarkerInfo::default();
+        let mut offset: TextSize = 0.into();
+        while !text.is_empty() {
+            let idx = text.find(marker).unwrap_or(text.len());
+            let (chunk, next) = text.split_at(idx);
+            text = next;
+            res.cleaned_text.push_str(chunk);
+            offset += TextSize::of(chunk);
+
+            if let Some(next) = text.strip_prefix(marker) {
+                text = next;
+
+                let marker_len = TextSize::of(marker);
+                res.markers.push(TextRange::at(offset, marker_len));
+                offset += marker_len;
+            }
+        }
+        res
+    }
+    fn map_range_up(&self, range: TextRange) -> TextRange {
+        TextRange::new(
+            self.map_offset_up(range.start(), true),
+            self.map_offset_up(range.end(), false),
+        )
+    }
+    fn map_offset_up(&self, mut offset: TextSize, start: bool) -> TextSize {
+        for r in &self.markers {
+            if r.start() < offset || (start && r.start() == offset) {
+                offset += r.len()
+            }
+        }
+        offset
+    }
+}
+
 /// Mapping from extracted documentation code to original code
 type RangesMap = BTreeMap<TextSize, TextSize>;
 
diff --git a/crates/ide/src/syntax_highlighting/test_data/injection.html b/crates/ide/src/syntax_highlighting/test_data/injection.html
new file mode 100644
index 000000000..a54d303b4
--- /dev/null
+++ b/crates/ide/src/syntax_highlighting/test_data/injection.html
@@ -0,0 +1,48 @@
+
+<style>
+body                { margin: 0; }
+pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
+
+.lifetime           { color: #DFAF8F; font-style: italic; }
+.label              { color: #DFAF8F; font-style: italic; }
+.comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
+.field              { color: #94BFF3; }
+.function           { color: #93E0E3; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
+.parameter          { color: #94BFF3; }
+.text               { color: #DCDCCC; }
+.type               { color: #7CB8BB; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.numeric_literal    { color: #BFEBBF; }
+.bool_literal       { color: #BFE6EB; }
+.macro              { color: #94BFF3; }
+.module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
+.variable           { color: #DCDCCC; }
+.format_specifier   { color: #CC696B; }
+.mutable            { text-decoration: underline; }
+.escape_sequence    { color: #94BFF3; }
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
+
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
+</style>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">f</span><span class="punctuation">(</span><span class="value_param declaration">ra_fixture</span><span class="punctuation">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
+    <span class="function">f</span><span class="punctuation">(</span><span class="string_literal">r"</span>
+<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
+    <span class="function">foo</span><span class="punctuation">(</span>$0<span class="punctuation">{</span>
+        <span class="numeric_literal">92</span>
+    <span class="punctuation">}</span>$0<span class="punctuation">)</span>
+<span class="punctuation">}</span><span class="string_literal">"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+<span class="punctuation">}</span>
+    </code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/tests.rs b/crates/ide/src/syntax_highlighting/tests.rs
index 30b5b648e..9e1a3974c 100644
--- a/crates/ide/src/syntax_highlighting/tests.rs
+++ b/crates/ide/src/syntax_highlighting/tests.rs
@@ -555,6 +555,25 @@ impl t for foo {
     )
 }
 
+#[test]
+fn test_injection() {
+    check_highlighting(
+        r##"
+fn f(ra_fixture: &str) {}
+fn main() {
+    f(r"
+fn foo() {
+    foo(\$0{
+        92
+    }\$0)
+}");
+}
+    "##,
+        expect_file!["./test_data/injection.html"],
+        false,
+    );
+}
+
 /// Highlights the code given by the `ra_fixture` argument, renders the
 /// result as HTML, and compares it with the HTML file given as `snapshot`.
 /// Note that the `snapshot` file is overwritten by the rendered HTML.
diff --git a/crates/ide/src/syntax_tree.rs b/crates/ide/src/syntax_tree.rs
index 6dd05c05d..1f26f8043 100644
--- a/crates/ide/src/syntax_tree.rs
+++ b/crates/ide/src/syntax_tree.rs
@@ -85,7 +85,7 @@ fn syntax_tree_for_token(node: &SyntaxToken, text_range: TextRange) -> Option<St
         .trim_end_matches('"')
         .trim()
         // Remove custom markers
-        .replace("<|>", "");
+        .replace("$0", "");
 
     let parsed = SourceFile::parse(&text);
 
@@ -182,7 +182,7 @@ [email protected]
 
     #[test]
     fn test_syntax_tree_with_range() {
-        let (analysis, range) = fixture::range(r#"<|>fn foo() {}<|>"#.trim());
+        let (analysis, range) = fixture::range(r#"$0fn foo() {}$0"#.trim());
         let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
 
         assert_eq_text!(
@@ -206,10 +206,10 @@ [email protected]
 
         let (analysis, range) = fixture::range(
             r#"fn test() {
-    <|>assert!("
+    $0assert!("
     fn foo() {
     }
-    ", "");<|>
+    ", "");$0
 }"#
             .trim(),
         );
@@ -243,8 +243,8 @@ [email protected]
         let (analysis, range) = fixture::range(
             r#"fn test() {
     assert!("
-<|>fn foo() {
-}<|>
+$0fn foo() {
+}$0
 fn bar() {
 }
     ", "");
@@ -277,8 +277,8 @@ [email protected]
         let (analysis, range) = fixture::range(
             r###"fn test() {
     assert!(r#"
-<|>fn foo() {
-}<|>
+$0fn foo() {
+}$0
 fn bar() {
 }
     "#, "");
@@ -310,11 +310,11 @@ [email protected]
         // With a raw string
         let (analysis, range) = fixture::range(
             r###"fn test() {
-    assert!(r<|>#"
+    assert!(r$0#"
 fn foo() {
 }
 fn bar() {
-}"<|>#, "");
+}"$0#, "");
 }"###
                 .trim(),
         );
diff --git a/crates/ide/src/typing.rs b/crates/ide/src/typing.rs
index 43458a3a2..88c905003 100644
--- a/crates/ide/src/typing.rs
+++ b/crates/ide/src/typing.rs
@@ -170,7 +170,7 @@ mod tests {
     fn test_on_eq_typed() {
         //     do_check(r"
         // fn foo() {
-        //     let foo =<|>
+        //     let foo =$0
         // }
         // ", r"
         // fn foo() {
@@ -181,7 +181,7 @@ mod tests {
             '=',
             r"
 fn foo() {
-    let foo <|> 1 + 1
+    let foo $0 1 + 1
 }
 ",
             r"
@@ -192,7 +192,7 @@ fn foo() {
         );
         //     do_check(r"
         // fn foo() {
-        //     let foo =<|>
+        //     let foo =$0
         //     let bar = 1;
         // }
         // ", r"
@@ -210,7 +210,7 @@ fn foo() {
             r"
             fn main() {
                 xs.foo()
-                <|>
+                $0
             }
             ",
             r"
@@ -225,7 +225,7 @@ fn foo() {
             r"
             fn main() {
                 xs.foo()
-                    <|>
+                    $0
             }
             ",
         )
@@ -238,7 +238,7 @@ fn foo() {
             r"
             fn main() {
                 xs.foo()
-                <|>;
+                $0;
             }
             ",
             r"
@@ -253,7 +253,7 @@ fn foo() {
             r"
             fn main() {
                 xs.foo()
-                    <|>;
+                    $0;
             }
             ",
         )
@@ -266,7 +266,7 @@ fn foo() {
             r#"
 fn main() {
     let _ = foo
-    <|>
+    $0
     bar()
 }
 "#,
@@ -288,7 +288,7 @@ fn main() {
             fn main() {
                 xs.foo()
                     .first()
-                <|>
+                $0
             }
             ",
             r"
@@ -305,7 +305,7 @@ fn main() {
             fn main() {
                 xs.foo()
                     .first()
-                    <|>
+                    $0
             }
             ",
         );
@@ -318,7 +318,7 @@ fn main() {
             r"
             fn source_impl() {
                 let var = enum_defvariant_list().unwrap()
-                <|>
+                $0
                     .nth(92)
                     .unwrap();
             }
@@ -337,7 +337,7 @@ fn main() {
             r"
             fn source_impl() {
                 let var = enum_defvariant_list().unwrap()
-                    <|>
+                    $0
                     .nth(92)
                     .unwrap();
             }
@@ -351,7 +351,7 @@ fn main() {
             '.',
             r"
             fn main() {
-                <|>
+                $0
             }
             ",
         );
@@ -359,7 +359,7 @@ fn main() {
             '.',
             r"
             fn main() {
-            <|>
+            $0
             }
             ",
         );
@@ -367,6 +367,6 @@ fn main() {
 
     #[test]
     fn adds_space_after_return_type() {
-        type_char('>', "fn foo() -<|>{ 92 }", "fn foo() -> { 92 }")
+        type_char('>', "fn foo() -$0{ 92 }", "fn foo() -> { 92 }")
     }
 }
diff --git a/crates/ide/src/typing/on_enter.rs b/crates/ide/src/typing/on_enter.rs
index f4ea30352..63cd51b69 100644
--- a/crates/ide/src/typing/on_enter.rs
+++ b/crates/ide/src/typing/on_enter.rs
@@ -136,7 +136,7 @@ mod tests {
     fn continues_doc_comment() {
         do_check(
             r"
-/// Some docs<|>
+/// Some docs$0
 fn foo() {
 }
 ",
@@ -151,7 +151,7 @@ fn foo() {
         do_check(
             r"
 impl S {
-    /// Some<|> docs.
+    /// Some$0 docs.
     fn foo() {}
 }
 ",
@@ -166,7 +166,7 @@ impl S {
 
         do_check(
             r"
-///<|> Some docs
+///$0 Some docs
 fn foo() {
 }
 ",
@@ -181,7 +181,7 @@ fn foo() {
 
     #[test]
     fn does_not_continue_before_doc_comment() {
-        do_check_noop(r"<|>//! docz");
+        do_check_noop(r"$0//! docz");
     }
 
     #[test]
@@ -189,7 +189,7 @@ fn foo() {
         do_check(
             r"
 fn main() {
-    // Fix<|> me
+    // Fix$0 me
     let x = 1 + 1;
 }
 ",
@@ -208,7 +208,7 @@ fn main() {
         do_check(
             r"
 fn main() {
-    // Fix<|>
+    // Fix$0
     // me
     let x = 1 + 1;
 }
@@ -229,7 +229,7 @@ fn main() {
         do_check_noop(
             r"
 fn main() {
-    // Fix me<|>
+    // Fix me$0
     let x = 1 + 1;
 }
 ",
@@ -242,7 +242,7 @@ fn main() {
         do_check(
             r#"
 fn main() {
-    // Fix me <|>
+    // Fix me $0
     let x = 1 + 1;
 }
 "#,
@@ -261,7 +261,7 @@ fn main() {
         do_check(
             "
 fn main() {
-    // Fix me  \t\t   <|>
+    // Fix me  \t\t   $0
     let x = 1 + 1;
 }
 ",
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index ebe53c8ee..d3d3dc688 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -32,4 +32,4 @@ test_utils = { path = "../test_utils", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/ide_db/src/call_info/tests.rs b/crates/ide_db/src/call_info/tests.rs
index 9335aeaa5..c714cf280 100644
--- a/crates/ide_db/src/call_info/tests.rs
+++ b/crates/ide_db/src/call_info/tests.rs
@@ -3,12 +3,12 @@ use base_db::{fixture::ChangeFixture, FilePosition};
 use expect_test::{expect, Expect};
 use test_utils::{mark, RangeOrOffset};
 
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn position(ra_fixture: &str) -> (RootDatabase, FilePosition) {
     let change_fixture = ChangeFixture::parse(ra_fixture);
     let mut database = RootDatabase::default();
     database.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
     let offset = match range_or_offset {
         RangeOrOffset::Range(_) => panic!(),
         RangeOrOffset::Offset(it) => it,
@@ -49,7 +49,7 @@ fn test_fn_signature_two_args() {
     check(
         r#"
 fn foo(x: u32, y: u32) -> u32 {x + y}
-fn bar() { foo(<|>3, ); }
+fn bar() { foo($03, ); }
 "#,
         expect![[r#"
                 fn foo(x: u32, y: u32) -> u32
@@ -59,7 +59,7 @@ fn bar() { foo(<|>3, ); }
     check(
         r#"
 fn foo(x: u32, y: u32) -> u32 {x + y}
-fn bar() { foo(3<|>, ); }
+fn bar() { foo(3$0, ); }
 "#,
         expect![[r#"
                 fn foo(x: u32, y: u32) -> u32
@@ -69,7 +69,7 @@ fn bar() { foo(3<|>, ); }
     check(
         r#"
 fn foo(x: u32, y: u32) -> u32 {x + y}
-fn bar() { foo(3,<|> ); }
+fn bar() { foo(3,$0 ); }
 "#,
         expect![[r#"
                 fn foo(x: u32, y: u32) -> u32
@@ -79,7 +79,7 @@ fn bar() { foo(3,<|> ); }
     check(
         r#"
 fn foo(x: u32, y: u32) -> u32 {x + y}
-fn bar() { foo(3, <|>); }
+fn bar() { foo(3, $0); }
 "#,
         expect![[r#"
                 fn foo(x: u32, y: u32) -> u32
@@ -93,7 +93,7 @@ fn test_fn_signature_two_args_empty() {
     check(
         r#"
 fn foo(x: u32, y: u32) -> u32 {x + y}
-fn bar() { foo(<|>); }
+fn bar() { foo($0); }
 "#,
         expect![[r#"
                 fn foo(x: u32, y: u32) -> u32
@@ -110,7 +110,7 @@ fn foo<T, U: Copy + Display>(x: T, y: U) -> u32
     where T: Copy + Display, U: Debug
 { x + y }
 
-fn bar() { foo(<|>3, ); }
+fn bar() { foo($03, ); }
 "#,
         expect![[r#"
                 fn foo(x: i32, y: {unknown}) -> u32
@@ -124,7 +124,7 @@ fn test_fn_signature_no_params() {
     check(
         r#"
 fn foo<T>() -> T where T: Copy + Display {}
-fn bar() { foo(<|>); }
+fn bar() { foo($0); }
 "#,
         expect![[r#"
                 fn foo() -> {unknown}
@@ -140,7 +140,7 @@ fn test_fn_signature_for_impl() {
 struct F;
 impl F { pub fn new() { } }
 fn bar() {
-    let _ : F = F::new(<|>);
+    let _ : F = F::new($0);
 }
 "#,
         expect![[r#"
@@ -159,7 +159,7 @@ impl S { pub fn do_it(&self) {} }
 
 fn bar() {
     let s: S = S;
-    s.do_it(<|>);
+    s.do_it($0);
 }
 "#,
         expect![[r#"
@@ -178,7 +178,7 @@ impl S {
     fn foo(&self, x: i32) {}
 }
 
-fn main() { S.foo(<|>); }
+fn main() { S.foo($0); }
 "#,
         expect![[r#"
                 fn foo(&self, x: i32)
@@ -196,7 +196,7 @@ impl S {
     fn foo(&self, x: i32) {}
 }
 
-fn main() { S::foo(<|>); }
+fn main() { S::foo($0); }
 "#,
         expect![[r#"
                 fn foo(self: &S, x: i32)
@@ -216,7 +216,7 @@ fn foo(j: u32) -> u32 {
 }
 
 fn bar() {
-    let _ = foo(<|>);
+    let _ = foo($0);
 }
 "#,
         expect![[r#"
@@ -246,7 +246,7 @@ pub fn add_one(x: i32) -> i32 {
 }
 
 pub fn do() {
-    add_one(<|>
+    add_one($0
 }"#,
         expect![[r##"
                 Adds one to the number given.
@@ -287,7 +287,7 @@ impl addr {
 
 pub fn do_it() {
     addr {};
-    addr::add_one(<|>);
+    addr::add_one($0);
 }
 "#,
         expect![[r##"
@@ -331,7 +331,7 @@ impl<E> WriteHandler<E> {
 }
 
 pub fn foo(mut r: WriteHandler<()>) {
-    r.finished(<|>);
+    r.finished($0);
 }
 "#,
         expect![[r#"
@@ -351,7 +351,7 @@ fn call_info_bad_offset() {
     check(
         r#"
 fn foo(x: u32, y: u32) -> u32 {x + y}
-fn bar() { foo <|> (3, ); }
+fn bar() { foo $0 (3, ); }
 "#,
         expect![[""]],
     );
@@ -368,7 +368,7 @@ fn bar(_: u32) { }
 
 fn main() {
     let foo = Foo;
-    std::thread::spawn(move || foo.bar(<|>));
+    std::thread::spawn(move || foo.bar($0));
 }
 "#,
         expect![[r#"
@@ -385,7 +385,7 @@ fn works_for_tuple_structs() {
 /// A cool tuple struct
 struct S(u32, i32);
 fn main() {
-    let s = S(0, <|>);
+    let s = S(0, $0);
 }
 "#,
         expect![[r#"
@@ -403,7 +403,7 @@ fn generic_struct() {
         r#"
 struct S<T>(T);
 fn main() {
-    let s = S(<|>);
+    let s = S($0);
 }
 "#,
         expect![[r#"
@@ -427,7 +427,7 @@ enum E {
 }
 
 fn main() {
-    let a = E::A(<|>);
+    let a = E::A($0);
 }
 "#,
         expect![[r#"
@@ -445,7 +445,7 @@ fn cant_call_struct_record() {
         r#"
 struct S { x: u32, y: i32 }
 fn main() {
-    let s = S(<|>);
+    let s = S($0);
 }
 "#,
         expect![[""]],
@@ -466,7 +466,7 @@ enum E {
 }
 
 fn main() {
-    let a = E::C(<|>);
+    let a = E::C($0);
 }
 "#,
         expect![[""]],
@@ -480,7 +480,7 @@ fn fn_signature_for_call_in_macro() {
 macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
 fn foo() { }
 id! {
-    fn bar() { foo(<|>); }
+    fn bar() { foo($0); }
 }
 "#,
         expect![[r#"
@@ -497,7 +497,7 @@ fn call_info_for_lambdas() {
 struct S;
 fn foo(s: S) -> i32 { 92 }
 fn main() {
-    (|s| foo(s))(<|>)
+    (|s| foo(s))($0)
 }
         "#,
         expect![[r#"
@@ -512,7 +512,7 @@ fn call_info_for_fn_ptr() {
     check(
         r#"
 fn main(f: fn(i32, f64) -> char) {
-    f(0, <|>)
+    f(0, $0)
 }
         "#,
         expect![[r#"
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index cc5078bf0..be1c64b03 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -358,7 +358,7 @@ impl NameRefClass {
             if let Some(path) = macro_call.path() {
                 if path.qualifier().is_none() {
                     // Only use this to resolve single-segment macro calls like `foo!()`. Multi-segment
-                    // paths are handled below (allowing `log<|>::info!` to resolve to the log crate).
+                    // paths are handled below (allowing `log$0::info!` to resolve to the log crate).
                     if let Some(macro_def) = sema.resolve_macro_call(&macro_call) {
                         return Some(NameRefClass::Definition(Definition::Macro(macro_def)));
                     }
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index d988588ff..e3e5670f1 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -1,9 +1,10 @@
 //! A module with ide helpers for high-level ide features.
-use crate::RootDatabase;
+pub mod insert_use;
+
 use hir::{Crate, Enum, Module, ScopeDef, Semantics, Trait};
 use syntax::ast::{self, make};
 
-pub mod insert_use;
+use crate::RootDatabase;
 
 /// Converts the mod path struct into its ast representation.
 pub fn mod_path_to_ast(path: &hir::ModPath) -> ast::Path {
@@ -201,3 +202,18 @@ pub use prelude::*;
         Some(def)
     }
 }
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct SnippetCap {
+    _private: (),
+}
+
+impl SnippetCap {
+    pub const fn new(allow_snippets: bool) -> Option<SnippetCap> {
+        if allow_snippets {
+            Some(SnippetCap { _private: () })
+        } else {
+            None
+        }
+    }
+}
diff --git a/crates/ide_db/src/imports_locator.rs b/crates/ide_db/src/imports_locator.rs
index 0f4c2ca47..0782ab070 100644
--- a/crates/ide_db/src/imports_locator.rs
+++ b/crates/ide_db/src/imports_locator.rs
@@ -1,7 +1,7 @@
 //! This module contains an import search funcionality that is provided to the assists module.
 //! Later, this should be moved away to a separate crate that is accessible from the assists module.
 
-use hir::{import_map, Crate, MacroDef, ModuleDef, Semantics};
+use hir::{import_map, AsAssocItem, Crate, MacroDef, ModuleDef, Semantics};
 use syntax::{ast, AstNode, SyntaxKind::NAME};
 
 use crate::{
@@ -40,8 +40,9 @@ pub fn find_similar_imports<'a>(
     krate: Crate,
     limit: Option<usize>,
     fuzzy_search_string: String,
+    ignore_assoc_items: bool,
     name_only: bool,
-) -> impl Iterator<Item = Either<ModuleDef, MacroDef>> {
+) -> impl Iterator<Item = Either<ModuleDef, MacroDef>> + 'a {
     let _p = profile::span("find_similar_imports");
 
     let mut external_query = import_map::Query::new(fuzzy_search_string.clone())
@@ -57,7 +58,21 @@ pub fn find_similar_imports<'a>(
         external_query = external_query.limit(limit);
     }
 
-    find_imports(sema, krate, local_query, external_query)
+    let db = sema.db;
+    find_imports(sema, krate, local_query, external_query).filter(move |import_candidate| {
+        if ignore_assoc_items {
+            match import_candidate {
+                Either::Left(ModuleDef::Function(function)) => function.as_assoc_item(db).is_none(),
+                Either::Left(ModuleDef::Const(const_)) => const_.as_assoc_item(db).is_none(),
+                Either::Left(ModuleDef::TypeAlias(type_alias)) => {
+                    type_alias.as_assoc_item(db).is_none()
+                }
+                _ => true,
+            }
+        } else {
+            true
+        }
+    })
 }
 
 fn find_imports<'a>(
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 436c59d2c..37b06027c 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -137,7 +137,6 @@ impl Definition {
         }
 
         if let Definition::LifetimeParam(param) = self {
-            #[allow(deprecated)]
             let range = match param.parent(db) {
                 hir::GenericDef::Function(it) => {
                     it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
diff --git a/crates/ide_db/src/traits/tests.rs b/crates/ide_db/src/traits/tests.rs
index 09c7ac3ec..84bb25505 100644
--- a/crates/ide_db/src/traits/tests.rs
+++ b/crates/ide_db/src/traits/tests.rs
@@ -5,12 +5,12 @@ use hir::Semantics;
 use syntax::ast::{self, AstNode};
 use test_utils::RangeOrOffset;
 
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn position(ra_fixture: &str) -> (RootDatabase, FilePosition) {
     let change_fixture = ChangeFixture::parse(ra_fixture);
     let mut database = RootDatabase::default();
     database.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
     let offset = match range_or_offset {
         RangeOrOffset::Range(_) => panic!(),
         RangeOrOffset::Offset(it) => it,
@@ -55,7 +55,7 @@ pub trait Foo {
     fn bar();
 }
 impl Foo for u8 {
-    <|>
+    $0
 }
             "#,
         expect![["Foo"]],
@@ -68,7 +68,7 @@ pub trait Foo {
 impl Foo for u8 {
     fn bar() {
         fn baz() {
-            <|>
+            $0
         }
         baz();
     }
@@ -83,7 +83,7 @@ pub trait Foo {
 }
 pub struct Bar;
 impl Bar {
-    <|>
+    $0
 }
             "#,
         expect![[""]],
@@ -99,7 +99,7 @@ pub trait Foo {
     fn bar();
 }
 impl Foo for u8 {
-    <|>
+    $0
 }"#,
         expect![[r#"
                 FOO
@@ -114,7 +114,7 @@ pub trait Foo {
 }
 impl Foo for u8 {
     const FOO: u8 = 10;
-    <|>
+    $0
 }"#,
         expect![[r#"
                 bar"#]],
@@ -128,7 +128,7 @@ pub trait Foo {
 }
 impl Foo for u8 {
     const FOO: u8 = 10;
-    fn bar() {<|>}
+    fn bar() {$0}
 }"#,
         expect![[r#""#]],
     );
@@ -137,7 +137,7 @@ impl Foo for u8 {
         r#"
 pub struct Foo;
 impl Foo {
-    fn bar() {<|>}
+    fn bar() {$0}
 }"#,
         expect![[r#""#]],
     );
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index 385b46601..c6d615c81 100644
--- a/crates/mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
@@ -309,7 +309,7 @@ impl<'a> TtIter<'a> {
             }
         }
 
-        let buffer = TokenBuffer::new(&self.inner.as_slice());
+        let buffer = TokenBuffer::from_tokens(&self.inner.as_slice());
         let mut src = SubtreeTokenSource::new(&buffer);
         let mut sink = OffsetTokenSink { cursor: buffer.begin(), error: false };
 
@@ -336,11 +336,11 @@ impl<'a> TtIter<'a> {
             err = Some(err!("no tokens consumed"));
         }
         let res = match res.len() {
-            1 => Some(res[0].clone()),
+            1 => Some(res[0].cloned()),
             0 => None,
             _ => Some(tt::TokenTree::Subtree(tt::Subtree {
                 delimiter: None,
-                token_trees: res.into_iter().cloned().collect(),
+                token_trees: res.into_iter().map(|it| it.cloned()).collect(),
             })),
         };
         ExpandResult { value: res, err }
diff --git a/crates/mbe/src/subtree_source.rs b/crates/mbe/src/subtree_source.rs
index d10d4b70e..d7433bd35 100644
--- a/crates/mbe/src/subtree_source.rs
+++ b/crates/mbe/src/subtree_source.rs
@@ -1,129 +1,104 @@
 //! FIXME: write short doc here
 
 use parser::{Token, TokenSource};
-use std::cell::{Cell, Ref, RefCell};
 use syntax::{lex_single_syntax_kind, SmolStr, SyntaxKind, SyntaxKind::*, T};
-use tt::buffer::{Cursor, TokenBuffer};
+use tt::buffer::TokenBuffer;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 struct TtToken {
-    kind: SyntaxKind,
-    is_joint_to_next: bool,
+    tt: Token,
     text: SmolStr,
 }
 
-pub(crate) struct SubtreeTokenSource<'a> {
-    cached_cursor: Cell<Cursor<'a>>,
-    cached: RefCell<Vec<Option<TtToken>>>,
+pub(crate) struct SubtreeTokenSource {
+    cached: Vec<TtToken>,
     curr: (Token, usize),
 }
 
-impl<'a> SubtreeTokenSource<'a> {
+impl<'a> SubtreeTokenSource {
     // Helper function used in test
     #[cfg(test)]
     pub(crate) fn text(&self) -> SmolStr {
-        match *self.get(self.curr.1) {
+        match self.cached.get(self.curr.1) {
             Some(ref tt) => tt.text.clone(),
             _ => SmolStr::new(""),
         }
     }
 }
 
-impl<'a> SubtreeTokenSource<'a> {
-    pub(crate) fn new(buffer: &'a TokenBuffer) -> SubtreeTokenSource<'a> {
-        let cursor = buffer.begin();
+impl<'a> SubtreeTokenSource {
+    pub(crate) fn new(buffer: &TokenBuffer) -> SubtreeTokenSource {
+        let mut current = buffer.begin();
+        let mut cached = Vec::with_capacity(100);
 
-        let mut res = SubtreeTokenSource {
-            curr: (Token { kind: EOF, is_jointed_to_next: false }, 0),
-            cached_cursor: Cell::new(cursor),
-            cached: RefCell::new(Vec::with_capacity(10)),
-        };
-        res.curr = (res.mk_token(0), 0);
-        res
-    }
+        while !current.eof() {
+            let cursor = current;
+            let tt = cursor.token_tree();
 
-    fn mk_token(&self, pos: usize) -> Token {
-        match *self.get(pos) {
-            Some(ref tt) => Token { kind: tt.kind, is_jointed_to_next: tt.is_joint_to_next },
-            None => Token { kind: EOF, is_jointed_to_next: false },
-        }
-    }
-
-    fn get(&self, pos: usize) -> Ref<Option<TtToken>> {
-        fn is_lifetime(c: Cursor) -> Option<(Cursor, SmolStr)> {
-            let tkn = c.token_tree();
-
-            if let Some(tt::TokenTree::Leaf(tt::Leaf::Punct(punct))) = tkn {
+            // Check if it is lifetime
+            if let Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Punct(punct), _)) = tt {
                 if punct.char == '\'' {
-                    let next = c.bump();
-                    if let Some(tt::TokenTree::Leaf(tt::Leaf::Ident(ident))) = next.token_tree() {
-                        let res_cursor = next.bump();
-                        let text = SmolStr::new("'".to_string() + &ident.to_string());
-
-                        return Some((res_cursor, text));
+                    let next = cursor.bump();
+                    if let Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Ident(ident), _)) =
+                        next.token_tree()
+                    {
+                        let text = SmolStr::new("'".to_string() + &ident.text);
+                        cached.push(TtToken {
+                            tt: Token { kind: LIFETIME_IDENT, is_jointed_to_next: false },
+                            text,
+                        });
+                        current = next.bump();
+                        continue;
                     } else {
                         panic!("Next token must be ident : {:#?}", next.token_tree());
                     }
                 }
             }
 
-            None
-        }
-
-        if pos < self.cached.borrow().len() {
-            return Ref::map(self.cached.borrow(), |c| &c[pos]);
-        }
-
-        {
-            let mut cached = self.cached.borrow_mut();
-            while pos >= cached.len() {
-                let cursor = self.cached_cursor.get();
-                if cursor.eof() {
-                    cached.push(None);
-                    continue;
+            current = match tt {
+                Some(tt::buffer::TokenTreeRef::Leaf(leaf, _)) => {
+                    cached.push(convert_leaf(&leaf));
+                    cursor.bump()
                 }
-
-                if let Some((curr, text)) = is_lifetime(cursor) {
-                    cached.push(Some(TtToken {
-                        kind: LIFETIME_IDENT,
-                        is_joint_to_next: false,
-                        text,
-                    }));
-                    self.cached_cursor.set(curr);
-                    continue;
+                Some(tt::buffer::TokenTreeRef::Subtree(subtree, _)) => {
+                    cached.push(convert_delim(subtree.delimiter_kind(), false));
+                    cursor.subtree().unwrap()
                 }
-
-                match cursor.token_tree() {
-                    Some(tt::TokenTree::Leaf(leaf)) => {
-                        cached.push(Some(convert_leaf(&leaf)));
-                        self.cached_cursor.set(cursor.bump());
-                    }
-                    Some(tt::TokenTree::Subtree(subtree)) => {
-                        self.cached_cursor.set(cursor.subtree().unwrap());
-                        cached.push(Some(convert_delim(subtree.delimiter_kind(), false)));
-                    }
-                    None => {
-                        if let Some(subtree) = cursor.end() {
-                            cached.push(Some(convert_delim(subtree.delimiter_kind(), true)));
-                            self.cached_cursor.set(cursor.bump());
-                        }
+                None => {
+                    if let Some(subtree) = cursor.end() {
+                        cached.push(convert_delim(subtree.delimiter_kind(), true));
+                        cursor.bump()
+                    } else {
+                        continue;
                     }
                 }
-            }
+            };
         }
 
-        Ref::map(self.cached.borrow(), |c| &c[pos])
+        let mut res = SubtreeTokenSource {
+            curr: (Token { kind: EOF, is_jointed_to_next: false }, 0),
+            cached,
+        };
+        res.curr = (res.token(0), 0);
+        res
+    }
+
+    fn token(&self, pos: usize) -> Token {
+        match self.cached.get(pos) {
+            Some(it) => it.tt,
+            None => Token { kind: EOF, is_jointed_to_next: false },
+        }
     }
 }
 
-impl<'a> TokenSource for SubtreeTokenSource<'a> {
+impl<'a> TokenSource for SubtreeTokenSource {
     fn current(&self) -> Token {
         self.curr.0
     }
 
     /// Lookahead n token
     fn lookahead_nth(&self, n: usize) -> Token {
-        self.mk_token(self.curr.1 + n)
+        self.token(self.curr.1 + n)
     }
 
     /// bump cursor to next token
@@ -131,13 +106,12 @@ impl<'a> TokenSource for SubtreeTokenSource<'a> {
         if self.current().kind == EOF {
             return;
         }
-
-        self.curr = (self.mk_token(self.curr.1 + 1), self.curr.1 + 1);
+        self.curr = (self.token(self.curr.1 + 1), self.curr.1 + 1);
     }
 
     /// Is the current token a specified keyword?
     fn is_keyword(&self, kw: &str) -> bool {
-        match *self.get(self.curr.1) {
+        match self.cached.get(self.curr.1) {
             Some(ref t) => t.text == *kw,
             _ => false,
         }
@@ -155,7 +129,7 @@ fn convert_delim(d: Option<tt::DelimiterKind>, closing: bool) -> TtToken {
     let idx = closing as usize;
     let kind = kinds[idx];
     let text = if !texts.is_empty() { &texts[idx..texts.len() - (1 - idx)] } else { "" };
-    TtToken { kind, is_joint_to_next: false, text: SmolStr::new(text) }
+    TtToken { tt: Token { kind, is_jointed_to_next: false }, text: SmolStr::new(text) }
 }
 
 fn convert_literal(l: &tt::Literal) -> TtToken {
@@ -169,7 +143,7 @@ fn convert_literal(l: &tt::Literal) -> TtToken {
         })
         .unwrap_or_else(|| panic!("Fail to convert given literal {:#?}", &l));
 
-    TtToken { kind, is_joint_to_next: false, text: l.text.clone() }
+    TtToken { tt: Token { kind, is_jointed_to_next: false }, text: l.text.clone() }
 }
 
 fn convert_ident(ident: &tt::Ident) -> TtToken {
@@ -180,7 +154,7 @@ fn convert_ident(ident: &tt::Ident) -> TtToken {
         _ => SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT),
     };
 
-    TtToken { kind, is_joint_to_next: false, text: ident.text.clone() }
+    TtToken { tt: Token { kind, is_jointed_to_next: false }, text: ident.text.clone() }
 }
 
 fn convert_punct(p: tt::Punct) -> TtToken {
@@ -194,7 +168,7 @@ fn convert_punct(p: tt::Punct) -> TtToken {
         let s: &str = p.char.encode_utf8(&mut buf);
         SmolStr::new(s)
     };
-    TtToken { kind, is_joint_to_next: p.spacing == tt::Spacing::Joint, text }
+    TtToken { tt: Token { kind, is_jointed_to_next: p.spacing == tt::Spacing::Joint }, text }
 }
 
 fn convert_leaf(leaf: &tt::Leaf) -> TtToken {
@@ -208,6 +182,7 @@ fn convert_leaf(leaf: &tt::Leaf) -> TtToken {
 #[cfg(test)]
 mod tests {
     use super::{convert_literal, TtToken};
+    use parser::Token;
     use syntax::{SmolStr, SyntaxKind};
 
     #[test]
@@ -218,8 +193,7 @@ mod tests {
                 text: SmolStr::new("-42.0")
             }),
             TtToken {
-                kind: SyntaxKind::FLOAT_NUMBER,
-                is_joint_to_next: false,
+                tt: Token { kind: SyntaxKind::FLOAT_NUMBER, is_jointed_to_next: false },
                 text: SmolStr::new("-42.0")
             }
         );
diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs
index 265c0d63d..671036e1c 100644
--- a/crates/mbe/src/syntax_bridge.rs
+++ b/crates/mbe/src/syntax_bridge.rs
@@ -70,15 +70,12 @@ pub fn token_tree_to_syntax_node(
     tt: &tt::Subtree,
     fragment_kind: FragmentKind,
 ) -> Result<(Parse<SyntaxNode>, TokenMap), ExpandError> {
-    let tmp;
-    let tokens = match tt {
-        tt::Subtree { delimiter: None, token_trees } => token_trees.as_slice(),
-        _ => {
-            tmp = [tt.clone().into()];
-            &tmp[..]
+    let buffer = match tt {
+        tt::Subtree { delimiter: None, token_trees } => {
+            TokenBuffer::from_tokens(token_trees.as_slice())
         }
+        _ => TokenBuffer::from_subtree(tt),
     };
-    let buffer = TokenBuffer::new(&tokens);
     let mut token_source = SubtreeTokenSource::new(&buffer);
     let mut tree_sink = TtTreeSink::new(buffer.begin());
     parser::parse_fragment(&mut token_source, &mut tree_sink, fragment_kind);
@@ -414,7 +411,7 @@ trait TokenConvertor {
     fn id_alloc(&mut self) -> &mut TokenIdAlloc;
 }
 
-impl<'a> SrcToken for (RawToken, &'a str) {
+impl<'a> SrcToken for (&'a RawToken, &'a str) {
     fn kind(&self) -> SyntaxKind {
         self.0.kind
     }
@@ -431,7 +428,7 @@ impl<'a> SrcToken for (RawToken, &'a str) {
 impl RawConvertor<'_> {}
 
 impl<'a> TokenConvertor for RawConvertor<'a> {
-    type Token = (RawToken, &'a str);
+    type Token = (&'a RawToken, &'a str);
 
     fn convert_doc_comment(&self, token: &Self::Token) -> Option<Vec<tt::TokenTree>> {
         convert_doc_comment(&doc_comment(token.1))
@@ -442,11 +439,11 @@ impl<'a> TokenConvertor for RawConvertor<'a> {
         let range = TextRange::at(self.offset, token.len);
         self.offset += token.len;
 
-        Some(((*token, &self.text[range]), range))
+        Some(((token, &self.text[range]), range))
     }
 
     fn peek(&self) -> Option<Self::Token> {
-        let token = self.inner.as_slice().get(0).cloned();
+        let token = self.inner.as_slice().get(0);
 
         token.map(|it| {
             let range = TextRange::at(self.offset, it.len);
@@ -601,17 +598,16 @@ impl<'a> TtTreeSink<'a> {
     }
 }
 
-fn delim_to_str(d: Option<tt::DelimiterKind>, closing: bool) -> SmolStr {
+fn delim_to_str(d: Option<tt::DelimiterKind>, closing: bool) -> &'static str {
     let texts = match d {
         Some(tt::DelimiterKind::Parenthesis) => "()",
         Some(tt::DelimiterKind::Brace) => "{}",
         Some(tt::DelimiterKind::Bracket) => "[]",
-        None => return "".into(),
+        None => return "",
     };
 
     let idx = closing as usize;
-    let text = &texts[idx..texts.len() - (1 - idx)];
-    text.into()
+    &texts[idx..texts.len() - (1 - idx)]
 }
 
 impl<'a> TreeSink for TtTreeSink<'a> {
@@ -626,29 +622,32 @@ impl<'a> TreeSink for TtTreeSink<'a> {
 
         let mut last = self.cursor;
         for _ in 0..n_tokens {
+            let tmp_str: SmolStr;
             if self.cursor.eof() {
                 break;
             }
             last = self.cursor;
-            let text: SmolStr = match self.cursor.token_tree() {
-                Some(tt::TokenTree::Leaf(leaf)) => {
+            let text: &str = match self.cursor.token_tree() {
+                Some(tt::buffer::TokenTreeRef::Leaf(leaf, _)) => {
                     // Mark the range if needed
                     let (text, id) = match leaf {
-                        tt::Leaf::Ident(ident) => (ident.text.clone(), ident.id),
+                        tt::Leaf::Ident(ident) => (&ident.text, ident.id),
                         tt::Leaf::Punct(punct) => {
                             assert!(punct.char.is_ascii());
                             let char = &(punct.char as u8);
-                            let text = std::str::from_utf8(std::slice::from_ref(char)).unwrap();
-                            (SmolStr::new_inline(text), punct.id)
+                            tmp_str = SmolStr::new_inline(
+                                std::str::from_utf8(std::slice::from_ref(char)).unwrap(),
+                            );
+                            (&tmp_str, punct.id)
                         }
-                        tt::Leaf::Literal(lit) => (lit.text.clone(), lit.id),
+                        tt::Leaf::Literal(lit) => (&lit.text, lit.id),
                     };
                     let range = TextRange::at(self.text_pos, TextSize::of(text.as_str()));
                     self.token_map.insert(id, range);
                     self.cursor = self.cursor.bump();
                     text
                 }
-                Some(tt::TokenTree::Subtree(subtree)) => {
+                Some(tt::buffer::TokenTreeRef::Subtree(subtree, _)) => {
                     self.cursor = self.cursor.subtree().unwrap();
                     if let Some(id) = subtree.delimiter.map(|it| it.id) {
                         self.open_delims.insert(id, self.text_pos);
@@ -672,7 +671,7 @@ impl<'a> TreeSink for TtTreeSink<'a> {
                 }
             };
             self.buf += &text;
-            self.text_pos += TextSize::of(text.as_str());
+            self.text_pos += TextSize::of(text);
         }
 
         let text = SmolStr::new(self.buf.as_str());
@@ -682,8 +681,8 @@ impl<'a> TreeSink for TtTreeSink<'a> {
         // Add whitespace between adjoint puncts
         let next = last.bump();
         if let (
-            Some(tt::TokenTree::Leaf(tt::Leaf::Punct(curr))),
-            Some(tt::TokenTree::Leaf(tt::Leaf::Punct(_))),
+            Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Punct(curr), _)),
+            Some(tt::buffer::TokenTreeRef::Leaf(tt::Leaf::Punct(_), _)),
         ) = (last.token_tree(), next.token_tree())
         {
             // Note: We always assume the semi-colon would be the last token in
@@ -742,7 +741,7 @@ mod tests {
         )
         .expand_tt("literals!(foo);");
         let tts = &[expansion.into()];
-        let buffer = tt::buffer::TokenBuffer::new(tts);
+        let buffer = tt::buffer::TokenBuffer::from_tokens(tts);
         let mut tt_src = SubtreeTokenSource::new(&buffer);
         let mut tokens = vec![];
         while tt_src.current().kind != EOF {
diff --git a/crates/parser/src/grammar.rs b/crates/parser/src/grammar.rs
index 63cc90027..bb9ffea8b 100644
--- a/crates/parser/src/grammar.rs
+++ b/crates/parser/src/grammar.rs
@@ -66,6 +66,10 @@ pub(crate) mod fragments {
         expressions::stmt(p, expressions::StmtWithSemi::No)
     }
 
+    pub(crate) fn stmt_optional_semi(p: &mut Parser) {
+        expressions::stmt(p, expressions::StmtWithSemi::Optional)
+    }
+
     pub(crate) fn opt_visibility(p: &mut Parser) {
         let _ = super::opt_visibility(p);
     }
diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index 811e740f9..9dfe63028 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.rs
@@ -88,6 +88,7 @@ pub enum FragmentKind {
     Path,
     Expr,
     Statement,
+    StatementOptionalSemi,
     Type,
     Pattern,
     Item,
@@ -118,6 +119,7 @@ pub fn parse_fragment(
         FragmentKind::Visibility => grammar::fragments::opt_visibility,
         FragmentKind::MetaItem => grammar::fragments::meta_item,
         FragmentKind::Statement => grammar::fragments::stmt,
+        FragmentKind::StatementOptionalSemi => grammar::fragments::stmt_optional_semi,
         FragmentKind::Items => grammar::fragments::macro_items,
         FragmentKind::Statements => grammar::fragments::macro_stmts,
         FragmentKind::Attr => grammar::fragments::attr,
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index df9a55c10..f78c17194 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -21,7 +21,6 @@ test_utils = { path = "../test_utils", version = "0.0.0" }
 
 [dev-dependencies]
 cargo_metadata = "=0.12.0"
-difference = "2.0.0"
 
 # used as proc macro test targets
 serde_derive = "1.0.106"
diff --git a/crates/profile/src/stop_watch.rs b/crates/profile/src/stop_watch.rs
index 5e276190e..cb6915d45 100644
--- a/crates/profile/src/stop_watch.rs
+++ b/crates/profile/src/stop_watch.rs
@@ -76,7 +76,11 @@ impl fmt::Display for StopWatchSpan {
                 instructions /= 1000;
                 prefix = "m"
             }
-            write!(f, ", {}{}i", instructions, prefix)?;
+            if instructions > 10000 {
+                instructions /= 1000;
+                prefix = "g"
+            }
+            write!(f, ", {}{}instr", instructions, prefix)?;
         }
         if let Some(memory) = self.memory {
             write!(f, ", {}", memory)?;
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
index 1700cb8a7..2ee4e88b2 100644
--- a/crates/project_model/src/cargo_workspace.rs
+++ b/crates/project_model/src/cargo_workspace.rs
@@ -3,9 +3,10 @@
 use std::{
     convert::TryInto,
     ffi::OsStr,
+    io::BufReader,
     ops,
     path::{Path, PathBuf},
-    process::Command,
+    process::{Command, Stdio},
 };
 
 use anyhow::{Context, Result};
@@ -15,6 +16,7 @@ use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}
 use itertools::Itertools;
 use paths::{AbsPath, AbsPathBuf};
 use rustc_hash::FxHashMap;
+use stdx::JodChild;
 
 use crate::cfg_flag::CfgFlag;
 use crate::utf8_stdout;
@@ -80,19 +82,35 @@ pub type Package = Idx<PackageData>;
 
 pub type Target = Idx<TargetData>;
 
+/// Information associated with a cargo crate
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct PackageData {
+    /// Version given in the `Cargo.toml`
     pub version: String,
+    /// Name as given in the `Cargo.toml`
     pub name: String,
+    /// Path containing the `Cargo.toml`
     pub manifest: AbsPathBuf,
+    /// Targets provided by the crate (lib, bin, example, test, ...)
     pub targets: Vec<Target>,
+    /// Is this package a member of the current workspace
     pub is_member: bool,
+    /// List of packages this package depends on
     pub dependencies: Vec<PackageDependency>,
+    /// Rust edition for this package
     pub edition: Edition,
+    /// List of features to activate
     pub features: Vec<String>,
+    /// List of config flags defined by this package's build script
     pub cfgs: Vec<CfgFlag>,
+    /// List of cargo-related environment variables with their value
+    ///
+    /// If the package has a build script which defines environment variables,
+    /// they can also be found here.
     pub envs: Vec<(String, String)>,
+    /// Directory where a build script might place its output
     pub out_dir: Option<AbsPathBuf>,
+    /// Path to the proc-macro library file if this package exposes proc-macros
     pub proc_macro_dylib_path: Option<AbsPathBuf>,
 }
 
@@ -102,12 +120,18 @@ pub struct PackageDependency {
     pub name: String,
 }
 
+/// Information associated with a package's target
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct TargetData {
+    /// Package that provided this target
     pub package: Package,
+    /// Name as given in the `Cargo.toml` or generated from the file name
     pub name: String,
+    /// Path to the main source file of the target
     pub root: AbsPathBuf,
+    /// Kind of target
     pub kind: TargetKind,
+    /// Is this target a proc-macro
     pub is_proc_macro: bool,
 }
 
@@ -149,6 +173,7 @@ impl CargoWorkspace {
     pub fn from_cargo_metadata(
         cargo_toml: &AbsPath,
         config: &CargoConfig,
+        progress: &dyn Fn(String),
     ) -> Result<CargoWorkspace> {
         let mut meta = MetadataCommand::new();
         meta.cargo_path(toolchain::cargo());
@@ -198,6 +223,9 @@ impl CargoWorkspace {
             meta.other_options(vec![String::from("--filter-platform"), target]);
         }
 
+        // FIXME: Currently MetadataCommand is not based on parse_stream,
+        // So we just report it as a whole
+        progress("metadata".to_string());
         let mut meta = meta.exec().with_context(|| {
             let cwd: Option<AbsPathBuf> =
                 std::env::current_dir().ok().and_then(|p| p.try_into().ok());
@@ -221,7 +249,7 @@ impl CargoWorkspace {
         let mut envs = FxHashMap::default();
         let mut proc_macro_dylib_paths = FxHashMap::default();
         if config.load_out_dirs_from_check {
-            let resources = load_extern_resources(cargo_toml, config)?;
+            let resources = load_extern_resources(cargo_toml, config, progress)?;
             out_dir_by_id = resources.out_dirs;
             cfgs = resources.cfgs;
             envs = resources.env;
@@ -346,6 +374,7 @@ pub(crate) struct ExternResources {
 pub(crate) fn load_extern_resources(
     cargo_toml: &Path,
     cargo_features: &CargoConfig,
+    progress: &dyn Fn(String),
 ) -> Result<ExternResources> {
     let mut cmd = Command::new(toolchain::cargo());
     cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml);
@@ -373,11 +402,14 @@ pub(crate) fn load_extern_resources(
         }
     }
 
-    let output = cmd.output()?;
+    cmd.stdout(Stdio::piped()).stderr(Stdio::null()).stdin(Stdio::null());
 
-    let mut res = ExternResources::default();
+    let mut child = cmd.spawn().map(JodChild)?;
+    let child_stdout = child.stdout.take().unwrap();
+    let stdout = BufReader::new(child_stdout);
 
-    for message in cargo_metadata::Message::parse_stream(output.stdout.as_slice()) {
+    let mut res = ExternResources::default();
+    for message in cargo_metadata::Message::parse_stream(stdout) {
         if let Ok(message) = message {
             match message {
                 Message::BuildScriptExecuted(BuildScript {
@@ -410,6 +442,8 @@ pub(crate) fn load_extern_resources(
                     res.env.insert(package_id, env);
                 }
                 Message::CompilerArtifact(message) => {
+                    progress(format!("metadata {}", message.target.name));
+
                     if message.target.kind.contains(&"proc-macro".to_string()) {
                         let package_id = message.package_id;
                         // Skip rmeta file
@@ -420,7 +454,9 @@ pub(crate) fn load_extern_resources(
                         }
                     }
                 }
-                Message::CompilerMessage(_) => (),
+                Message::CompilerMessage(message) => {
+                    progress(message.target.name.clone());
+                }
                 Message::Unknown => (),
                 Message::BuildFinished(_) => {}
                 Message::TextLine(_) => {}
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 24aa9b8fa..aabb7a47d 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -1,9 +1,9 @@
 //! FIXME: write short doc here
 
 mod cargo_workspace;
+mod cfg_flag;
 mod project_json;
 mod sysroot;
-mod cfg_flag;
 mod workspace;
 
 use std::{
@@ -17,7 +17,10 @@ use paths::{AbsPath, AbsPathBuf};
 use rustc_hash::FxHashSet;
 
 pub use crate::{
-    cargo_workspace::{CargoConfig, CargoWorkspace, Package, Target, TargetKind},
+    cargo_workspace::{
+        CargoConfig, CargoWorkspace, Package, PackageData, PackageDependency, Target, TargetData,
+        TargetKind,
+    },
     project_json::{ProjectJson, ProjectJsonData},
     sysroot::Sysroot,
     workspace::{PackageRoot, ProjectWorkspace},
diff --git a/crates/project_model/src/project_json.rs b/crates/project_model/src/project_json.rs
index af884eb84..41a2ac03e 100644
--- a/crates/project_model/src/project_json.rs
+++ b/crates/project_model/src/project_json.rs
@@ -110,13 +110,13 @@ impl ProjectJson {
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 pub struct ProjectJsonData {
     sysroot_src: Option<PathBuf>,
     crates: Vec<CrateData>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 struct CrateData {
     display_name: Option<String>,
     root_module: PathBuf,
@@ -132,7 +132,7 @@ struct CrateData {
     source: Option<CrateSource>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(rename = "edition")]
 enum EditionData {
     #[serde(rename = "2015")]
@@ -153,7 +153,7 @@ impl From<EditionData> for Edition {
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 struct DepData {
     /// Identifies a crate by position in the crates array.
     #[serde(rename = "crate")]
@@ -162,7 +162,7 @@ struct DepData {
     name: CrateName,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 struct CrateSource {
     include_dirs: Vec<PathBuf>,
     exclude_dirs: Vec<PathBuf>,
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs
index 68a235ce3..06a0be284 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project_model/src/workspace.rs
@@ -64,7 +64,11 @@ impl fmt::Debug for ProjectWorkspace {
 }
 
 impl ProjectWorkspace {
-    pub fn load(manifest: ProjectManifest, config: &CargoConfig) -> Result<ProjectWorkspace> {
+    pub fn load(
+        manifest: ProjectManifest,
+        config: &CargoConfig,
+        progress: &dyn Fn(String),
+    ) -> Result<ProjectWorkspace> {
         let res = match manifest {
             ProjectManifest::ProjectJson(project_json) => {
                 let file = fs::read_to_string(&project_json).with_context(|| {
@@ -84,15 +88,14 @@ impl ProjectWorkspace {
                     cmd
                 })?;
 
-                let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, config).with_context(
-                    || {
+                let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, config, progress)
+                    .with_context(|| {
                         format!(
                             "Failed to read Cargo metadata from Cargo.toml file {}, {}",
                             cargo_toml.display(),
                             cargo_version
                         )
-                    },
-                )?;
+                    })?;
                 let sysroot = if config.no_sysroot {
                     Sysroot::default()
                 } else {
@@ -105,9 +108,12 @@ impl ProjectWorkspace {
                 };
 
                 let rustc = if let Some(rustc_dir) = &config.rustc_source {
-                    Some(CargoWorkspace::from_cargo_metadata(&rustc_dir, config).with_context(
-                        || format!("Failed to read Cargo metadata for Rust sources"),
-                    )?)
+                    Some(
+                        CargoWorkspace::from_cargo_metadata(&rustc_dir, config, progress)
+                            .with_context(|| {
+                                format!("Failed to read Cargo metadata for Rust sources")
+                            })?,
+                    )
                 } else {
                     None
                 };
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 0a63593fb..af7b86ead 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -62,7 +62,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" }
 winapi = "0.3.8"
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
 test_utils = { path = "../test_utils" }
 mbe = { path = "../mbe" }
 tt = { path = "../tt" }
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index defdcbd74..3af3c59d8 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -8,11 +8,7 @@ use std::{convert::TryFrom, env, fs, path::PathBuf, process};
 
 use lsp_server::Connection;
 use project_model::ProjectManifest;
-use rust_analyzer::{
-    cli,
-    config::{Config, LinkedProject},
-    from_json, Result,
-};
+use rust_analyzer::{cli, config::Config, from_json, Result};
 use vfs::AbsPathBuf;
 
 #[cfg(all(feature = "mimalloc"))]
@@ -138,13 +134,12 @@ fn run_server() -> Result<()> {
             }
         };
 
-        let mut config = Config::new(root_path);
+        let mut config = Config::new(root_path, initialize_params.capabilities);
         if let Some(json) = initialize_params.initialization_options {
             config.update(json);
         }
-        config.update_caps(&initialize_params.capabilities);
 
-        if config.linked_projects.is_empty() {
+        if config.linked_projects().is_empty() {
             let workspace_roots = initialize_params
                 .workspace_folders
                 .map(|workspaces| {
@@ -163,7 +158,7 @@ fn run_server() -> Result<()> {
                 log::error!("failed to find any projects in {:?}", workspace_roots);
             }
 
-            config.linked_projects = discovered.into_iter().map(LinkedProject::from).collect();
+            config.discovered_projects = Some(discovered);
         }
 
         config
diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs
index 80e46bf7f..3db0d55c5 100644
--- a/crates/rust-analyzer/src/caps.rs
+++ b/crates/rust-analyzer/src/caps.rs
@@ -1,7 +1,6 @@
 //! Advertizes the capabilities of the LSP Server.
 use std::env;
 
-use ide::CompletionResolveCapability;
 use lsp_types::{
     CallHierarchyServerCapability, ClientCapabilities, CodeActionKind, CodeActionOptions,
     CodeActionProviderCapability, CodeLensOptions, CompletionOptions,
@@ -14,7 +13,6 @@ use lsp_types::{
     WorkDoneProgressOptions, WorkspaceFileOperationsServerCapabilities,
     WorkspaceServerCapabilities,
 };
-use rustc_hash::FxHashSet;
 use serde_json::json;
 
 use crate::semantic_tokens;
@@ -118,37 +116,31 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
 }
 
 fn completions_resolve_provider(client_caps: &ClientCapabilities) -> Option<bool> {
-    if enabled_completions_resolve_capabilities(client_caps)?.is_empty() {
+    if completion_item_edit_resolve(client_caps) {
+        Some(true)
+    } else {
         log::info!("No `additionalTextEdits` completion resolve capability was found in the client capabilities, autoimport completion is disabled");
         None
-    } else {
-        Some(true)
     }
 }
 
 /// Parses client capabilities and returns all completion resolve capabilities rust-analyzer supports.
-pub(crate) fn enabled_completions_resolve_capabilities(
-    caps: &ClientCapabilities,
-) -> Option<FxHashSet<CompletionResolveCapability>> {
-    Some(
-        caps.text_document
-            .as_ref()?
-            .completion
-            .as_ref()?
-            .completion_item
-            .as_ref()?
-            .resolve_support
-            .as_ref()?
-            .properties
-            .iter()
-            .filter_map(|cap_string| match cap_string.as_str() {
-                "additionalTextEdits" => Some(CompletionResolveCapability::AdditionalTextEdits),
-                "detail" => Some(CompletionResolveCapability::Detail),
-                "documentation" => Some(CompletionResolveCapability::Documentation),
-                _unsupported => None,
-            })
-            .collect(),
-    )
+pub(crate) fn completion_item_edit_resolve(caps: &ClientCapabilities) -> bool {
+    (|| {
+        Some(
+            caps.text_document
+                .as_ref()?
+                .completion
+                .as_ref()?
+                .completion_item
+                .as_ref()?
+                .resolve_support
+                .as_ref()?
+                .properties
+                .iter()
+                .any(|cap_string| cap_string.as_str() == "additionalTextEdits"),
+        )
+    })() == Some(true)
 }
 
 fn code_action_capabilities(client_caps: &ClientCapabilities) -> CodeActionProviderCapability {
diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs
index 8a8b4a32c..5af0802a2 100644
--- a/crates/rust-analyzer/src/cargo_target_spec.rs
+++ b/crates/rust-analyzer/src/cargo_target_spec.rs
@@ -84,14 +84,15 @@ impl CargoTargetSpec {
             }
         }
 
-        if snap.config.cargo.all_features {
+        let cargo_config = snap.config.cargo();
+        if cargo_config.all_features {
             args.push("--all-features".to_string());
         } else {
             let mut features = Vec::new();
             if let Some(cfg) = cfg.as_ref() {
                 required_features(cfg, &mut features);
             }
-            for feature in &snap.config.cargo.features {
+            for feature in cargo_config.features {
                 features.push(feature.clone());
             }
             features.dedup();
diff --git a/crates/rust-analyzer/src/cli/analysis_bench.rs b/crates/rust-analyzer/src/cli/analysis_bench.rs
index 5a8484c62..7d3fda7a8 100644
--- a/crates/rust-analyzer/src/cli/analysis_bench.rs
+++ b/crates/rust-analyzer/src/cli/analysis_bench.rs
@@ -6,9 +6,12 @@ use anyhow::{bail, format_err, Result};
 use ide::{
     Analysis, AnalysisHost, Change, CompletionConfig, DiagnosticsConfig, FilePosition, LineCol,
 };
-use ide_db::base_db::{
-    salsa::{Database, Durability},
-    FileId,
+use ide_db::{
+    base_db::{
+        salsa::{Database, Durability},
+        FileId,
+    },
+    helpers::SnippetCap,
 };
 use vfs::AbsPathBuf;
 
@@ -87,7 +90,14 @@ impl BenchCmd {
                 let file_position = FilePosition { file_id, offset };
 
                 if is_completion {
-                    let options = CompletionConfig::default();
+                    let options = CompletionConfig {
+                        enable_postfix_completions: true,
+                        enable_autoimport_completions: true,
+                        add_call_parenthesis: true,
+                        add_call_argument_snippets: true,
+                        snippet_cap: SnippetCap::new(true),
+                        merge: None,
+                    };
                     let res = do_work(&mut host, file_id, |analysis| {
                         analysis.completions(&options, file_position)
                     });
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index e5ab6c73b..31a16ca46 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -21,6 +21,7 @@ pub fn load_cargo(
     let ws = ProjectWorkspace::load(
         root,
         &CargoConfig { load_out_dirs_from_check, ..Default::default() },
+        &|_| {},
     )?;
 
     let (sender, receiver) = unbounded();
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 685a9fdf0..2d3e25cbf 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -7,12 +7,15 @@
 //! configure the server itself, feature flags are passed into analysis, and
 //! tweak things like automatic insertion of `()` in completions.
 
-use std::{convert::TryFrom, ffi::OsString, path::PathBuf};
+use std::{convert::TryFrom, ffi::OsString, iter, path::PathBuf};
 
 use flycheck::FlycheckConfig;
 use hir::PrefixKind;
-use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig};
-use ide_db::helpers::insert_use::MergeBehavior;
+use ide::{
+    AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig,
+    InsertUseConfig,
+};
+use ide_db::helpers::{insert_use::MergeBehavior, SnippetCap};
 use itertools::Itertools;
 use lsp_types::{ClientCapabilities, MarkupKind};
 use project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
@@ -20,12 +23,13 @@ use rustc_hash::FxHashSet;
 use serde::{de::DeserializeOwned, Deserialize};
 use vfs::AbsPathBuf;
 
-use crate::{caps::enabled_completions_resolve_capabilities, diagnostics::DiagnosticsMapConfig};
+use crate::{caps::completion_item_edit_resolve, diagnostics::DiagnosticsMapConfig};
 
 config_data! {
     struct ConfigData {
         /// The strategy to use when inserting new imports or merging imports.
-        assist_importMergeBehaviour: MergeBehaviorDef = "\"full\"",
+        assist_importMergeBehavior |
+        assist_importMergeBehaviour: MergeBehaviorDef  = "\"full\"",
         /// The path structure for newly inserted paths to use.
         assist_importPrefix: ImportPrefixDef           = "\"plain\"",
 
@@ -148,13 +152,19 @@ config_data! {
         /// of projects.\n\nElements must be paths pointing to `Cargo.toml`,
         /// `rust-project.json`, or JSON objects in `rust-project.json` format.
         linkedProjects: Vec<ManifestOrProjectJson> = "[]",
+
         /// Number of syntax trees rust-analyzer keeps in memory.  Defaults to 128.
         lruCapacity: Option<usize>                 = "null",
+
         /// Whether to show `can't find Cargo.toml` error message.
         notifications_cargoTomlNotFound: bool      = "true",
+
         /// Enable Proc macro support, `#rust-analyzer.cargo.loadOutDirsFromCheck#` must be
         /// enabled.
         procMacro_enable: bool                     = "false",
+        /// Internal config, path to proc-macro server executable (typically,
+        /// this is rust-analyzer itself, but we override this in tests).
+        procMacro_server: Option<PathBuf>          = "null",
 
         /// Command to be executed instead of 'cargo' for runnables.
         runnables_overrideCargo: Option<String> = "null",
@@ -163,7 +173,7 @@ config_data! {
         runnables_cargoExtraArgs: Vec<String>   = "[]",
 
         /// Path to the rust compiler sources, for usage in rustc_private projects.
-        rustcSource : Option<String> = "null",
+        rustcSource : Option<PathBuf> = "null",
 
         /// Additional arguments to `rustfmt`.
         rustfmt_extraArgs: Vec<String>               = "[]",
@@ -173,34 +183,17 @@ config_data! {
     }
 }
 
+impl Default for ConfigData {
+    fn default() -> Self {
+        ConfigData::from_json(serde_json::Value::Null)
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct Config {
-    pub client_caps: ClientCapsConfig,
-
-    pub publish_diagnostics: bool,
-    pub diagnostics: DiagnosticsConfig,
-    pub diagnostics_map: DiagnosticsMapConfig,
-    pub lru_capacity: Option<usize>,
-    pub proc_macro_srv: Option<(PathBuf, Vec<OsString>)>,
-    pub files: FilesConfig,
-    pub notifications: NotificationsConfig,
-
-    pub cargo_autoreload: bool,
-    pub cargo: CargoConfig,
-    pub rustfmt: RustfmtConfig,
-    pub flycheck: Option<FlycheckConfig>,
-    pub runnables: RunnablesConfig,
-
-    pub inlay_hints: InlayHintsConfig,
-    pub completion: CompletionConfig,
-    pub assist: AssistConfig,
-    pub call_info_full: bool,
-    pub lens: LensConfig,
-    pub hover: HoverConfig,
-    pub semantic_tokens_refresh: bool,
-    pub code_lens_refresh: bool,
-
-    pub linked_projects: Vec<LinkedProject>,
+    caps: lsp_types::ClientCapabilities,
+    data: ConfigData,
+    pub discovered_projects: Option<Vec<ProjectManifest>>,
     pub root_path: AbsPathBuf,
 }
 
@@ -230,12 +223,6 @@ pub struct LensConfig {
     pub method_refs: bool,
 }
 
-impl Default for LensConfig {
-    fn default() -> Self {
-        Self { run: true, debug: true, implementations: true, method_refs: false }
-    }
-}
-
 impl LensConfig {
     pub fn any(&self) -> bool {
         self.implementations || self.runnable() || self.references()
@@ -278,7 +265,7 @@ pub enum RustfmtConfig {
 }
 
 /// Configuration for runnable items, such as `main` function or tests.
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct RunnablesConfig {
     /// Custom command to be executed instead of `cargo` for runnables.
     pub override_cargo: Option<String>,
@@ -286,325 +273,354 @@ pub struct RunnablesConfig {
     pub cargo_extra_args: Vec<String>,
 }
 
-#[derive(Debug, Clone, Default)]
-pub struct ClientCapsConfig {
-    pub location_link: bool,
-    pub line_folding_only: bool,
-    pub hierarchical_symbols: bool,
-    pub code_action_literals: bool,
-    pub work_done_progress: bool,
-    pub code_action_group: bool,
-    pub code_action_resolve: bool,
-    pub hover_actions: bool,
-    pub status_notification: bool,
-    pub signature_help_label_offsets: bool,
-}
-
 impl Config {
-    pub fn new(root_path: AbsPathBuf) -> Self {
-        // Defaults here don't matter, we'll immediately re-write them with
-        // ConfigData.
-        let mut res = Config {
-            client_caps: ClientCapsConfig::default(),
-
-            publish_diagnostics: false,
-            diagnostics: DiagnosticsConfig::default(),
-            diagnostics_map: DiagnosticsMapConfig::default(),
-            lru_capacity: None,
-            proc_macro_srv: None,
-            files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
-            notifications: NotificationsConfig { cargo_toml_not_found: false },
-
-            cargo_autoreload: false,
-            cargo: CargoConfig::default(),
-            rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
-            flycheck: Some(FlycheckConfig::CargoCommand {
-                command: String::new(),
-                target_triple: None,
-                no_default_features: false,
-                all_targets: false,
-                all_features: false,
-                extra_args: Vec::new(),
-                features: Vec::new(),
-            }),
-            runnables: RunnablesConfig::default(),
-
-            inlay_hints: InlayHintsConfig {
-                type_hints: false,
-                parameter_hints: false,
-                chaining_hints: false,
-                max_length: None,
-            },
-            completion: CompletionConfig::default(),
-            assist: AssistConfig::default(),
-            call_info_full: false,
-            lens: LensConfig::default(),
-            hover: HoverConfig::default(),
-            semantic_tokens_refresh: false,
-            code_lens_refresh: false,
-            linked_projects: Vec::new(),
-            root_path,
-        };
-        res.do_update(serde_json::json!({}));
-        res
+    pub fn new(root_path: AbsPathBuf, caps: ClientCapabilities) -> Self {
+        Config { caps, data: ConfigData::default(), discovered_projects: None, root_path }
     }
     pub fn update(&mut self, json: serde_json::Value) {
         log::info!("updating config from JSON: {:#}", json);
         if json.is_null() || json.as_object().map_or(false, |it| it.is_empty()) {
             return;
         }
-        self.do_update(json);
-        log::info!("updated config: {:#?}", self);
+        self.data = ConfigData::from_json(json);
     }
-    fn do_update(&mut self, json: serde_json::Value) {
-        let data = ConfigData::from_json(json);
 
-        self.publish_diagnostics = data.diagnostics_enable;
-        self.diagnostics = DiagnosticsConfig {
-            disable_experimental: !data.diagnostics_enableExperimental,
-            disabled: data.diagnostics_disabled,
-        };
-        self.diagnostics_map = DiagnosticsMapConfig {
-            warnings_as_info: data.diagnostics_warningsAsInfo,
-            warnings_as_hint: data.diagnostics_warningsAsHint,
-        };
-        self.lru_capacity = data.lruCapacity;
-        self.files.watcher = match data.files_watcher.as_str() {
-            "notify" => FilesWatcher::Notify,
-            "client" | _ => FilesWatcher::Client,
-        };
-        self.notifications =
-            NotificationsConfig { cargo_toml_not_found: data.notifications_cargoTomlNotFound };
-        self.cargo_autoreload = data.cargo_autoreload;
-
-        let rustc_source = if let Some(rustc_source) = data.rustcSource {
-            let rustpath: PathBuf = rustc_source.into();
-            AbsPathBuf::try_from(rustpath)
-                .map_err(|_| {
-                    log::error!("rustc source directory must be an absolute path");
-                })
-                .ok()
-        } else {
-            None
-        };
-
-        self.cargo = CargoConfig {
-            no_default_features: data.cargo_noDefaultFeatures,
-            all_features: data.cargo_allFeatures,
-            features: data.cargo_features.clone(),
-            load_out_dirs_from_check: data.cargo_loadOutDirsFromCheck,
-            target: data.cargo_target.clone(),
-            rustc_source: rustc_source,
-            no_sysroot: data.cargo_noSysroot,
-        };
-        self.runnables = RunnablesConfig {
-            override_cargo: data.runnables_overrideCargo,
-            cargo_extra_args: data.runnables_cargoExtraArgs,
-        };
-
-        self.proc_macro_srv = if data.procMacro_enable {
-            std::env::current_exe().ok().map(|path| (path, vec!["proc-macro".into()]))
-        } else {
-            None
-        };
+    pub fn json_schema() -> serde_json::Value {
+        ConfigData::json_schema()
+    }
+}
 
-        self.rustfmt = match data.rustfmt_overrideCommand {
-            Some(mut args) if !args.is_empty() => {
-                let command = args.remove(0);
-                RustfmtConfig::CustomCommand { command, args }
-            }
-            Some(_) | None => RustfmtConfig::Rustfmt { extra_args: data.rustfmt_extraArgs },
-        };
+macro_rules! try_ {
+    ($expr:expr) => {
+        || -> _ { Some($expr) }()
+    };
+}
+macro_rules! try_or {
+    ($expr:expr, $or:expr) => {
+        try_!($expr).unwrap_or($or)
+    };
+}
 
-        self.flycheck = if data.checkOnSave_enable {
-            let flycheck_config = match data.checkOnSave_overrideCommand {
-                Some(mut args) if !args.is_empty() => {
-                    let command = args.remove(0);
-                    FlycheckConfig::CustomCommand { command, args }
-                }
-                Some(_) | None => FlycheckConfig::CargoCommand {
-                    command: data.checkOnSave_command,
-                    target_triple: data.checkOnSave_target.or(data.cargo_target),
-                    all_targets: data.checkOnSave_allTargets,
-                    no_default_features: data
-                        .checkOnSave_noDefaultFeatures
-                        .unwrap_or(data.cargo_noDefaultFeatures),
-                    all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures),
-                    features: data.checkOnSave_features.unwrap_or(data.cargo_features),
-                    extra_args: data.checkOnSave_extraArgs,
-                },
-            };
-            Some(flycheck_config)
+impl Config {
+    pub fn linked_projects(&self) -> Vec<LinkedProject> {
+        if self.data.linkedProjects.is_empty() {
+            self.discovered_projects
+                .as_ref()
+                .into_iter()
+                .flatten()
+                .cloned()
+                .map(LinkedProject::from)
+                .collect()
         } else {
-            None
-        };
-
-        self.inlay_hints = InlayHintsConfig {
-            type_hints: data.inlayHints_typeHints,
-            parameter_hints: data.inlayHints_parameterHints,
-            chaining_hints: data.inlayHints_chainingHints,
-            max_length: data.inlayHints_maxLength,
-        };
-
-        self.assist.insert_use.merge = match data.assist_importMergeBehaviour {
-            MergeBehaviorDef::None => None,
-            MergeBehaviorDef::Full => Some(MergeBehavior::Full),
-            MergeBehaviorDef::Last => Some(MergeBehavior::Last),
-        };
-        self.assist.insert_use.prefix_kind = match data.assist_importPrefix {
-            ImportPrefixDef::Plain => PrefixKind::Plain,
-            ImportPrefixDef::ByCrate => PrefixKind::ByCrate,
-            ImportPrefixDef::BySelf => PrefixKind::BySelf,
-        };
-
-        self.completion.enable_postfix_completions = data.completion_postfix_enable;
-        self.completion.enable_autoimport_completions = data.completion_autoimport_enable;
-        self.completion.add_call_parenthesis = data.completion_addCallParenthesis;
-        self.completion.add_call_argument_snippets = data.completion_addCallArgumentSnippets;
-        self.completion.merge = self.assist.insert_use.merge;
-
-        self.call_info_full = data.callInfo_full;
-
-        self.lens = LensConfig {
-            run: data.lens_enable && data.lens_run,
-            debug: data.lens_enable && data.lens_debug,
-            implementations: data.lens_enable && data.lens_implementations,
-            method_refs: data.lens_enable && data.lens_methodReferences,
-        };
-
-        if !data.linkedProjects.is_empty() {
-            self.linked_projects.clear();
-            for linked_project in data.linkedProjects {
-                let linked_project = match linked_project {
-                    ManifestOrProjectJson::Manifest(it) => {
-                        let path = self.root_path.join(it);
-                        match ProjectManifest::from_manifest_file(path) {
-                            Ok(it) => it.into(),
-                            Err(e) => {
-                                log::error!("failed to load linked project: {}", e);
-                                continue;
-                            }
+            self.data
+                .linkedProjects
+                .iter()
+                .filter_map(|linked_project| {
+                    let res = match linked_project {
+                        ManifestOrProjectJson::Manifest(it) => {
+                            let path = self.root_path.join(it);
+                            ProjectManifest::from_manifest_file(path)
+                                .map_err(|e| log::error!("failed to load linked project: {}", e))
+                                .ok()?
+                                .into()
                         }
-                    }
-                    ManifestOrProjectJson::ProjectJson(it) => {
-                        ProjectJson::new(&self.root_path, it).into()
-                    }
-                };
-                self.linked_projects.push(linked_project);
-            }
+                        ManifestOrProjectJson::ProjectJson(it) => {
+                            ProjectJson::new(&self.root_path, it.clone()).into()
+                        }
+                    };
+                    Some(res)
+                })
+                .collect()
         }
-
-        self.hover = HoverConfig {
-            implementations: data.hoverActions_enable && data.hoverActions_implementations,
-            run: data.hoverActions_enable && data.hoverActions_run,
-            debug: data.hoverActions_enable && data.hoverActions_debug,
-            goto_type_def: data.hoverActions_enable && data.hoverActions_gotoTypeDef,
-            links_in_hover: data.hoverActions_linksInHover,
-            markdown: true,
-        };
     }
 
-    pub fn update_caps(&mut self, caps: &ClientCapabilities) {
-        if let Some(doc_caps) = caps.text_document.as_ref() {
-            if let Some(value) = doc_caps.hover.as_ref().and_then(|it| it.content_format.as_ref()) {
-                self.hover.markdown = value.contains(&MarkupKind::Markdown)
-            }
-            if let Some(value) = doc_caps.definition.as_ref().and_then(|it| it.link_support) {
-                self.client_caps.location_link = value;
-            }
-            if let Some(value) = doc_caps.folding_range.as_ref().and_then(|it| it.line_folding_only)
-            {
-                self.client_caps.line_folding_only = value
-            }
-            if let Some(value) = doc_caps
+    pub fn location_link(&self) -> bool {
+        try_or!(self.caps.text_document.as_ref()?.definition?.link_support?, false)
+    }
+    pub fn line_folding_only(&self) -> bool {
+        try_or!(self.caps.text_document.as_ref()?.folding_range.as_ref()?.line_folding_only?, false)
+    }
+    pub fn hierarchical_symbols(&self) -> bool {
+        try_or!(
+            self.caps
+                .text_document
+                .as_ref()?
                 .document_symbol
-                .as_ref()
-                .and_then(|it| it.hierarchical_document_symbol_support)
-            {
-                self.client_caps.hierarchical_symbols = value
-            }
-            if let Some(value) =
-                doc_caps.code_action.as_ref().map(|it| it.code_action_literal_support.is_some())
-            {
-                self.client_caps.code_action_literals = value;
-            }
-            if let Some(value) = doc_caps
+                .as_ref()?
+                .hierarchical_document_symbol_support?,
+            false
+        )
+    }
+    pub fn code_action_literals(&self) -> bool {
+        try_!(self
+            .caps
+            .text_document
+            .as_ref()?
+            .code_action
+            .as_ref()?
+            .code_action_literal_support
+            .as_ref()?)
+        .is_some()
+    }
+    pub fn work_done_progress(&self) -> bool {
+        try_or!(self.caps.window.as_ref()?.work_done_progress?, false)
+    }
+    pub fn code_action_resolve(&self) -> bool {
+        try_or!(
+            self.caps
+                .text_document
+                .as_ref()?
+                .code_action
+                .as_ref()?
+                .resolve_support
+                .as_ref()?
+                .properties
+                .as_slice(),
+            &[]
+        )
+        .iter()
+        .any(|it| it == "edit")
+    }
+    pub fn signature_help_label_offsets(&self) -> bool {
+        try_or!(
+            self.caps
+                .text_document
+                .as_ref()?
                 .signature_help
-                .as_ref()
-                .and_then(|it| it.signature_information.as_ref())
-                .and_then(|it| it.parameter_information.as_ref())
-                .and_then(|it| it.label_offset_support)
-            {
-                self.client_caps.signature_help_label_offsets = value;
-            }
+                .as_ref()?
+                .signature_information
+                .as_ref()?
+                .parameter_information
+                .as_ref()?
+                .label_offset_support?,
+            false
+        )
+    }
 
-            self.completion.allow_snippets(false);
-            self.completion.active_resolve_capabilities =
-                enabled_completions_resolve_capabilities(caps).unwrap_or_default();
-            if let Some(completion) = &doc_caps.completion {
-                if let Some(completion_item) = &completion.completion_item {
-                    if let Some(value) = completion_item.snippet_support {
-                        self.completion.allow_snippets(value);
-                    }
-                }
-            }
+    fn experimental(&self, index: &'static str) -> bool {
+        try_or!(self.caps.experimental.as_ref()?.get(index)?.as_bool()?, false)
+    }
+    pub fn code_action_group(&self) -> bool {
+        self.experimental("codeActionGroup")
+    }
+    pub fn hover_actions(&self) -> bool {
+        self.experimental("hoverActions")
+    }
+    pub fn status_notification(&self) -> bool {
+        self.experimental("statusNotification")
+    }
 
-            if let Some(code_action) = &doc_caps.code_action {
-                if let Some(resolve_support) = &code_action.resolve_support {
-                    if resolve_support.properties.iter().any(|it| it == "edit") {
-                        self.client_caps.code_action_resolve = true;
-                    }
-                }
-            }
+    pub fn publish_diagnostics(&self) -> bool {
+        self.data.diagnostics_enable
+    }
+    pub fn diagnostics(&self) -> DiagnosticsConfig {
+        DiagnosticsConfig {
+            disable_experimental: !self.data.diagnostics_enableExperimental,
+            disabled: self.data.diagnostics_disabled.clone(),
         }
-
-        if let Some(window_caps) = caps.window.as_ref() {
-            if let Some(value) = window_caps.work_done_progress {
-                self.client_caps.work_done_progress = value;
-            }
+    }
+    pub fn diagnostics_map(&self) -> DiagnosticsMapConfig {
+        DiagnosticsMapConfig {
+            warnings_as_info: self.data.diagnostics_warningsAsInfo.clone(),
+            warnings_as_hint: self.data.diagnostics_warningsAsHint.clone(),
         }
-
-        self.assist.allow_snippets(false);
-        if let Some(experimental) = &caps.experimental {
-            let get_bool =
-                |index: &str| experimental.get(index).and_then(|it| it.as_bool()) == Some(true);
-
-            let snippet_text_edit = get_bool("snippetTextEdit");
-            self.assist.allow_snippets(snippet_text_edit);
-
-            self.client_caps.code_action_group = get_bool("codeActionGroup");
-            self.client_caps.hover_actions = get_bool("hoverActions");
-            self.client_caps.status_notification = get_bool("statusNotification");
+    }
+    pub fn lru_capacity(&self) -> Option<usize> {
+        self.data.lruCapacity
+    }
+    pub fn proc_macro_srv(&self) -> Option<(PathBuf, Vec<OsString>)> {
+        if !self.data.procMacro_enable {
+            return None;
         }
 
-        if let Some(workspace_caps) = caps.workspace.as_ref() {
-            if let Some(refresh_support) =
-                workspace_caps.semantic_tokens.as_ref().and_then(|it| it.refresh_support)
-            {
-                self.semantic_tokens_refresh = refresh_support;
+        let path = self.data.procMacro_server.clone().or_else(|| std::env::current_exe().ok())?;
+        Some((path, vec!["proc-macro".into()]))
+    }
+    pub fn files(&self) -> FilesConfig {
+        FilesConfig {
+            watcher: match self.data.files_watcher.as_str() {
+                "notify" => FilesWatcher::Notify,
+                "client" | _ => FilesWatcher::Client,
+            },
+            exclude: Vec::new(),
+        }
+    }
+    pub fn notifications(&self) -> NotificationsConfig {
+        NotificationsConfig { cargo_toml_not_found: self.data.notifications_cargoTomlNotFound }
+    }
+    pub fn cargo_autoreload(&self) -> bool {
+        self.data.cargo_autoreload
+    }
+    pub fn cargo(&self) -> CargoConfig {
+        let rustc_source = self.data.rustcSource.clone().and_then(|it| {
+            AbsPathBuf::try_from(it)
+                .map_err(|_| log::error!("rustc source directory must be an absolute path"))
+                .ok()
+        });
+
+        CargoConfig {
+            no_default_features: self.data.cargo_noDefaultFeatures,
+            all_features: self.data.cargo_allFeatures,
+            features: self.data.cargo_features.clone(),
+            load_out_dirs_from_check: self.data.cargo_loadOutDirsFromCheck,
+            target: self.data.cargo_target.clone(),
+            rustc_source,
+            no_sysroot: self.data.cargo_noSysroot,
+        }
+    }
+    pub fn rustfmt(&self) -> RustfmtConfig {
+        match &self.data.rustfmt_overrideCommand {
+            Some(args) if !args.is_empty() => {
+                let mut args = args.clone();
+                let command = args.remove(0);
+                RustfmtConfig::CustomCommand { command, args }
             }
-
-            if let Some(refresh_support) =
-                workspace_caps.code_lens.as_ref().and_then(|it| it.refresh_support)
-            {
-                self.code_lens_refresh = refresh_support;
+            Some(_) | None => {
+                RustfmtConfig::Rustfmt { extra_args: self.data.rustfmt_extraArgs.clone() }
             }
         }
     }
-
-    pub fn json_schema() -> serde_json::Value {
-        ConfigData::json_schema()
+    pub fn flycheck(&self) -> Option<FlycheckConfig> {
+        if !self.data.checkOnSave_enable {
+            return None;
+        }
+        let flycheck_config = match &self.data.checkOnSave_overrideCommand {
+            Some(args) if !args.is_empty() => {
+                let mut args = args.clone();
+                let command = args.remove(0);
+                FlycheckConfig::CustomCommand { command, args }
+            }
+            Some(_) | None => FlycheckConfig::CargoCommand {
+                command: self.data.checkOnSave_command.clone(),
+                target_triple: self
+                    .data
+                    .checkOnSave_target
+                    .clone()
+                    .or(self.data.cargo_target.clone()),
+                all_targets: self.data.checkOnSave_allTargets,
+                no_default_features: self
+                    .data
+                    .checkOnSave_noDefaultFeatures
+                    .unwrap_or(self.data.cargo_noDefaultFeatures),
+                all_features: self
+                    .data
+                    .checkOnSave_allFeatures
+                    .unwrap_or(self.data.cargo_allFeatures),
+                features: self
+                    .data
+                    .checkOnSave_features
+                    .clone()
+                    .unwrap_or(self.data.cargo_features.clone()),
+                extra_args: self.data.checkOnSave_extraArgs.clone(),
+            },
+        };
+        Some(flycheck_config)
+    }
+    pub fn runnables(&self) -> RunnablesConfig {
+        RunnablesConfig {
+            override_cargo: self.data.runnables_overrideCargo.clone(),
+            cargo_extra_args: self.data.runnables_cargoExtraArgs.clone(),
+        }
+    }
+    pub fn inlay_hints(&self) -> InlayHintsConfig {
+        InlayHintsConfig {
+            type_hints: self.data.inlayHints_typeHints,
+            parameter_hints: self.data.inlayHints_parameterHints,
+            chaining_hints: self.data.inlayHints_chainingHints,
+            max_length: self.data.inlayHints_maxLength,
+        }
+    }
+    fn merge_behavior(&self) -> Option<MergeBehavior> {
+        match self.data.assist_importMergeBehavior {
+            MergeBehaviorDef::None => None,
+            MergeBehaviorDef::Full => Some(MergeBehavior::Full),
+            MergeBehaviorDef::Last => Some(MergeBehavior::Last),
+        }
+    }
+    pub fn completion(&self) -> CompletionConfig {
+        CompletionConfig {
+            enable_postfix_completions: self.data.completion_postfix_enable,
+            enable_autoimport_completions: self.data.completion_autoimport_enable
+                && completion_item_edit_resolve(&self.caps),
+            add_call_parenthesis: self.data.completion_addCallParenthesis,
+            add_call_argument_snippets: self.data.completion_addCallArgumentSnippets,
+            merge: self.merge_behavior(),
+            snippet_cap: SnippetCap::new(try_or!(
+                self.caps
+                    .text_document
+                    .as_ref()?
+                    .completion
+                    .as_ref()?
+                    .completion_item
+                    .as_ref()?
+                    .snippet_support?,
+                false
+            )),
+        }
+    }
+    pub fn assist(&self) -> AssistConfig {
+        AssistConfig {
+            snippet_cap: SnippetCap::new(self.experimental("snippetTextEdit")),
+            allowed: None,
+            insert_use: InsertUseConfig {
+                merge: self.merge_behavior(),
+                prefix_kind: match self.data.assist_importPrefix {
+                    ImportPrefixDef::Plain => PrefixKind::Plain,
+                    ImportPrefixDef::ByCrate => PrefixKind::ByCrate,
+                    ImportPrefixDef::BySelf => PrefixKind::BySelf,
+                },
+            },
+        }
+    }
+    pub fn call_info_full(&self) -> bool {
+        self.data.callInfo_full
+    }
+    pub fn lens(&self) -> LensConfig {
+        LensConfig {
+            run: self.data.lens_enable && self.data.lens_run,
+            debug: self.data.lens_enable && self.data.lens_debug,
+            implementations: self.data.lens_enable && self.data.lens_implementations,
+            method_refs: self.data.lens_enable && self.data.lens_methodReferences,
+        }
+    }
+    pub fn hover(&self) -> HoverConfig {
+        HoverConfig {
+            implementations: self.data.hoverActions_enable
+                && self.data.hoverActions_implementations,
+            run: self.data.hoverActions_enable && self.data.hoverActions_run,
+            debug: self.data.hoverActions_enable && self.data.hoverActions_debug,
+            goto_type_def: self.data.hoverActions_enable && self.data.hoverActions_gotoTypeDef,
+            links_in_hover: self.data.hoverActions_linksInHover,
+            markdown: try_or!(
+                self.caps
+                    .text_document
+                    .as_ref()?
+                    .hover
+                    .as_ref()?
+                    .content_format
+                    .as_ref()?
+                    .as_slice(),
+                &[]
+            )
+            .contains(&MarkupKind::Markdown),
+        }
+    }
+    pub fn semantic_tokens_refresh(&self) -> bool {
+        try_or!(self.caps.workspace.as_ref()?.semantic_tokens.as_ref()?.refresh_support?, false)
+    }
+    pub fn code_lens_refresh(&self) -> bool {
+        try_or!(self.caps.workspace.as_ref()?.code_lens.as_ref()?.refresh_support?, false)
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(untagged)]
 enum ManifestOrProjectJson {
     Manifest(PathBuf),
     ProjectJson(ProjectJsonData),
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "snake_case")]
 enum MergeBehaviorDef {
     None,
@@ -612,7 +628,7 @@ enum MergeBehaviorDef {
     Last,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "snake_case")]
 enum ImportPrefixDef {
     Plain,
@@ -624,15 +640,21 @@ macro_rules! _config_data {
     (struct $name:ident {
         $(
             $(#[doc=$doc:literal])*
-            $field:ident: $ty:ty = $default:expr,
+            $field:ident $(| $alias:ident)?: $ty:ty = $default:expr,
         )*
     }) => {
         #[allow(non_snake_case)]
+        #[derive(Debug, Clone)]
         struct $name { $($field: $ty,)* }
         impl $name {
             fn from_json(mut json: serde_json::Value) -> $name {
                 $name {$(
-                    $field: get_field(&mut json, stringify!($field), $default),
+                    $field: get_field(
+                        &mut json,
+                        stringify!($field),
+                        None$(.or(Some(stringify!($alias))))?,
+                        $default,
+                    ),
                 )*}
             }
 
@@ -664,14 +686,21 @@ use _config_data as config_data;
 fn get_field<T: DeserializeOwned>(
     json: &mut serde_json::Value,
     field: &'static str,
+    alias: Option<&'static str>,
     default: &str,
 ) -> T {
     let default = serde_json::from_str(default).unwrap();
 
-    let mut pointer = field.replace('_', "/");
-    pointer.insert(0, '/');
-    json.pointer_mut(&pointer)
-        .and_then(|it| serde_json::from_value(it.take()).ok())
+    // XXX: check alias first, to work-around the VS Code where it pre-fills the
+    // defaults instead of sending an empty object.
+    alias
+        .into_iter()
+        .chain(iter::once(field))
+        .find_map(move |field| {
+            let mut pointer = field.replace('_', "/");
+            pointer.insert(0, '/');
+            json.pointer_mut(&pointer).and_then(|it| serde_json::from_value(it.take()).ok())
+        })
         .unwrap_or(default)
 }
 
@@ -733,6 +762,9 @@ fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json
         "Option<String>" => set! {
             "type": ["null", "string"],
         },
+        "Option<PathBuf>" => set! {
+            "type": ["null", "string"],
+        },
         "Option<bool>" => set! {
             "type": ["null", "boolean"],
         },
@@ -777,9 +809,8 @@ fn manual(fields: &[(&'static str, &'static str, &[&str], &str)]) -> String {
     fields
         .iter()
         .map(|(field, _ty, doc, default)| {
-            let name = field.replace("_", ".");
-            let name = format!("rust-analyzer.{} (default: `{}`)", name, default);
-            format!("{}::\n{}\n", name, doc.join(" "))
+            let name = format!("rust-analyzer.{}", field.replace("_", "."));
+            format!("[[{}]]{} (default: `{}`)::\n{}\n", name, name, default, doc.join(" "))
         })
         .collect::<String>()
 }
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index 71dc56915..1f6bf1c8c 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -67,7 +67,7 @@ pub(crate) struct GlobalState {
     pub(crate) flycheck: Vec<FlycheckHandle>,
     pub(crate) flycheck_sender: Sender<flycheck::Message>,
     pub(crate) flycheck_receiver: Receiver<flycheck::Message>,
-    pub(crate) config: Config,
+    pub(crate) config: Arc<Config>,
     pub(crate) analysis_host: AnalysisHost,
     pub(crate) diagnostics: DiagnosticCollection,
     pub(crate) mem_docs: FxHashMap<VfsPath, DocumentData>,
@@ -83,7 +83,7 @@ pub(crate) struct GlobalState {
 
 /// An immutable snapshot of the world's state at a point in time.
 pub(crate) struct GlobalStateSnapshot {
-    pub(crate) config: Config,
+    pub(crate) config: Arc<Config>,
     pub(crate) analysis: Analysis,
     pub(crate) check_fixes: CheckFixes,
     pub(crate) latest_requests: Arc<RwLock<LatestRequests>>,
@@ -109,7 +109,7 @@ impl GlobalState {
             Handle { handle, receiver }
         };
 
-        let analysis_host = AnalysisHost::new(config.lru_capacity);
+        let analysis_host = AnalysisHost::new(config.lru_capacity());
         let (flycheck_sender, flycheck_receiver) = unbounded();
         GlobalState {
             sender,
@@ -119,7 +119,7 @@ impl GlobalState {
             flycheck: Vec::new(),
             flycheck_sender,
             flycheck_receiver,
-            config,
+            config: Arc::new(config),
             analysis_host,
             diagnostics: Default::default(),
             mem_docs: FxHashMap::default(),
@@ -184,7 +184,7 @@ impl GlobalState {
 
     pub(crate) fn snapshot(&self) -> GlobalStateSnapshot {
         GlobalStateSnapshot {
-            config: self.config.clone(),
+            config: Arc::clone(&self.config),
             workspaces: Arc::clone(&self.workspaces),
             analysis: self.analysis_host.analysis(),
             vfs: Arc::clone(&self.vfs),
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index dd486070b..29cc9051e 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -9,9 +9,8 @@ use std::{
 };
 
 use ide::{
-    AssistConfig, CompletionResolveCapability, FileId, FilePosition, FileRange, HoverAction,
-    HoverGotoTypeData, LineIndex, NavigationTarget, Query, RangeInfo, Runnable, RunnableKind,
-    SearchScope, SourceChange, SymbolKind, TextEdit,
+    FileId, FilePosition, FileRange, HoverAction, HoverGotoTypeData, LineIndex, NavigationTarget,
+    Query, RangeInfo, Runnable, RunnableKind, SearchScope, SourceChange, SymbolKind, TextEdit,
 };
 use itertools::Itertools;
 use lsp_server::ErrorCode;
@@ -19,8 +18,8 @@ use lsp_types::{
     CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem,
     CallHierarchyOutgoingCall, CallHierarchyOutgoingCallsParams, CallHierarchyPrepareParams,
     CodeActionKind, CodeLens, Command, CompletionItem, Diagnostic, DiagnosticTag,
-    DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeParams,
-    HoverContents, Location, NumberOrString, Position, PrepareRenameResponse, Range, RenameParams,
+    DocumentFormattingParams, DocumentHighlight, FoldingRange, FoldingRangeParams, HoverContents,
+    Location, NumberOrString, Position, PrepareRenameResponse, Range, RenameParams,
     SemanticTokensDeltaParams, SemanticTokensFullDeltaResult, SemanticTokensParams,
     SemanticTokensRangeParams, SemanticTokensRangeResult, SemanticTokensResult, SymbolInformation,
     SymbolTag, TextDocumentIdentifier, TextDocumentPositionParams, Url, WorkspaceEdit,
@@ -31,12 +30,13 @@ use serde_json::to_value;
 use stdx::{format_to, split_once};
 use syntax::{algo, ast, AstNode, TextRange, TextSize};
 
-use crate::diff::diff;
 use crate::{
     cargo_target_spec::CargoTargetSpec,
     config::RustfmtConfig,
+    diff::diff,
     from_json, from_proto,
     global_state::{GlobalState, GlobalStateSnapshot},
+    line_endings::LineEndings,
     lsp_ext::{self, InlayHint, InlayHintsParams},
     lsp_utils::all_edits_are_disjoint,
     to_proto, LspError, Result,
@@ -280,7 +280,7 @@ pub(crate) fn handle_document_symbol(
     let file_id = from_proto::file_id(&snap, &params.text_document.uri)?;
     let line_index = snap.analysis.file_line_index(file_id)?;
 
-    let mut parents: Vec<(DocumentSymbol, Option<usize>)> = Vec::new();
+    let mut parents: Vec<(lsp_types::DocumentSymbol, Option<usize>)> = Vec::new();
 
     for symbol in snap.analysis.file_structure(file_id)? {
         let mut tags = Vec::new();
@@ -289,7 +289,7 @@ pub(crate) fn handle_document_symbol(
         };
 
         #[allow(deprecated)]
-        let doc_symbol = DocumentSymbol {
+        let doc_symbol = lsp_types::DocumentSymbol {
             name: symbol.label,
             detail: symbol.detail,
             kind: to_proto::symbol_kind(symbol.kind),
@@ -320,7 +320,7 @@ pub(crate) fn handle_document_symbol(
         acc
     };
 
-    let res = if snap.config.client_caps.hierarchical_symbols {
+    let res = if snap.config.hierarchical_symbols() {
         document_symbols.into()
     } else {
         let url = to_proto::url(&snap, file_id);
@@ -333,7 +333,7 @@ pub(crate) fn handle_document_symbol(
     return Ok(Some(res));
 
     fn flatten_document_symbol(
-        symbol: &DocumentSymbol,
+        symbol: &lsp_types::DocumentSymbol,
         container_name: Option<String>,
         url: &Url,
         res: &mut Vec<SymbolInformation>,
@@ -547,7 +547,7 @@ pub(crate) fn handle_runnables(
     }
 
     // Add `cargo check` and `cargo test` for all targets of the whole package
-    let config = &snap.config.runnables;
+    let config = snap.config.runnables();
     match cargo_spec {
         Some(spec) => {
             for &cmd in ["check", "test"].iter() {
@@ -578,9 +578,9 @@ pub(crate) fn handle_runnables(
                 kind: lsp_ext::RunnableKind::Cargo,
                 args: lsp_ext::CargoRunnable {
                     workspace_root: None,
-                    override_cargo: config.override_cargo.clone(),
+                    override_cargo: config.override_cargo,
                     cargo_args: vec!["check".to_string(), "--workspace".to_string()],
-                    cargo_extra_args: config.cargo_extra_args.clone(),
+                    cargo_extra_args: config.cargo_extra_args,
                     executable_args: Vec::new(),
                     expect_test: None,
                 },
@@ -619,7 +619,8 @@ pub(crate) fn handle_completion(
         return Ok(None);
     }
 
-    let items = match snap.analysis.completions(&snap.config.completion, position)? {
+    let completion_config = &snap.config.completion();
+    let items = match snap.analysis.completions(completion_config, position)? {
         None => return Ok(None),
         Some(items) => items,
     };
@@ -632,10 +633,9 @@ pub(crate) fn handle_completion(
             let mut new_completion_items =
                 to_proto::completion_item(&line_index, line_endings, item.clone());
 
-            if snap.config.completion.resolve_additional_edits_lazily() {
+            if completion_config.enable_autoimport_completions {
                 for new_item in &mut new_completion_items {
-                    let _ = fill_resolve_data(&mut new_item.data, &item, &text_document_position)
-                        .take();
+                    fill_resolve_data(&mut new_item.data, &item, &text_document_position);
                 }
             }
 
@@ -661,16 +661,6 @@ pub(crate) fn handle_completion_resolve(
         .into());
     }
 
-    // FIXME resolve the other capabilities also?
-    if !snap
-        .config
-        .completion
-        .active_resolve_capabilities
-        .contains(&CompletionResolveCapability::AdditionalTextEdits)
-    {
-        return Ok(original_completion);
-    }
-
     let resolve_data = match original_completion
         .data
         .take()
@@ -689,7 +679,7 @@ pub(crate) fn handle_completion_resolve(
     let additional_edits = snap
         .analysis
         .resolve_completion_edits(
-            &snap.config.completion,
+            &snap.config.completion(),
             FilePosition { file_id, offset },
             &resolve_data.full_import_path,
             resolve_data.imported_name,
@@ -727,7 +717,7 @@ pub(crate) fn handle_folding_range(
     let folds = snap.analysis.folding_ranges(file_id)?;
     let text = snap.analysis.file_text(file_id)?;
     let line_index = snap.analysis.file_line_index(file_id)?;
-    let line_folding_only = snap.config.client_caps.line_folding_only;
+    let line_folding_only = snap.config.line_folding_only();
     let res = folds
         .into_iter()
         .map(|it| to_proto::folding_range(&*text, &line_index, line_folding_only, it))
@@ -745,12 +735,9 @@ pub(crate) fn handle_signature_help(
         Some(it) => it,
         None => return Ok(None),
     };
-    let concise = !snap.config.call_info_full;
-    let res = to_proto::signature_help(
-        call_info,
-        concise,
-        snap.config.client_caps.signature_help_label_offsets,
-    );
+    let concise = !snap.config.call_info_full();
+    let res =
+        to_proto::signature_help(call_info, concise, snap.config.signature_help_label_offsets());
     Ok(Some(res))
 }
 
@@ -760,14 +747,12 @@ pub(crate) fn handle_hover(
 ) -> Result<Option<lsp_ext::Hover>> {
     let _p = profile::span("handle_hover");
     let position = from_proto::file_position(&snap, params.text_document_position_params)?;
-    let info = match snap.analysis.hover(
-        position,
-        snap.config.hover.links_in_hover,
-        snap.config.hover.markdown,
-    )? {
-        None => return Ok(None),
-        Some(info) => info,
-    };
+    let hover_config = snap.config.hover();
+    let info =
+        match snap.analysis.hover(position, hover_config.links_in_hover, hover_config.markdown)? {
+            None => return Ok(None),
+            Some(info) => info,
+        };
     let line_index = snap.analysis.file_line_index(position.file_id)?;
     let range = to_proto::range(&line_index, info.range);
     let hover = lsp_ext::Hover {
@@ -853,7 +838,7 @@ pub(crate) fn handle_formatting(
     let file_line_index = snap.analysis.file_line_index(file_id)?;
     let file_line_endings = snap.file_line_endings(file_id);
 
-    let mut rustfmt = match &snap.config.rustfmt {
+    let mut rustfmt = match snap.config.rustfmt() {
         RustfmtConfig::Rustfmt { extra_args } => {
             let mut cmd = process::Command::new(toolchain::rustfmt());
             cmd.args(extra_args);
@@ -909,14 +894,25 @@ pub(crate) fn handle_formatting(
         }
     }
 
-    if *file == captured_stdout {
+    let (new_text, new_line_endings) = LineEndings::normalize(captured_stdout);
+
+    if file_line_endings != new_line_endings {
+        // If line endings are different, send the entire file.
+        // Diffing would not work here, as the line endings might be the only
+        // difference.
+        Ok(Some(to_proto::text_edit_vec(
+            &file_line_index,
+            new_line_endings,
+            TextEdit::replace(TextRange::up_to(TextSize::of(&*file)), new_text),
+        )))
+    } else if *file == new_text {
         // The document is already formatted correctly -- no edits needed.
         Ok(None)
     } else {
         Ok(Some(to_proto::text_edit_vec(
             &file_line_index,
             file_line_endings,
-            diff(&file, &captured_stdout),
+            diff(&file, &new_text),
         )))
     }
 }
@@ -929,7 +925,7 @@ pub(crate) fn handle_code_action(
     // We intentionally don't support command-based actions, as those either
     // requires custom client-code anyway, or requires server-initiated edits.
     // Server initiated edits break causality, so we avoid those as well.
-    if !snap.config.client_caps.code_action_literals {
+    if !snap.config.code_action_literals() {
         return Ok(None);
     }
 
@@ -938,14 +934,12 @@ pub(crate) fn handle_code_action(
     let range = from_proto::text_range(&line_index, params.range);
     let frange = FileRange { file_id, range };
 
-    let assists_config = AssistConfig {
-        allowed: params
-            .clone()
-            .context
-            .only
-            .map(|it| it.into_iter().filter_map(from_proto::assist_kind).collect()),
-        ..snap.config.assist
-    };
+    let mut assists_config = snap.config.assist();
+    assists_config.allowed = params
+        .clone()
+        .context
+        .only
+        .map(|it| it.into_iter().filter_map(from_proto::assist_kind).collect());
 
     let mut res: Vec<lsp_ext::CodeAction> = Vec::new();
 
@@ -959,7 +953,7 @@ pub(crate) fn handle_code_action(
         add_quick_fixes(&snap, frange, &line_index, &mut res)?;
     }
 
-    if snap.config.client_caps.code_action_resolve {
+    if snap.config.code_action_resolve() {
         for (index, assist) in
             snap.analysis.assists(&assists_config, false, frange)?.into_iter().enumerate()
         {
@@ -980,7 +974,7 @@ fn add_quick_fixes(
     line_index: &Arc<LineIndex>,
     acc: &mut Vec<lsp_ext::CodeAction>,
 ) -> Result<()> {
-    let diagnostics = snap.analysis.diagnostics(&snap.config.diagnostics, frange.file_id)?;
+    let diagnostics = snap.analysis.diagnostics(&snap.config.diagnostics(), frange.file_id)?;
 
     for fix in diagnostics
         .into_iter()
@@ -1009,7 +1003,7 @@ fn add_quick_fixes(
 }
 
 pub(crate) fn handle_code_action_resolve(
-    mut snap: GlobalStateSnapshot,
+    snap: GlobalStateSnapshot,
     mut code_action: lsp_ext::CodeAction,
 ) -> Result<lsp_ext::CodeAction> {
     let _p = profile::span("handle_code_action_resolve");
@@ -1023,13 +1017,14 @@ pub(crate) fn handle_code_action_resolve(
     let range = from_proto::text_range(&line_index, params.code_action_params.range);
     let frange = FileRange { file_id, range };
 
-    snap.config.assist.allowed = params
+    let mut assists_config = snap.config.assist();
+    assists_config.allowed = params
         .code_action_params
         .context
         .only
         .map(|it| it.into_iter().filter_map(from_proto::assist_kind).collect());
 
-    let assists = snap.analysis.assists(&snap.config.assist, true, frange)?;
+    let assists = snap.analysis.assists(&assists_config, true, frange)?;
     let (id, index) = split_once(&params.id, ':').unwrap();
     let index = index.parse::<usize>().unwrap();
     let assist = &assists[index];
@@ -1046,7 +1041,8 @@ pub(crate) fn handle_code_lens(
     let _p = profile::span("handle_code_lens");
     let mut lenses: Vec<CodeLens> = Default::default();
 
-    if snap.config.lens.none() {
+    let lens_config = snap.config.lens();
+    if lens_config.none() {
         // early return before any db query!
         return Ok(Some(lenses));
     }
@@ -1055,7 +1051,7 @@ pub(crate) fn handle_code_lens(
     let line_index = snap.analysis.file_line_index(file_id)?;
     let cargo_spec = CargoTargetSpec::for_file(&snap, file_id)?;
 
-    if snap.config.lens.runnable() {
+    if lens_config.runnable() {
         // Gather runnables
         for runnable in snap.analysis.runnables(file_id)? {
             if should_skip_target(&runnable, cargo_spec.as_ref()) {
@@ -1065,7 +1061,7 @@ pub(crate) fn handle_code_lens(
             let action = runnable.action();
             let range = to_proto::range(&line_index, runnable.nav.full_range);
             let r = to_proto::runnable(&snap, file_id, runnable)?;
-            if snap.config.lens.run {
+            if lens_config.run {
                 let lens = CodeLens {
                     range,
                     command: Some(run_single_command(&r, action.run_title)),
@@ -1074,7 +1070,7 @@ pub(crate) fn handle_code_lens(
                 lenses.push(lens);
             }
 
-            if action.debugee && snap.config.lens.debug {
+            if action.debugee && lens_config.debug {
                 let debug_lens =
                     CodeLens { range, command: Some(debug_single_command(&r)), data: None };
                 lenses.push(debug_lens);
@@ -1082,7 +1078,7 @@ pub(crate) fn handle_code_lens(
         }
     }
 
-    if snap.config.lens.implementations {
+    if lens_config.implementations {
         // Handle impls
         lenses.extend(
             snap.analysis
@@ -1117,7 +1113,7 @@ pub(crate) fn handle_code_lens(
         );
     }
 
-    if snap.config.lens.references() {
+    if lens_config.references() {
         lenses.extend(snap.analysis.find_all_methods(file_id)?.into_iter().map(|it| {
             let range = to_proto::range(&line_index, it.range);
             let position = to_proto::position(&line_index, it.range.start());
@@ -1263,7 +1259,7 @@ pub(crate) fn publish_diagnostics(
 
     let diagnostics: Vec<Diagnostic> = snap
         .analysis
-        .diagnostics(&snap.config.diagnostics, file_id)?
+        .diagnostics(&snap.config.diagnostics(), file_id)?
         .into_iter()
         .map(|d| Diagnostic {
             range: to_proto::range(&line_index, d.range),
@@ -1296,7 +1292,7 @@ pub(crate) fn handle_inlay_hints(
     let line_index = snap.analysis.file_line_index(file_id)?;
     Ok(snap
         .analysis
-        .inlay_hints(file_id, &snap.config.inlay_hints)?
+        .inlay_hints(file_id, &snap.config.inlay_hints())?
         .into_iter()
         .map(|it| to_proto::inlay_hint(&line_index, it))
         .collect())
@@ -1542,7 +1538,7 @@ fn debug_single_command(runnable: &lsp_ext::Runnable) -> Command {
 }
 
 fn goto_location_command(snap: &GlobalStateSnapshot, nav: &NavigationTarget) -> Option<Command> {
-    let value = if snap.config.client_caps.location_link {
+    let value = if snap.config.location_link() {
         let link = to_proto::location_link(snap, None, nav.clone()).ok()?;
         to_value(link).ok()?
     } else {
@@ -1566,7 +1562,7 @@ fn show_impl_command_link(
     snap: &GlobalStateSnapshot,
     position: &FilePosition,
 ) -> Option<lsp_ext::CommandLinkGroup> {
-    if snap.config.hover.implementations {
+    if snap.config.hover().implementations {
         if let Some(nav_data) = snap.analysis.goto_implementation(*position).unwrap_or(None) {
             let uri = to_proto::url(snap, position.file_id);
             let line_index = snap.analysis.file_line_index(position.file_id).ok()?;
@@ -1594,7 +1590,8 @@ fn runnable_action_links(
     runnable: Runnable,
 ) -> Option<lsp_ext::CommandLinkGroup> {
     let cargo_spec = CargoTargetSpec::for_file(&snap, file_id).ok()?;
-    if !snap.config.hover.runnable() || should_skip_target(&runnable, cargo_spec.as_ref()) {
+    let hover_config = snap.config.hover();
+    if !hover_config.runnable() || should_skip_target(&runnable, cargo_spec.as_ref()) {
         return None;
     }
 
@@ -1602,12 +1599,12 @@ fn runnable_action_links(
     to_proto::runnable(snap, file_id, runnable).ok().map(|r| {
         let mut group = lsp_ext::CommandLinkGroup::default();
 
-        if snap.config.hover.run {
+        if hover_config.run {
             let run_command = run_single_command(&r, action.run_title);
             group.commands.push(to_command_link(run_command, r.label.clone()));
         }
 
-        if snap.config.hover.debug {
+        if hover_config.debug {
             let dbg_command = debug_single_command(&r);
             group.commands.push(to_command_link(dbg_command, r.label));
         }
@@ -1620,7 +1617,7 @@ fn goto_type_action_links(
     snap: &GlobalStateSnapshot,
     nav_targets: &[HoverGotoTypeData],
 ) -> Option<lsp_ext::CommandLinkGroup> {
-    if !snap.config.hover.goto_type_def || nav_targets.is_empty() {
+    if !snap.config.hover().goto_type_def || nav_targets.is_empty() {
         return None;
     }
 
@@ -1641,14 +1638,14 @@ fn prepare_hover_actions(
     file_id: FileId,
     actions: &[HoverAction],
 ) -> Vec<lsp_ext::CommandLinkGroup> {
-    if snap.config.hover.none() || !snap.config.client_caps.hover_actions {
+    if snap.config.hover().none() || !snap.config.hover_actions() {
         return Vec::new();
     }
 
     actions
         .iter()
         .filter_map(|it| match it {
-            HoverAction::Implementaion(position) => show_impl_command_link(snap, position),
+            HoverAction::Implementation(position) => show_impl_command_link(snap, position),
             HoverAction::Runnable(r) => runnable_action_links(snap, file_id, r.clone()),
             HoverAction::GoToType(targets) => goto_type_action_links(snap, targets),
         })
diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs
index 60c12e4e2..40de56dad 100644
--- a/crates/rust-analyzer/src/lsp_utils.rs
+++ b/crates/rust-analyzer/src/lsp_utils.rs
@@ -46,7 +46,7 @@ impl GlobalState {
         message: Option<String>,
         fraction: Option<f64>,
     ) {
-        if !self.config.client_caps.work_done_progress {
+        if !self.config.work_done_progress() {
             return;
         }
         let percentage = fraction.map(|f| {
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 8eca79f7e..22ee96775 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -22,6 +22,7 @@ use crate::{
     global_state::{file_id_to_url, url_to_file_id, GlobalState, Status},
     handlers, lsp_ext,
     lsp_utils::{apply_document_changes, is_canceled, notification_is, Progress},
+    reload::ProjectWorkspaceProgress,
     Result,
 };
 
@@ -63,6 +64,7 @@ pub(crate) enum Task {
     Diagnostics(Vec<(FileId, Vec<lsp_types::Diagnostic>)>),
     Workspaces(Vec<anyhow::Result<ProjectWorkspace>>),
     PrimeCaches(PrimeCachesProgress),
+    FetchWorkspace(ProjectWorkspaceProgress),
 }
 
 impl fmt::Debug for Event {
@@ -99,7 +101,8 @@ impl fmt::Debug for Event {
 
 impl GlobalState {
     fn run(mut self, inbox: Receiver<lsp_server::Message>) -> Result<()> {
-        if self.config.linked_projects.is_empty() && self.config.notifications.cargo_toml_not_found
+        if self.config.linked_projects().is_empty()
+            && self.config.notifications().cargo_toml_not_found
         {
             self.show_message(
                 lsp_types::MessageType::Error,
@@ -215,6 +218,16 @@ impl GlobalState {
                             }
                             PrimeCachesProgress::Finished => prime_caches_progress.push(progress),
                         },
+                        Task::FetchWorkspace(progress) => {
+                            let (state, msg) = match progress {
+                                ProjectWorkspaceProgress::Begin => (Progress::Begin, None),
+                                ProjectWorkspaceProgress::Report(msg) => {
+                                    (Progress::Report, Some(msg))
+                                }
+                                ProjectWorkspaceProgress::End => (Progress::End, None),
+                            };
+                            self.report_progress("fetching", state, msg, None);
+                        }
                     }
                     // Coalesce multiple task events into one loop turn
                     task = match self.task_pool.receiver.try_recv() {
@@ -296,7 +309,7 @@ impl GlobalState {
                         flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => {
                             let diagnostics =
                                 crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp(
-                                    &self.config.diagnostics_map,
+                                    &self.config.diagnostics_map(),
                                     &diagnostic,
                                     &workspace_root,
                                 );
@@ -365,13 +378,13 @@ impl GlobalState {
             self.update_file_notifications_on_threadpool();
 
             // Refresh semantic tokens if the client supports it.
-            if self.config.semantic_tokens_refresh {
+            if self.config.semantic_tokens_refresh() {
                 self.semantic_tokens_cache.lock().clear();
                 self.send_request::<lsp_types::request::SemanticTokensRefesh>((), |_, _| ());
             }
 
             // Refresh code lens if the client supports it.
-            if self.config.code_lens_refresh {
+            if self.config.code_lens_refresh() {
                 self.send_request::<lsp_types::request::CodeLensRefresh>((), |_, _| ());
             }
         }
@@ -608,7 +621,7 @@ impl GlobalState {
                                 if let Some(json) = configs.get_mut(0) {
                                     // Note that json can be null according to the spec if the client can't
                                     // provide a configuration. This is handled in Config::update below.
-                                    let mut config = this.config.clone();
+                                    let mut config = Config::clone(&*this.config);
                                     config.update(json.take());
                                     this.update_configuration(config);
                                 }
@@ -658,7 +671,7 @@ impl GlobalState {
             .collect::<Vec<_>>();
 
         log::trace!("updating notifications for {:?}", subscriptions);
-        if self.config.publish_diagnostics {
+        if self.config.publish_diagnostics() {
             let snapshot = self.snapshot();
             self.task_pool.handle.spawn(move || {
                 let diagnostics = subscriptions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 79e39e3a5..f4e084741 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -15,16 +15,23 @@ use crate::{
 };
 use lsp_ext::StatusParams;
 
+#[derive(Debug)]
+pub(crate) enum ProjectWorkspaceProgress {
+    Begin,
+    Report(String),
+    End,
+}
+
 impl GlobalState {
     pub(crate) fn update_configuration(&mut self, config: Config) {
         let _p = profile::span("GlobalState::update_configuration");
-        let old_config = mem::replace(&mut self.config, config);
-        if self.config.lru_capacity != old_config.lru_capacity {
-            self.analysis_host.update_lru_capacity(old_config.lru_capacity);
+        let old_config = mem::replace(&mut self.config, Arc::new(config));
+        if self.config.lru_capacity() != old_config.lru_capacity() {
+            self.analysis_host.update_lru_capacity(self.config.lru_capacity());
         }
-        if self.config.linked_projects != old_config.linked_projects {
+        if self.config.linked_projects() != old_config.linked_projects() {
             self.fetch_workspaces()
-        } else if self.config.flycheck != old_config.flycheck {
+        } else if self.config.flycheck() != old_config.flycheck() {
             self.reload_flycheck();
         }
     }
@@ -36,7 +43,7 @@ impl GlobalState {
             Status::Loading | Status::NeedsReload => return,
             Status::Ready | Status::Invalid => (),
         }
-        if self.config.cargo_autoreload {
+        if self.config.cargo_autoreload() {
             self.fetch_workspaces();
         } else {
             self.transition(Status::NeedsReload);
@@ -79,7 +86,7 @@ impl GlobalState {
     }
     pub(crate) fn transition(&mut self, new_status: Status) {
         self.status = new_status;
-        if self.config.client_caps.status_notification {
+        if self.config.status_notification() {
             let lsp_status = match new_status {
                 Status::Loading => lsp_ext::Status::Loading,
                 Status::Ready => lsp_ext::Status::Ready,
@@ -93,23 +100,42 @@ impl GlobalState {
     }
     pub(crate) fn fetch_workspaces(&mut self) {
         log::info!("will fetch workspaces");
-        self.task_pool.handle.spawn({
-            let linked_projects = self.config.linked_projects.clone();
-            let cargo_config = self.config.cargo.clone();
-            move || {
+
+        self.task_pool.handle.spawn_with_sender({
+            let linked_projects = self.config.linked_projects();
+            let cargo_config = self.config.cargo();
+
+            move |sender| {
+                let progress = {
+                    let sender = sender.clone();
+                    move |msg| {
+                        sender
+                            .send(Task::FetchWorkspace(ProjectWorkspaceProgress::Report(msg)))
+                            .unwrap()
+                    }
+                };
+
+                sender.send(Task::FetchWorkspace(ProjectWorkspaceProgress::Begin)).unwrap();
+
                 let workspaces = linked_projects
                     .iter()
                     .map(|project| match project {
                         LinkedProject::ProjectManifest(manifest) => {
-                            project_model::ProjectWorkspace::load(manifest.clone(), &cargo_config)
+                            project_model::ProjectWorkspace::load(
+                                manifest.clone(),
+                                &cargo_config,
+                                &progress,
+                            )
                         }
                         LinkedProject::InlineJsonProject(it) => {
                             project_model::ProjectWorkspace::load_inline(it.clone())
                         }
                     })
                     .collect::<Vec<_>>();
+
+                sender.send(Task::FetchWorkspace(ProjectWorkspaceProgress::End)).unwrap();
                 log::info!("did fetch workspaces {:?}", workspaces);
-                Task::Workspaces(workspaces)
+                sender.send(Task::Workspaces(workspaces)).unwrap()
             }
         });
     }
@@ -143,7 +169,7 @@ impl GlobalState {
             return;
         }
 
-        if let FilesWatcher::Client = self.config.files.watcher {
+        if let FilesWatcher::Client = self.config.files().watcher {
             let registration_options = lsp_types::DidChangeWatchedFilesRegistrationOptions {
                 watchers: workspaces
                     .iter()
@@ -170,9 +196,9 @@ impl GlobalState {
 
         let project_folders = ProjectFolders::new(&workspaces);
 
-        self.proc_macro_client = match &self.config.proc_macro_srv {
+        self.proc_macro_client = match self.config.proc_macro_srv() {
             None => None,
-            Some((path, args)) => match ProcMacroClient::extern_process(path.into(), args) {
+            Some((path, args)) => match ProcMacroClient::extern_process(path.clone(), args) {
                 Ok(it) => Some(it),
                 Err(err) => {
                     log::error!(
@@ -185,7 +211,7 @@ impl GlobalState {
             },
         };
 
-        let watch = match self.config.files.watcher {
+        let watch = match self.config.files().watcher {
             FilesWatcher::Client => vec![],
             FilesWatcher::Notify => project_folders.watch,
         };
@@ -211,7 +237,7 @@ impl GlobalState {
             };
             for ws in workspaces.iter() {
                 crate_graph.extend(ws.to_crate_graph(
-                    self.config.cargo.target.as_deref(),
+                    self.config.cargo().target.as_deref(),
                     self.proc_macro_client.as_ref(),
                     &mut load,
                 ));
@@ -231,7 +257,7 @@ impl GlobalState {
     }
 
     fn reload_flycheck(&mut self) {
-        let config = match self.config.flycheck.clone() {
+        let config = match self.config.flycheck() {
             Some(it) => it,
             None => {
                 self.flycheck = Vec::new();
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 999b18351..bc9999ddc 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -605,7 +605,7 @@ pub(crate) fn goto_definition_response(
     src: Option<FileRange>,
     targets: Vec<NavigationTarget>,
 ) -> Result<lsp_types::GotoDefinitionResponse> {
-    if snap.config.client_caps.location_link {
+    if snap.config.location_link() {
         let links = targets
             .into_iter()
             .map(|nav| location_link(snap, src, nav))
@@ -785,7 +785,7 @@ pub(crate) fn unresolved_code_action(
     assert!(assist.source_change.is_none());
     let res = lsp_ext::CodeAction {
         title: assist.label.to_string(),
-        group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0),
+        group: assist.group.filter(|_| snap.config.code_action_group()).map(|gr| gr.0),
         kind: Some(code_action_kind(assist.id.1)),
         edit: None,
         is_preferred: None,
@@ -805,7 +805,7 @@ pub(crate) fn resolved_code_action(
     let res = lsp_ext::CodeAction {
         edit: Some(snippet_workspace_edit(snap, change)?),
         title: assist.label.to_string(),
-        group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0),
+        group: assist.group.filter(|_| snap.config.code_action_group()).map(|gr| gr.0),
         kind: Some(code_action_kind(assist.id.1)),
         is_preferred: None,
         data: None,
@@ -818,7 +818,7 @@ pub(crate) fn runnable(
     file_id: FileId,
     runnable: Runnable,
 ) -> Result<lsp_ext::Runnable> {
-    let config = &snap.config.runnables;
+    let config = snap.config.runnables();
     let spec = CargoTargetSpec::for_file(snap, file_id)?;
     let workspace_root = spec.as_ref().map(|it| it.workspace_root.clone());
     let target = spec.as_ref().map(|s| s.target.clone());
@@ -833,9 +833,9 @@ pub(crate) fn runnable(
         kind: lsp_ext::RunnableKind::Cargo,
         args: lsp_ext::CargoRunnable {
             workspace_root: workspace_root.map(|it| it.into()),
-            override_cargo: config.override_cargo.clone(),
+            override_cargo: config.override_cargo,
             cargo_args,
-            cargo_extra_args: config.cargo_extra_args.clone(),
+            cargo_extra_args: config.cargo_extra_args,
             executable_args,
             expect_test: None,
         },
@@ -850,6 +850,7 @@ pub(crate) fn markup_content(markup: Markup) -> lsp_types::MarkupContent {
 #[cfg(test)]
 mod tests {
     use ide::Analysis;
+    use ide_db::helpers::SnippetCap;
 
     use super::*;
 
@@ -860,7 +861,7 @@ mod tests {
         fn foo(arg: &Foo) {}
         fn main() {
             let arg = Foo;
-            foo(<|>)
+            foo($0)
         }"#;
 
         let (offset, text) = test_utils::extract_offset(fixture);
@@ -868,7 +869,14 @@ mod tests {
         let (analysis, file_id) = Analysis::from_single_file(text);
         let completions: Vec<(String, Option<String>)> = analysis
             .completions(
-                &ide::CompletionConfig::default(),
+                &ide::CompletionConfig {
+                    enable_postfix_completions: true,
+                    enable_autoimport_completions: true,
+                    add_call_parenthesis: true,
+                    add_call_argument_snippets: true,
+                    snippet_cap: SnippetCap::new(true),
+                    merge: None,
+                },
                 ide_db::base_db::FilePosition { file_id, offset },
             )
             .unwrap()
diff --git a/crates/rust-analyzer/tests/rust-analyzer/main.rs b/crates/rust-analyzer/tests/rust-analyzer/main.rs
index 84db0856d..f5c5c63e5 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/main.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/main.rs
@@ -13,6 +13,7 @@ mod support;
 
 use std::{collections::HashMap, path::PathBuf, time::Instant};
 
+use expect_test::expect;
 use lsp_types::{
     notification::DidOpenTextDocument,
     request::{CodeActionRequest, Completion, Formatting, GotoTypeDefinition, HoverRequest},
@@ -569,9 +570,9 @@ fn main() {
 }
 "###,
     )
-    .with_config(|config| {
-        config.cargo.load_out_dirs_from_check = true;
-    })
+    .with_config(serde_json::json!({
+        "cargo": { "loadOutDirsFromCheck": true }
+    }))
     .server()
     .wait_until_workspace_is_loaded();
 
@@ -712,12 +713,13 @@ pub fn foo(_input: TokenStream) -> TokenStream {
 
 "###,
     )
-    .with_config(|config| {
-        let macro_srv_path = PathBuf::from(env!("CARGO_BIN_EXE_rust-analyzer"));
-
-        config.cargo.load_out_dirs_from_check = true;
-        config.proc_macro_srv = Some((macro_srv_path, vec!["proc-macro".into()]));
-    })
+    .with_config(serde_json::json!({
+        "cargo": { "loadOutDirsFromCheck": true },
+        "procMacro": {
+            "enable": true,
+            "server": PathBuf::from(env!("CARGO_BIN_EXE_rust-analyzer")),
+        }
+    }))
     .root("foo")
     .root("bar")
     .server()
@@ -730,6 +732,16 @@ pub fn foo(_input: TokenStream) -> TokenStream {
         ),
         work_done_progress_params: Default::default(),
     });
-    let value = res.get("contents").unwrap().get("value").unwrap().to_string();
-    assert_eq!(value, r#""\n```rust\nfoo::Bar\n```\n\n```rust\nfn bar()\n```""#)
+    let value = res.get("contents").unwrap().get("value").unwrap().as_str().unwrap();
+
+    expect![[r#"
+
+        ```rust
+        foo::Bar
+        ```
+
+        ```rust
+        fn bar()
+        ```"#]]
+    .assert_eq(&value);
 }
diff --git a/crates/rust-analyzer/tests/rust-analyzer/support.rs b/crates/rust-analyzer/tests/rust-analyzer/support.rs
index 456125789..2658ee185 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/support.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/support.rs
@@ -12,11 +12,8 @@ use lsp_types::{
     notification::Exit, request::Shutdown, TextDocumentIdentifier, Url, WorkDoneProgress,
 };
 use lsp_types::{ProgressParams, ProgressParamsValue};
-use project_model::{CargoConfig, ProjectManifest};
-use rust_analyzer::{
-    config::{ClientCapsConfig, Config, FilesConfig, FilesWatcher, LinkedProject},
-    main_loop,
-};
+use project_model::ProjectManifest;
+use rust_analyzer::{config::Config, main_loop};
 use serde::Serialize;
 use serde_json::{to_string_pretty, Value};
 use test_utils::{find_mismatch, Fixture};
@@ -29,12 +26,18 @@ pub(crate) struct Project<'a> {
     with_sysroot: bool,
     tmp_dir: Option<TestDir>,
     roots: Vec<PathBuf>,
-    config: Option<Box<dyn Fn(&mut Config)>>,
+    config: serde_json::Value,
 }
 
 impl<'a> Project<'a> {
     pub(crate) fn with_fixture(fixture: &str) -> Project {
-        Project { fixture, tmp_dir: None, roots: vec![], with_sysroot: false, config: None }
+        Project {
+            fixture,
+            tmp_dir: None,
+            roots: vec![],
+            with_sysroot: false,
+            config: serde_json::Value::Null,
+        }
     }
 
     pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> {
@@ -52,8 +55,8 @@ impl<'a> Project<'a> {
         self
     }
 
-    pub(crate) fn with_config(mut self, config: impl Fn(&mut Config) + 'static) -> Project<'a> {
-        self.config = Some(Box::new(config));
+    pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> {
+        self.config = config;
         self
     }
 
@@ -77,27 +80,40 @@ impl<'a> Project<'a> {
         if roots.is_empty() {
             roots.push(tmp_dir_path.clone());
         }
-        let linked_projects = roots
+        let discovered_projects = roots
             .into_iter()
             .map(|it| ProjectManifest::discover_single(&it).unwrap())
-            .map(LinkedProject::from)
             .collect::<Vec<_>>();
 
-        let mut config = Config {
-            client_caps: ClientCapsConfig {
-                location_link: true,
-                code_action_literals: true,
-                work_done_progress: true,
+        let mut config = Config::new(
+            tmp_dir_path,
+            lsp_types::ClientCapabilities {
+                text_document: Some(lsp_types::TextDocumentClientCapabilities {
+                    definition: Some(lsp_types::GotoCapability {
+                        link_support: Some(true),
+                        ..Default::default()
+                    }),
+                    code_action: Some(lsp_types::CodeActionClientCapabilities {
+                        code_action_literal_support: Some(
+                            lsp_types::CodeActionLiteralSupport::default(),
+                        ),
+                        ..Default::default()
+                    }),
+                    hover: Some(lsp_types::HoverClientCapabilities {
+                        content_format: Some(vec![lsp_types::MarkupKind::Markdown]),
+                        ..Default::default()
+                    }),
+                    ..Default::default()
+                }),
+                window: Some(lsp_types::WindowClientCapabilities {
+                    work_done_progress: Some(true),
+                    ..Default::default()
+                }),
                 ..Default::default()
             },
-            cargo: CargoConfig { no_sysroot: !self.with_sysroot, ..Default::default() },
-            linked_projects,
-            files: FilesConfig { watcher: FilesWatcher::Client, exclude: Vec::new() },
-            ..Config::new(tmp_dir_path)
-        };
-        if let Some(f) = &self.config {
-            f(&mut config)
-        }
+        );
+        config.discovered_projects = Some(discovered_projects);
+        config.update(self.config);
 
         Server::new(tmp_dir, config)
     }
diff --git a/crates/ssr/Cargo.toml b/crates/ssr/Cargo.toml
index 339eda86a..cc8136d22 100644
--- a/crates/ssr/Cargo.toml
+++ b/crates/ssr/Cargo.toml
@@ -21,4 +21,4 @@ hir = { path = "../hir", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/ssr/src/parsing.rs b/crates/ssr/src/parsing.rs
index f3b084baf..3d5e4feb7 100644
--- a/crates/ssr/src/parsing.rs
+++ b/crates/ssr/src/parsing.rs
@@ -73,11 +73,18 @@ impl ParsedRule {
             placeholders_by_stand_in: pattern.placeholders_by_stand_in(),
             rules: Vec::new(),
         };
-        builder.try_add(ast::Expr::parse(&raw_pattern), raw_template.map(ast::Expr::parse));
+
+        let raw_template_stmt = raw_template.map(ast::Stmt::parse);
+        if let raw_template_expr @ Some(Ok(_)) = raw_template.map(ast::Expr::parse) {
+            builder.try_add(ast::Expr::parse(&raw_pattern), raw_template_expr);
+        } else {
+            builder.try_add(ast::Expr::parse(&raw_pattern), raw_template_stmt.clone());
+        }
         builder.try_add(ast::Type::parse(&raw_pattern), raw_template.map(ast::Type::parse));
         builder.try_add(ast::Item::parse(&raw_pattern), raw_template.map(ast::Item::parse));
         builder.try_add(ast::Path::parse(&raw_pattern), raw_template.map(ast::Path::parse));
         builder.try_add(ast::Pat::parse(&raw_pattern), raw_template.map(ast::Pat::parse));
+        builder.try_add(ast::Stmt::parse(&raw_pattern), raw_template_stmt);
         builder.build()
     }
 }
@@ -88,7 +95,11 @@ struct RuleBuilder {
 }
 
 impl RuleBuilder {
-    fn try_add<T: AstNode>(&mut self, pattern: Result<T, ()>, template: Option<Result<T, ()>>) {
+    fn try_add<T: AstNode, T2: AstNode>(
+        &mut self,
+        pattern: Result<T, ()>,
+        template: Option<Result<T2, ()>>,
+    ) {
         match (pattern, template) {
             (Ok(pattern), Some(Ok(template))) => self.rules.push(ParsedRule {
                 placeholders_by_stand_in: self.placeholders_by_stand_in.clone(),
diff --git a/crates/ssr/src/tests.rs b/crates/ssr/src/tests.rs
index 63131f6ca..d6918c22d 100644
--- a/crates/ssr/src/tests.rs
+++ b/crates/ssr/src/tests.rs
@@ -59,7 +59,7 @@ fn parser_undefined_placeholder_in_replacement() {
     );
 }
 
-/// `code` may optionally contain a cursor marker `<|>`. If it doesn't, then the position will be
+/// `code` may optionally contain a cursor marker `$0`. If it doesn't, then the position will be
 /// the start of the file. If there's a second cursor marker, then we'll return a single range.
 pub(crate) fn single_file(code: &str) -> (ide_db::RootDatabase, FilePosition, Vec<FileRange>) {
     use ide_db::base_db::fixture::WithFixture;
@@ -160,6 +160,97 @@ fn assert_match_failure_reason(pattern: &str, code: &str, snippet: &str, expecte
 }
 
 #[test]
+fn ssr_let_stmt_in_macro_match() {
+    assert_matches(
+        "let a = 0",
+        r#"
+            macro_rules! m1 { ($a:stmt) => {$a}; }
+            fn f() {m1!{ let a = 0 };}"#,
+        // FIXME: Whitespace is not part of the matched block
+        &["leta=0"],
+    );
+}
+
+#[test]
+fn ssr_let_stmt_in_fn_match() {
+    assert_matches("let $a = 10;", "fn main() { let x = 10; x }", &["let x = 10;"]);
+    assert_matches("let $a = $b;", "fn main() { let x = 10; x }", &["let x = 10;"]);
+}
+
+#[test]
+fn ssr_block_expr_match() {
+    assert_matches("{ let $a = $b; }", "fn main() { let x = 10; }", &["{ let x = 10; }"]);
+    assert_matches("{ let $a = $b; $c }", "fn main() { let x = 10; x }", &["{ let x = 10; x }"]);
+}
+
+#[test]
+fn ssr_let_stmt_replace() {
+    // Pattern and template with trailing semicolon
+    assert_ssr_transform(
+        "let $a = $b; ==>> let $a = 11;",
+        "fn main() { let x = 10; x }",
+        expect![["fn main() { let x = 11; x }"]],
+    );
+}
+
+#[test]
+fn ssr_let_stmt_replace_expr() {
+    // Trailing semicolon should be dropped from the new expression
+    assert_ssr_transform(
+        "let $a = $b; ==>> $b",
+        "fn main() { let x = 10; }",
+        expect![["fn main() { 10 }"]],
+    );
+}
+
+#[test]
+fn ssr_blockexpr_replace_stmt_with_stmt() {
+    assert_ssr_transform(
+        "if $a() {$b;} ==>> $b;",
+        "{
+    if foo() {
+        bar();
+    }
+    Ok(())
+}",
+        expect![[r#"{
+    bar();
+    Ok(())
+}"#]],
+    );
+}
+
+#[test]
+fn ssr_blockexpr_match_trailing_expr() {
+    assert_matches(
+        "if $a() {$b;}",
+        "{
+    if foo() {
+        bar();
+    }
+}",
+        &["if foo() {
+        bar();
+    }"],
+    );
+}
+
+#[test]
+fn ssr_blockexpr_replace_trailing_expr_with_stmt() {
+    assert_ssr_transform(
+        "if $a() {$b;} ==>> $b;",
+        "{
+    if foo() {
+        bar();
+    }
+}",
+        expect![["{
+    bar();
+}"]],
+    );
+}
+
+#[test]
 fn ssr_function_to_method() {
     assert_ssr_transform(
         "my_function($a, $b) ==>> ($a).my_method($b)",
@@ -505,7 +596,7 @@ fn replace_function_call() {
     // This test also makes sure that we ignore empty-ranges.
     assert_ssr_transform(
         "foo() ==>> bar()",
-        "fn foo() {<|><|>} fn bar() {} fn f1() {foo(); foo();}",
+        "fn foo() {$0$0} fn bar() {} fn f1() {foo(); foo();}",
         expect![["fn foo() {} fn bar() {} fn f1() {bar(); bar();}"]],
     );
 }
@@ -615,7 +706,7 @@ fn replace_associated_trait_constant() {
 
 #[test]
 fn replace_path_in_different_contexts() {
-    // Note the <|> inside module a::b which marks the point where the rule is interpreted. We
+    // Note the $0 inside module a::b which marks the point where the rule is interpreted. We
     // replace foo with bar, but both need different path qualifiers in different contexts. In f4,
     // foo is unqualified because of a use statement, however the replacement needs to be fully
     // qualified.
@@ -623,7 +714,7 @@ fn replace_path_in_different_contexts() {
         "c::foo() ==>> c::bar()",
         r#"
             mod a {
-                pub mod b {<|>
+                pub mod b {$0
                     pub mod c {
                         pub fn foo() {}
                         pub fn bar() {}
@@ -1005,7 +1096,7 @@ fn pattern_is_a_single_segment_path() {
         fn f1() -> i32 {
             let foo = 1;
             let bar = 2;
-            foo<|>
+            foo$0
         }
         "#,
         expect![[r#"
@@ -1037,7 +1128,7 @@ fn replace_local_variable_reference() {
                 let foo = 5;
                 res += foo + 1;
                 let foo = 10;
-                res += foo + 2;<|>
+                res += foo + 2;$0
                 res += foo + 3;
                 let foo = 15;
                 res += foo + 4;
@@ -1069,9 +1160,9 @@ fn replace_path_within_selection() {
             let foo = 41;
             let bar = 42;
             do_stuff(foo);
-            do_stuff(foo);<|>
+            do_stuff(foo);$0
             do_stuff(foo);
-            do_stuff(foo);<|>
+            do_stuff(foo);$0
             do_stuff(foo);
         }"#,
         expect![[r#"
@@ -1094,9 +1185,9 @@ fn replace_nonpath_within_selection() {
         "$a + $b ==>> $b * $a",
         r#"
         fn main() {
-            let v = 1 + 2;<|>
+            let v = 1 + 2;$0
             let v2 = 3 + 3;
-            let v3 = 4 + 5;<|>
+            let v3 = 4 + 5;$0
             let v4 = 6 + 7;
         }"#,
         expect![[r#"
@@ -1121,7 +1212,7 @@ fn replace_self() {
         fn bar(_: &S1) {}
         impl S1 {
             fn f1(&self) {
-                foo(self)<|>
+                foo(self)$0
             }
             fn f2(&self) {
                 foo(self)
diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
index 374ed5910..5332edb09 100644
--- a/crates/stdx/src/lib.rs
+++ b/crates/stdx/src/lib.rs
@@ -1,5 +1,5 @@
 //! Missing batteries for standard libraries.
-use std::time::Instant;
+use std::{ops, process, time::Instant};
 
 mod macros;
 pub mod panic_context;
@@ -147,6 +147,27 @@ where
     left
 }
 
+pub struct JodChild(pub process::Child);
+
+impl ops::Deref for JodChild {
+    type Target = process::Child;
+    fn deref(&self) -> &process::Child {
+        &self.0
+    }
+}
+
+impl ops::DerefMut for JodChild {
+    fn deref_mut(&mut self) -> &mut process::Child {
+        &mut self.0
+    }
+}
+
+impl Drop for JodChild {
+    fn drop(&mut self) {
+        let _ = self.0.kill();
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 5d8389ade..cfeaed9e6 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 itertools = "0.10.0"
 rowan = "0.10.0"
-rustc_lexer = { version = "695.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "697.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
@@ -33,4 +33,4 @@ profile = { path = "../profile", version = "0.0.0" }
 [dev-dependencies]
 walkdir = "2.3.1"
 rayon = "1"
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/syntax/src/algo.rs b/crates/syntax/src/algo.rs
index 5696c014f..22ab36cd2 100644
--- a/crates/syntax/src/algo.rs
+++ b/crates/syntax/src/algo.rs
@@ -19,7 +19,7 @@ use crate::{
 
 /// Returns ancestors of the node at the offset, sorted by length. This should
 /// do the right thing at an edge, e.g. when searching for expressions at `{
-/// <|>foo }` we will get the name reference instead of the whole block, which
+/// $0foo }` we will get the name reference instead of the whole block, which
 /// we would get if we just did `find_token_at_offset(...).flat_map(|t|
 /// t.parent().ancestors())`.
 pub fn ancestors_at_offset(
diff --git a/crates/syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs
index c5b80bffe..92ed2ee9d 100644
--- a/crates/syntax/src/ast/generated/nodes.rs
+++ b/crates/syntax/src/ast/generated/nodes.rs
@@ -484,7 +484,7 @@ impl ast::AttrsOwner for BlockExpr {}
 impl BlockExpr {
     pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
     pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn tail_expr(&self) -> Option<Expr> { support::child(&self.syntax) }
     pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs
index 4d272f367..ea7482bb1 100644
--- a/crates/syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
@@ -212,6 +212,13 @@ impl ast::Attr {
     }
 }
 
+impl ast::Stmt {
+    /// Returns `text`, parsed as statement, but only if it has no errors.
+    pub fn parse(text: &str) -> Result<Self, ()> {
+        parsing::parse_text_fragment(text, parser::FragmentKind::StatementOptionalSemi)
+    }
+}
+
 /// Matches a `SyntaxNode` against an `ast` type.
 ///
 /// # Example:
@@ -283,7 +290,7 @@ fn api_walkthrough() {
 
     // Let's get the `1 + 1` expression!
     let body: ast::BlockExpr = func.body().unwrap();
-    let expr: ast::Expr = body.expr().unwrap();
+    let expr: ast::Expr = body.tail_expr().unwrap();
 
     // Enums are used to group related ast nodes together, and can be used for
     // matching. However, because there are no public fields, it's possible to
diff --git a/crates/syntax/src/parsing/reparsing.rs b/crates/syntax/src/parsing/reparsing.rs
index 190f5f67a..78eaf3410 100644
--- a/crates/syntax/src/parsing/reparsing.rs
+++ b/crates/syntax/src/parsing/reparsing.rs
@@ -223,7 +223,7 @@ mod tests {
         do_check(
             r"
 fn foo() {
-    let x = foo + <|>bar<|>
+    let x = foo + $0bar$0
 }
 ",
             "baz",
@@ -232,7 +232,7 @@ fn foo() {
         do_check(
             r"
 fn foo() {
-    let x = foo<|> + bar<|>
+    let x = foo$0 + bar$0
 }
 ",
             "baz",
@@ -241,7 +241,7 @@ fn foo() {
         do_check(
             r"
 struct Foo {
-    f: foo<|><|>
+    f: foo$0$0
 }
 ",
             ",\n    g: (),",
@@ -252,7 +252,7 @@ struct Foo {
 fn foo {
     let;
     1 + 1;
-    <|>92<|>;
+    $092$0;
 }
 ",
             "62",
@@ -261,7 +261,7 @@ fn foo {
         do_check(
             r"
 mod foo {
-    fn <|><|>
+    fn $0$0
 }
 ",
             "bar",
@@ -271,7 +271,7 @@ mod foo {
         do_check(
             r"
 trait Foo {
-    type <|>Foo<|>;
+    type $0Foo$0;
 }
 ",
             "Output",
@@ -280,17 +280,17 @@ trait Foo {
         do_check(
             r"
 impl IntoIterator<Item=i32> for Foo {
-    f<|><|>
+    f$0$0
 }
 ",
             "n next(",
             9,
         );
-        do_check(r"use a::b::{foo,<|>,bar<|>};", "baz", 10);
+        do_check(r"use a::b::{foo,$0,bar$0};", "baz", 10);
         do_check(
             r"
 pub enum A {
-    Foo<|><|>
+    Foo$0$0
 }
 ",
             "\nBar;\n",
@@ -298,7 +298,7 @@ pub enum A {
         );
         do_check(
             r"
-foo!{a, b<|><|> d}
+foo!{a, b$0$0 d}
 ",
             ", c[3]",
             8,
@@ -306,7 +306,7 @@ foo!{a, b<|><|> d}
         do_check(
             r"
 fn foo() {
-    vec![<|><|>]
+    vec![$0$0]
 }
 ",
             "123",
@@ -315,7 +315,7 @@ fn foo() {
         do_check(
             r"
 extern {
-    fn<|>;<|>
+    fn$0;$0
 }
 ",
             " exit(code: c_int)",
@@ -326,7 +326,7 @@ extern {
     #[test]
     fn reparse_token_tests() {
         do_check(
-            r"<|><|>
+            r"$0$0
 fn foo() -> i32 { 1 }
 ",
             "\n\n\n   \n",
@@ -334,49 +334,49 @@ fn foo() -> i32 { 1 }
         );
         do_check(
             r"
-fn foo() -> <|><|> {}
+fn foo() -> $0$0 {}
 ",
             "  \n",
             2,
         );
         do_check(
             r"
-fn <|>foo<|>() -> i32 { 1 }
+fn $0foo$0() -> i32 { 1 }
 ",
             "bar",
             3,
         );
         do_check(
             r"
-fn foo<|><|>foo() {  }
+fn foo$0$0foo() {  }
 ",
             "bar",
             6,
         );
         do_check(
             r"
-fn foo /* <|><|> */ () {}
+fn foo /* $0$0 */ () {}
 ",
             "some comment",
             6,
         );
         do_check(
             r"
-fn baz <|><|> () {}
+fn baz $0$0 () {}
 ",
             "    \t\t\n\n",
             2,
         );
         do_check(
             r"
-fn baz <|><|> () {}
+fn baz $0$0 () {}
 ",
             "    \t\t\n\n",
             2,
         );
         do_check(
             r"
-/// foo <|><|>omment
+/// foo $0$0omment
 mod { }
 ",
             "c",
@@ -384,28 +384,28 @@ mod { }
         );
         do_check(
             r#"
-fn -> &str { "Hello<|><|>" }
+fn -> &str { "Hello$0$0" }
 "#,
             ", world",
             7,
         );
         do_check(
             r#"
-fn -> &str { // "Hello<|><|>"
+fn -> &str { // "Hello$0$0"
 "#,
             ", world",
             10,
         );
         do_check(
             r##"
-fn -> &str { r#"Hello<|><|>"#
+fn -> &str { r#"Hello$0$0"#
 "##,
             ", world",
             10,
         );
         do_check(
             r"
-#[derive(<|>Copy<|>)]
+#[derive($0Copy$0)]
 enum Foo {
 
 }
@@ -417,12 +417,12 @@ enum Foo {
 
     #[test]
     fn reparse_str_token_with_error_unchanged() {
-        do_check(r#""<|>Unclosed<|> string literal"#, "Still unclosed", 24);
+        do_check(r#""$0Unclosed$0 string literal"#, "Still unclosed", 24);
     }
 
     #[test]
     fn reparse_str_token_with_error_fixed() {
-        do_check(r#""unterinated<|><|>"#, "\"", 12);
+        do_check(r#""unterinated$0$0"#, "\"", 12);
     }
 
     #[test]
@@ -430,7 +430,7 @@ enum Foo {
         do_check(
             r#"fn main() {
                 if {}
-                32 + 4<|><|>
+                32 + 4$0$0
                 return
                 if {}
             }"#,
@@ -444,7 +444,7 @@ enum Foo {
         do_check(
             r#"fn main() {
                 if {}
-                32 + 4<|><|>
+                32 + 4$0$0
                 return
                 if {}
             }"#,
diff --git a/crates/syntax/src/tests.rs b/crates/syntax/src/tests.rs
index 8c217dfe0..9d3433c9d 100644
--- a/crates/syntax/src/tests.rs
+++ b/crates/syntax/src/tests.rs
@@ -103,6 +103,15 @@ fn type_parser_tests() {
 }
 
 #[test]
+fn stmt_parser_tests() {
+    fragment_parser_dir_test(
+        &["parser/fragments/stmt/ok"],
+        &["parser/fragments/stmt/err"],
+        crate::ast::Stmt::parse,
+    );
+}
+
+#[test]
 fn parser_fuzz_tests() {
     for (_, text) in collect_rust_files(&test_data_dir(), &["parser/fuzz-failures"]) {
         fuzz::check_parser(&text)
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_attr.rast b/crates/syntax/test_data/parser/fragments/stmt/err/0000_attr.rast
new file mode 100644
index 000000000..5df7507e2
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_attr.rast
@@ -0,0 +1 @@
+ERROR
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_attr.rs b/crates/syntax/test_data/parser/fragments/stmt/err/0000_attr.rs
new file mode 100644
index 000000000..988df0705
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_attr.rs
@@ -0,0 +1 @@
+#[foo]
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_multiple_stmts.rast b/crates/syntax/test_data/parser/fragments/stmt/err/0000_multiple_stmts.rast
new file mode 100644
index 000000000..5df7507e2
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_multiple_stmts.rast
@@ -0,0 +1 @@
+ERROR
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_multiple_stmts.rs b/crates/syntax/test_data/parser/fragments/stmt/err/0000_multiple_stmts.rs
new file mode 100644
index 000000000..7e3b2fd49
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_multiple_stmts.rs
@@ -0,0 +1 @@
+a(); b(); c()
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_open_parenthesis.rast b/crates/syntax/test_data/parser/fragments/stmt/err/0000_open_parenthesis.rast
new file mode 100644
index 000000000..5df7507e2
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_open_parenthesis.rast
@@ -0,0 +1 @@
+ERROR
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_open_parenthesis.rs b/crates/syntax/test_data/parser/fragments/stmt/err/0000_open_parenthesis.rs
new file mode 100644
index 000000000..2d06f3766
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_open_parenthesis.rs
@@ -0,0 +1 @@
+(
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_semicolon.rast b/crates/syntax/test_data/parser/fragments/stmt/err/0000_semicolon.rast
new file mode 100644
index 000000000..5df7507e2
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_semicolon.rast
@@ -0,0 +1 @@
+ERROR
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_semicolon.rs b/crates/syntax/test_data/parser/fragments/stmt/err/0000_semicolon.rs
new file mode 100644
index 000000000..092bc2b04
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_semicolon.rs
@@ -0,0 +1 @@
+;
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_unterminated_expr.rast b/crates/syntax/test_data/parser/fragments/stmt/err/0000_unterminated_expr.rast
new file mode 100644
index 000000000..5df7507e2
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_unterminated_expr.rast
@@ -0,0 +1 @@
+ERROR
diff --git a/crates/syntax/test_data/parser/fragments/stmt/err/0000_unterminated_expr.rs b/crates/syntax/test_data/parser/fragments/stmt/err/0000_unterminated_expr.rs
new file mode 100644
index 000000000..ca49acb07
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/err/0000_unterminated_expr.rs
@@ -0,0 +1 @@
+1 +
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr.rast
new file mode 100644
index 000000000..274fdf16d
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr.rast
@@ -0,0 +1,9 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected] "1"
+    [email protected] " "
+    [email protected] "+"
+    [email protected] " "
+    [email protected]
+      [email protected] "1"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr.rs
new file mode 100644
index 000000000..8d2f0971e
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr.rs
@@ -0,0 +1 @@
+1 + 1
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr_block.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr_block.rast
new file mode 100644
index 000000000..6c946091f
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr_block.rast
@@ -0,0 +1,69 @@
+[email protected]
+  [email protected]
+    [email protected] "{"
+    [email protected] "\n    "
+    [email protected]
+      [email protected] "let"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "x"
+      [email protected] " "
+      [email protected] "="
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "foo"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+      [email protected] ";"
+    [email protected] "\n    "
+    [email protected]
+      [email protected] "let"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "y"
+      [email protected] " "
+      [email protected] "="
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "bar"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+      [email protected] ";"
+    [email protected] "\n    "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "Ok"
+      [email protected]
+        [email protected] "("
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "y"
+        [email protected] ")"
+    [email protected] "\n"
+    [email protected] "}"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr_block.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr_block.rs
new file mode 100644
index 000000000..ffa5c1e66
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_expr_block.rs
@@ -0,0 +1,5 @@
+{
+    let x = foo();
+    let y = bar();
+    Ok(x + y)
+}
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_fn_call.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_fn_call.rast
new file mode 100644
index 000000000..8c186da93
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_fn_call.rast
@@ -0,0 +1,11 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+  [email protected] ";"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_fn_call.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_fn_call.rs
new file mode 100644
index 000000000..a280f9a5c
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_fn_call.rs
@@ -0,0 +1 @@
+foo();
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_let_stmt.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_let_stmt.rast
new file mode 100644
index 000000000..8ab38da21
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_let_stmt.rast
@@ -0,0 +1,12 @@
+[email protected]
+  [email protected] "let"
+  [email protected] " "
+  [email protected]
+    [email protected]
+      [email protected] "x"
+  [email protected] " "
+  [email protected] "="
+  [email protected] " "
+  [email protected]
+    [email protected] "10"
+  [email protected] ";"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_let_stmt.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_let_stmt.rs
new file mode 100644
index 000000000..de8a7f1fc
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_let_stmt.rs
@@ -0,0 +1 @@
+let x = 10;
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_let_stmt.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_let_stmt.rast
new file mode 100644
index 000000000..81d6df29a
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_let_stmt.rast
@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "m1"
+    [email protected] "!"
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected] "let"
+      [email protected] " "
+      [email protected] "a"
+      [email protected] " "
+      [email protected] "="
+      [email protected] " "
+      [email protected] "0"
+      [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] ";"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_let_stmt.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_let_stmt.rs
new file mode 100644
index 000000000..075f30159
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_let_stmt.rs
@@ -0,0 +1 @@
+m1!{ let a = 0; };
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_unterminated_let_stmt.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_unterminated_let_stmt.rast
new file mode 100644
index 000000000..81d6df29a
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_unterminated_let_stmt.rast
@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "m1"
+    [email protected] "!"
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected] "let"
+      [email protected] " "
+      [email protected] "a"
+      [email protected] " "
+      [email protected] "="
+      [email protected] " "
+      [email protected] "0"
+      [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] ";"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_unterminated_let_stmt.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_unterminated_let_stmt.rs
new file mode 100644
index 000000000..075f30159
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_macro_unterminated_let_stmt.rs
@@ -0,0 +1 @@
+m1!{ let a = 0; };
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_struct_item.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_struct_item.rast
new file mode 100644
index 000000000..64c5d2969
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_struct_item.rast
@@ -0,0 +1,22 @@
+[email protected]
+  [email protected] "struct"
+  [email protected] " "
+  [email protected]
+    [email protected] "Foo"
+  [email protected] " "
+  [email protected]
+    [email protected] "{"
+    [email protected] "\n    "
+    [email protected]
+      [email protected]
+        [email protected] "bar"
+      [email protected] ":"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "u32"
+    [email protected] ","
+    [email protected] "\n"
+    [email protected] "}"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_struct_item.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_struct_item.rs
new file mode 100644
index 000000000..e5473e3ac
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_struct_item.rs
@@ -0,0 +1,3 @@
+struct Foo {
+    bar: u32,
+}
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_fn_call.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_fn_call.rast
new file mode 100644
index 000000000..9089906bc
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_fn_call.rast
@@ -0,0 +1,10 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_fn_call.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_fn_call.rs
new file mode 100644
index 000000000..eb28ef440
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_fn_call.rs
@@ -0,0 +1 @@
+foo()
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_let_stmt.rast b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_let_stmt.rast
new file mode 100644
index 000000000..37663671f
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_let_stmt.rast
@@ -0,0 +1,11 @@
+[email protected]
+  [email protected] "let"
+  [email protected] " "
+  [email protected]
+    [email protected]
+      [email protected] "x"
+  [email protected] " "
+  [email protected] "="
+  [email protected] " "
+  [email protected]
+    [email protected] "10"
diff --git a/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_let_stmt.rs b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_let_stmt.rs
new file mode 100644
index 000000000..78364b2a9
--- /dev/null
+++ b/crates/syntax/test_data/parser/fragments/stmt/ok/0000_unterminated_let_stmt.rs
@@ -0,0 +1 @@
+let x = 10
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
index 93eecc678..06341f003 100644
--- a/crates/test_utils/Cargo.toml
+++ b/crates/test_utils/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 
 [dependencies]
 # Avoid adding deps here, this crate is widely used in tests it should compile fast!
-difference = "2.0.0"
+dissimilar = "1.0.2"
 text-size = "1.0.0"
 serde_json = "1.0.48"
 rustc-hash = "1.1.0"
diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs
index 05940a546..84c1d7ebb 100644
--- a/crates/test_utils/src/lib.rs
+++ b/crates/test_utils/src/lib.rs
@@ -3,7 +3,7 @@
 //! Most notable things are:
 //!
 //! * Rich text comparison, which outputs a diff.
-//! * Extracting markup (mainly, `<|>` markers) out of fixture strings.
+//! * Extracting markup (mainly, `$0` markers) out of fixture strings.
 //! * marks (see the eponymous module).
 
 #[macro_use]
@@ -20,12 +20,13 @@ use serde_json::Value;
 use stdx::lines_with_ends;
 use text_size::{TextRange, TextSize};
 
-pub use difference::Changeset as __Changeset;
+pub use dissimilar::diff as __diff;
 pub use rustc_hash::FxHashMap;
 
 pub use crate::fixture::Fixture;
 
-pub const CURSOR_MARKER: &str = "<|>";
+pub const CURSOR_MARKER: &str = "$0";
+pub const ESCAPED_CURSOR_MARKER: &str = "\\$0";
 
 /// Asserts that two strings are equal, otherwise displays a rich diff between them.
 ///
@@ -45,8 +46,8 @@ macro_rules! assert_eq_text {
             if left.trim() == right.trim() {
                 std::eprintln!("Left:\n{:?}\n\nRight:\n{:?}\n\nWhitespace difference\n", left, right);
             } else {
-                let changeset = $crate::__Changeset::new(left, right, "\n");
-                std::eprintln!("Left:\n{}\n\nRight:\n{}\n\nDiff:\n{}\n", left, right, changeset);
+                let diff = $crate::__diff(left, right);
+                std::eprintln!("Left:\n{}\n\nRight:\n{}\n\nDiff:\n{}\n", left, right, $crate::format_diff(diff));
             }
             std::eprintln!($($tt)*);
             panic!("text differs");
@@ -62,7 +63,7 @@ pub fn extract_offset(text: &str) -> (TextSize, String) {
     }
 }
 
-/// Returns the offset of the first occurence of `<|>` marker and the copy of `text`
+/// Returns the offset of the first occurence of `$0` marker and the copy of `text`
 /// without the marker.
 fn try_extract_offset(text: &str) -> Option<(TextSize, String)> {
     let cursor_pos = text.find(CURSOR_MARKER)?;
@@ -81,7 +82,7 @@ pub fn extract_range(text: &str) -> (TextRange, String) {
     }
 }
 
-/// Returns `TextRange` between the first two markers `<|>...<|>` and the copy
+/// Returns `TextRange` between the first two markers `$0...$0` and the copy
 /// of `text` without both of these markers.
 fn try_extract_range(text: &str) -> Option<(TextRange, String)> {
     let (start, text) = try_extract_offset(text)?;
@@ -104,11 +105,11 @@ impl From<RangeOrOffset> for TextRange {
     }
 }
 
-/// Extracts `TextRange` or `TextSize` depending on the amount of `<|>` markers
+/// Extracts `TextRange` or `TextSize` depending on the amount of `$0` markers
 /// found in `text`.
 ///
 /// # Panics
-/// Panics if no `<|>` marker is present in the `text`.
+/// Panics if no `$0` marker is present in the `text`.
 pub fn extract_range_or_offset(text: &str) -> (RangeOrOffset, String) {
     if let Some((range, text)) = try_extract_range(text) {
         return (RangeOrOffset::Range(range), text);
@@ -164,12 +165,12 @@ fn test_extract_tags() {
     assert_eq!(actual, vec![("fn main() {}", Some("fn".into())), ("main", None),]);
 }
 
-/// Inserts `<|>` marker into the `text` at `offset`.
+/// Inserts `$0` marker into the `text` at `offset`.
 pub fn add_cursor(text: &str, offset: TextSize) -> String {
     let offset: usize = offset.into();
     let mut res = String::new();
     res.push_str(&text[..offset]);
-    res.push_str("<|>");
+    res.push_str("$0");
     res.push_str(&text[offset..]);
     res
 }
@@ -392,3 +393,16 @@ pub fn project_dir() -> PathBuf {
     let dir = env!("CARGO_MANIFEST_DIR");
     PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned()
 }
+
+pub fn format_diff(chunks: Vec<dissimilar::Chunk>) -> String {
+    let mut buf = String::new();
+    for chunk in chunks {
+        let formatted = match chunk {
+            dissimilar::Chunk::Equal(text) => text.into(),
+            dissimilar::Chunk::Delete(text) => format!("\x1b[41m{}\x1b[0m", text),
+            dissimilar::Chunk::Insert(text) => format!("\x1b[42m{}\x1b[0m", text),
+        };
+        buf.push_str(&formatted);
+    }
+    buf
+}
diff --git a/crates/tt/src/buffer.rs b/crates/tt/src/buffer.rs
index 02c771f70..3606c887d 100644
--- a/crates/tt/src/buffer.rs
+++ b/crates/tt/src/buffer.rs
@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-use crate::{Subtree, TokenTree};
+use crate::{Leaf, Subtree, TokenTree};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 struct EntryId(usize);
@@ -13,7 +13,7 @@ struct EntryPtr(EntryId, usize);
 #[derive(Debug)]
 enum Entry<'t> {
     // Mimicking types from proc-macro.
-    Subtree(&'t TokenTree, EntryId),
+    Subtree(Option<&'t TokenTree>, &'t Subtree, EntryId),
     Leaf(&'t TokenTree),
     // End entries contain a pointer to the entry from the containing
     // token tree, or None if this is the outermost level.
@@ -27,37 +27,64 @@ pub struct TokenBuffer<'t> {
     buffers: Vec<Box<[Entry<'t>]>>,
 }
 
-impl<'t> TokenBuffer<'t> {
-    pub fn new(tokens: &'t [TokenTree]) -> TokenBuffer<'t> {
-        let mut buffers = vec![];
-
-        let idx = TokenBuffer::new_inner(tokens, &mut buffers, None);
-        assert_eq!(idx, 0);
-
-        TokenBuffer { buffers }
-    }
+trait TokenList<'a> {
+    fn entries(&self) -> (Vec<(usize, (&'a Subtree, Option<&'a TokenTree>))>, Vec<Entry<'a>>);
+}
 
-    fn new_inner(
-        tokens: &'t [TokenTree],
-        buffers: &mut Vec<Box<[Entry<'t>]>>,
-        next: Option<EntryPtr>,
-    ) -> usize {
+impl<'a> TokenList<'a> for &'a [TokenTree] {
+    fn entries(&self) -> (Vec<(usize, (&'a Subtree, Option<&'a TokenTree>))>, Vec<Entry<'a>>) {
         // Must contain everything in tokens and then the Entry::End
-        let start_capacity = tokens.len() + 1;
+        let start_capacity = self.len() + 1;
         let mut entries = Vec::with_capacity(start_capacity);
         let mut children = vec![];
-
-        for (idx, tt) in tokens.iter().enumerate() {
+        for (idx, tt) in self.iter().enumerate() {
             match tt {
                 TokenTree::Leaf(_) => {
                     entries.push(Entry::Leaf(tt));
                 }
                 TokenTree::Subtree(subtree) => {
                     entries.push(Entry::End(None));
-                    children.push((idx, (subtree, tt)));
+                    children.push((idx, (subtree, Some(tt))));
                 }
             }
         }
+        (children, entries)
+    }
+}
+
+impl<'a> TokenList<'a> for &'a Subtree {
+    fn entries(&self) -> (Vec<(usize, (&'a Subtree, Option<&'a TokenTree>))>, Vec<Entry<'a>>) {
+        // Must contain everything in tokens and then the Entry::End
+        let mut entries = vec![];
+        let mut children = vec![];
+        entries.push(Entry::End(None));
+        children.push((0usize, (*self, None)));
+        (children, entries)
+    }
+}
+
+impl<'t> TokenBuffer<'t> {
+    pub fn from_tokens(tokens: &'t [TokenTree]) -> TokenBuffer<'t> {
+        Self::new(tokens)
+    }
+
+    pub fn from_subtree(subtree: &'t Subtree) -> TokenBuffer<'t> {
+        Self::new(subtree)
+    }
+
+    fn new<T: TokenList<'t>>(tokens: T) -> TokenBuffer<'t> {
+        let mut buffers = vec![];
+        let idx = TokenBuffer::new_inner(tokens, &mut buffers, None);
+        assert_eq!(idx, 0);
+        TokenBuffer { buffers }
+    }
+
+    fn new_inner<T: TokenList<'t>>(
+        tokens: T,
+        buffers: &mut Vec<Box<[Entry<'t>]>>,
+        next: Option<EntryPtr>,
+    ) -> usize {
+        let (children, mut entries) = tokens.entries();
 
         entries.push(Entry::End(next));
         let res = buffers.len();
@@ -65,11 +92,11 @@ impl<'t> TokenBuffer<'t> {
 
         for (child_idx, (subtree, tt)) in children {
             let idx = TokenBuffer::new_inner(
-                &subtree.token_trees,
+                subtree.token_trees.as_slice(),
                 buffers,
                 Some(EntryPtr(EntryId(res), child_idx + 1)),
             );
-            buffers[res].as_mut()[child_idx] = Entry::Subtree(tt, EntryId(idx));
+            buffers[res].as_mut()[child_idx] = Entry::Subtree(tt, subtree, EntryId(idx));
         }
 
         res
@@ -87,6 +114,24 @@ impl<'t> TokenBuffer<'t> {
     }
 }
 
+#[derive(Debug)]
+pub enum TokenTreeRef<'a> {
+    Subtree(&'a Subtree, Option<&'a TokenTree>),
+    Leaf(&'a Leaf, &'a TokenTree),
+}
+
+impl<'a> TokenTreeRef<'a> {
+    pub fn cloned(&self) -> TokenTree {
+        match &self {
+            TokenTreeRef::Subtree(subtree, tt) => match tt {
+                Some(it) => (*it).clone(),
+                None => (*subtree).clone().into(),
+            },
+            TokenTreeRef::Leaf(_, tt) => (*tt).clone(),
+        }
+    }
+}
+
 /// A safe version of `Cursor` from `syn` crate https://github.com/dtolnay/syn/blob/6533607f91686545cb034d2838beea338d9d0742/src/buffer.rs#L125
 #[derive(Copy, Clone, Debug)]
 pub struct Cursor<'a> {
@@ -114,12 +159,11 @@ impl<'a> Cursor<'a> {
         match self.entry() {
             Some(Entry::End(Some(ptr))) => {
                 let idx = ptr.1;
-                if let Some(Entry::Subtree(TokenTree::Subtree(subtree), _)) =
+                if let Some(Entry::Subtree(_, subtree, _)) =
                     self.buffer.entry(&EntryPtr(ptr.0, idx - 1))
                 {
                     return Some(subtree);
                 }
-
                 None
             }
             _ => None,
@@ -134,7 +178,7 @@ impl<'a> Cursor<'a> {
     /// a cursor into that subtree
     pub fn subtree(self) -> Option<Cursor<'a>> {
         match self.entry() {
-            Some(Entry::Subtree(_, entry_id)) => {
+            Some(Entry::Subtree(_, _, entry_id)) => {
                 Some(Cursor::create(self.buffer, EntryPtr(*entry_id, 0)))
             }
             _ => None,
@@ -142,10 +186,13 @@ impl<'a> Cursor<'a> {
     }
 
     /// If the cursor is pointing at a `TokenTree`, returns it
-    pub fn token_tree(self) -> Option<&'a TokenTree> {
+    pub fn token_tree(self) -> Option<TokenTreeRef<'a>> {
         match self.entry() {
-            Some(Entry::Leaf(tt)) => Some(tt),
-            Some(Entry::Subtree(tt, _)) => Some(tt),
+            Some(Entry::Leaf(tt)) => match tt {
+                TokenTree::Leaf(leaf) => Some(TokenTreeRef::Leaf(leaf, *tt)),
+                TokenTree::Subtree(subtree) => Some(TokenTreeRef::Subtree(subtree, Some(tt))),
+            },
+            Some(Entry::Subtree(tt, subtree, _)) => Some(TokenTreeRef::Subtree(subtree, *tt)),
             Some(Entry::End(_)) => None,
             None => None,
         }
@@ -172,7 +219,7 @@ impl<'a> Cursor<'a> {
     /// a cursor into that subtree
     pub fn bump_subtree(self) -> Cursor<'a> {
         match self.entry() {
-            Some(Entry::Subtree(_, _)) => self.subtree().unwrap(),
+            Some(Entry::Subtree(_, _, _)) => self.subtree().unwrap(),
             _ => self.bump(),
         }
     }
diff --git a/crates/vfs/src/lib.rs b/crates/vfs/src/lib.rs
index 9cf2afd33..2b7b14524 100644
--- a/crates/vfs/src/lib.rs
+++ b/crates/vfs/src/lib.rs
@@ -2,43 +2,46 @@
 //!
 //! VFS stores all files read by rust-analyzer. Reading file contents from VFS
 //! always returns the same contents, unless VFS was explicitly modified with
-//! `set_file_contents`. All changes to VFS are logged, and can be retrieved via
-//! `take_changes` method. The pack of changes is then pushed to `salsa` and
+//! [`set_file_contents`]. All changes to VFS are logged, and can be retrieved via
+//! [`take_changes`] method. The pack of changes is then pushed to `salsa` and
 //! triggers incremental recomputation.
 //!
-//! Files in VFS are identified with `FileId`s -- interned paths. The notion of
-//! the path, `VfsPath` is somewhat abstract: at the moment, it is represented
-//! as an `std::path::PathBuf` internally, but this is an implementation detail.
+//! Files in VFS are identified with [`FileId`]s -- interned paths. The notion of
+//! the path, [`VfsPath`] is somewhat abstract: at the moment, it is represented
+//! as an [`std::path::PathBuf`] internally, but this is an implementation detail.
 //!
-//! VFS doesn't do IO or file watching itself. For that, see the `loader`
-//! module. `loader::Handle` is an object-safe trait which abstracts both file
-//! loading and file watching. `Handle` is dynamically configured with a set of
-//! directory entries which should be scanned and watched. `Handle` then
+//! VFS doesn't do IO or file watching itself. For that, see the [`loader`]
+//! module. [`loader::Handle`] is an object-safe trait which abstracts both file
+//! loading and file watching. [`Handle`] is dynamically configured with a set of
+//! directory entries which should be scanned and watched. [`Handle`] then
 //! asynchronously pushes file changes. Directory entries are configured in
-//! free-form via list of globs, it's up to the `Handle` to interpret the globs
+//! free-form via list of globs, it's up to the [`Handle`] to interpret the globs
 //! in any specific way.
 //!
-//! A simple `WalkdirLoaderHandle` is provided, which doesn't implement watching
-//! and just scans the directory using walkdir.
-//!
-//! VFS stores a flat list of files. `FileSet` can partition this list of files
-//! into disjoint sets of files. Traversal-like operations (including getting
-//! the neighbor file by the relative path) are handled by the `FileSet`.
-//! `FileSet`s are also pushed to salsa and cause it to re-check `mod foo;`
+//! VFS stores a flat list of files. [`file_set::FileSet`] can partition this list
+//! of files into disjoint sets of files. Traversal-like operations (including
+//! getting the neighbor file by the relative path) are handled by the [`FileSet`].
+//! [`FileSet`]s are also pushed to salsa and cause it to re-check `mod foo;`
 //! declarations when files are created or deleted.
 //!
-//! `file_set::FileSet` and `loader::Entry` play similar, but different roles.
+//! [`FileSet`] and [`loader::Entry`] play similar, but different roles.
 //! Both specify the "set of paths/files", one is geared towards file watching,
-//! the other towards salsa changes. In particular, single `file_set::FileSet`
-//! may correspond to several `loader::Entry`. For example, a crate from
-//! crates.io which uses code generation would have two `Entries` -- for sources
+//! the other towards salsa changes. In particular, single [`FileSet`]
+//! may correspond to several [`loader::Entry`]. For example, a crate from
+//! crates.io which uses code generation would have two [`Entries`] -- for sources
 //! in `~/.cargo`, and for generated code in `./target/debug/build`. It will
-//! have a single `FileSet` which unions the two sources.
-mod vfs_path;
-mod path_interner;
+//! have a single [`FileSet`] which unions the two sources.
+//!
+//! [`set_file_contents`]: Vfs::set_file_contents
+//! [`take_changes`]: Vfs::take_changes
+//! [`FileSet`]: file_set::FileSet
+//! [`Handle`]: loader::Handle
+//! [`Entries`]: loader::Entry
 mod anchored_path;
 pub mod file_set;
 pub mod loader;
+mod path_interner;
+mod vfs_path;
 
 use std::{fmt, mem};