306 files changed, 9122 insertions, 5700 deletions

diff --git a/crates/assists/Cargo.toml b/crates/assists/Cargo.toml
index 3fd8327d6..ed8ad666f 100644
--- a/crates/assists/Cargo.toml
+++ b/crates/assists/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 
 [dependencies]
 rustc-hash = "1.1.0"
-itertools = "0.9.0"
+itertools = "0.10.0"
 either = "1.6.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }
diff --git a/crates/assists/src/assist_config.rs b/crates/assists/src/assist_config.rs
index c458d9054..4fe8ea761 100644
--- a/crates/assists/src/assist_config.rs
+++ b/crates/assists/src/assist_config.rs
@@ -4,8 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! assists if we are allowed to.
 
-use hir::PrefixKind;
-use ide_db::helpers::insert_use::MergeBehavior;
+use ide_db::helpers::{insert_use::MergeBehavior, SnippetCap};
 
 use crate::AssistKind;
 
@@ -16,35 +15,8 @@ pub struct AssistConfig {
     pub insert_use: InsertUseConfig,
 }
 
-impl AssistConfig {
-    pub fn allow_snippets(&mut self, yes: bool) {
-        self.snippet_cap = if yes { Some(SnippetCap { _private: () }) } else { None }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct SnippetCap {
-    _private: (),
-}
-
-impl Default for AssistConfig {
-    fn default() -> Self {
-        AssistConfig {
-            snippet_cap: Some(SnippetCap { _private: () }),
-            allowed: None,
-            insert_use: InsertUseConfig::default(),
-        }
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct InsertUseConfig {
     pub merge: Option<MergeBehavior>,
-    pub prefix_kind: PrefixKind,
-}
-
-impl Default for InsertUseConfig {
-    fn default() -> Self {
-        InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain }
-    }
+    pub prefix_kind: hir::PrefixKind,
 }
diff --git a/crates/assists/src/assist_context.rs b/crates/assists/src/assist_context.rs
index 4f59d39a9..91cc63427 100644
--- a/crates/assists/src/assist_context.rs
+++ b/crates/assists/src/assist_context.rs
@@ -4,7 +4,10 @@ use std::mem;
 
 use algo::find_covering_element;
 use hir::Semantics;
-use ide_db::base_db::{AnchoredPathBuf, FileId, FileRange};
+use ide_db::{
+    base_db::{AnchoredPathBuf, FileId, FileRange},
+    helpers::SnippetCap,
+};
 use ide_db::{
     label::Label,
     source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
@@ -17,10 +20,7 @@ use syntax::{
 };
 use text_edit::{TextEdit, TextEditBuilder};
 
-use crate::{
-    assist_config::{AssistConfig, SnippetCap},
-    Assist, AssistId, AssistKind, GroupLabel,
-};
+use crate::{assist_config::AssistConfig, Assist, AssistId, AssistKind, GroupLabel};
 
 /// `AssistContext` allows to apply an assist or check if it could be applied.
 ///
diff --git a/crates/assists/src/ast_transform.rs b/crates/assists/src/ast_transform.rs
index da94e9987..4a3ed7783 100644
--- a/crates/assists/src/ast_transform.rs
+++ b/crates/assists/src/ast_transform.rs
@@ -204,7 +204,8 @@ impl<'a> AstTransform<'a> for QualifyPaths<'a> {
             }
             PathResolution::Local(_)
             | PathResolution::TypeParam(_)
-            | PathResolution::SelfType(_) => None,
+            | PathResolution::SelfType(_)
+            | PathResolution::ConstParam(_) => None,
             PathResolution::Macro(_) => None,
             PathResolution::AssocItem(_) => None,
         }
diff --git a/crates/assists/src/handlers/add_explicit_type.rs b/crates/assists/src/handlers/add_explicit_type.rs
index 563cbf505..cb1548cef 100644
--- a/crates/assists/src/handlers/add_explicit_type.rs
+++ b/crates/assists/src/handlers/add_explicit_type.rs
@@ -12,7 +12,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     let x<|> = 92;
+//     let x$0 = 92;
 // }
 // ```
 // ->
@@ -81,21 +81,17 @@ mod tests {
 
     #[test]
     fn add_explicit_type_target() {
-        check_assist_target(add_explicit_type, "fn f() { let a<|> = 1; }", "a");
+        check_assist_target(add_explicit_type, "fn f() { let a$0 = 1; }", "a");
     }
 
     #[test]
     fn add_explicit_type_works_for_simple_expr() {
-        check_assist(add_explicit_type, "fn f() { let a<|> = 1; }", "fn f() { let a: i32 = 1; }");
+        check_assist(add_explicit_type, "fn f() { let a$0 = 1; }", "fn f() { let a: i32 = 1; }");
     }
 
     #[test]
     fn add_explicit_type_works_for_underscore() {
-        check_assist(
-            add_explicit_type,
-            "fn f() { let a<|>: _ = 1; }",
-            "fn f() { let a: i32 = 1; }",
-        );
+        check_assist(add_explicit_type, "fn f() { let a$0: _ = 1; }", "fn f() { let a: i32 = 1; }");
     }
 
     #[test]
@@ -109,7 +105,7 @@ mod tests {
             }
 
             fn f() {
-                let a<|>: Option<_> = Option::Some(1);
+                let a$0: Option<_> = Option::Some(1);
             }"#,
             r#"
             enum Option<T> {
@@ -127,7 +123,7 @@ mod tests {
     fn add_explicit_type_works_for_macro_call() {
         check_assist(
             add_explicit_type,
-            r"macro_rules! v { () => {0u64} } fn f() { let a<|> = v!(); }",
+            r"macro_rules! v { () => {0u64} } fn f() { let a$0 = v!(); }",
             r"macro_rules! v { () => {0u64} } fn f() { let a: u64 = v!(); }",
         );
     }
@@ -136,31 +132,31 @@ mod tests {
     fn add_explicit_type_works_for_macro_call_recursive() {
         check_assist(
             add_explicit_type,
-            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a<|> = v!(); }"#,
+            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a$0 = v!(); }"#,
             r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a: u64 = v!(); }"#,
         );
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_ty_not_inferred() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|> = None; }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0 = None; }");
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_ty_already_specified() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: i32 = 1; }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0: i32 = 1; }");
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_specified_ty_is_tuple() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: (i32, i32) = (3, 4); }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0: (i32, i32) = (3, 4); }");
     }
 
     #[test]
     fn add_explicit_type_not_applicable_if_cursor_after_equals() {
         check_assist_not_applicable(
             add_explicit_type,
-            "fn f() {let a =<|> match 1 {2 => 3, 3 => 5};}",
+            "fn f() {let a =$0 match 1 {2 => 3, 3 => 5};}",
         )
     }
 
@@ -168,7 +164,7 @@ mod tests {
     fn add_explicit_type_not_applicable_if_cursor_before_let() {
         check_assist_not_applicable(
             add_explicit_type,
-            "fn f() <|>{let a = match 1 {2 => 3, 3 => 5};}",
+            "fn f() $0{let a = match 1 {2 => 3, 3 => 5};}",
         )
     }
 
@@ -178,7 +174,7 @@ mod tests {
             add_explicit_type,
             r#"
 fn main() {
-    let multiply_by_two<|> = |i| i * 3;
+    let multiply_by_two$0 = |i| i * 3;
     let six = multiply_by_two(2);
 }"#,
         )
@@ -195,7 +191,7 @@ struct Test<K, T = u8> {
 }
 
 fn main() {
-    let test<|> = Test { t: 23u8, k: 33 };
+    let test$0 = Test { t: 23u8, k: 33 };
 }"#,
             r#"
 struct Test<K, T = u8> {
diff --git a/crates/assists/src/handlers/add_missing_impl_members.rs b/crates/assists/src/handlers/add_missing_impl_members.rs
index 7df05b841..63cea754d 100644
--- a/crates/assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/assists/src/handlers/add_missing_impl_members.rs
@@ -20,7 +20,7 @@ use crate::{
 //     fn bar(&self) {}
 // }
 //
-// impl Trait<u32> for () {<|>
+// impl Trait<u32> for () {$0
 //
 // }
 // ```
@@ -63,7 +63,7 @@ pub(crate) fn add_missing_impl_members(acc: &mut Assists, ctx: &AssistContext) -
 //
 // impl Trait for () {
 //     type X = ();
-//     fn foo(&self) {}<|>
+//     fn foo(&self) {}$0
 //
 // }
 // ```
@@ -166,7 +166,7 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-<|>
+$0
 }"#,
             r#"
 trait Foo {
@@ -214,7 +214,7 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-<|>
+$0
 }"#,
             r#"
 trait Foo {
@@ -242,7 +242,7 @@ impl Foo for S {
             r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
             r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -261,7 +261,7 @@ impl Foo for S {
             r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S<|>"#,
+impl Foo for S$0"#,
             r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -280,7 +280,7 @@ impl Foo for S {
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl Foo<u32> for S { <|> }"#,
+impl Foo<u32> for S { $0 }"#,
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
@@ -299,7 +299,7 @@ impl Foo<u32> for S {
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl<U> Foo<U> for S { <|> }"#,
+impl<U> Foo<U> for S { $0 }"#,
             r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
@@ -318,7 +318,7 @@ impl<U> Foo<U> for S {
             r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S {}<|>"#,
+impl Foo for S {}$0"#,
             r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -340,7 +340,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar;
@@ -370,7 +370,7 @@ mod foo {
 use foo::bar;
 
 struct S;
-impl bar::Foo for S { <|> }"#,
+impl bar::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub mod bar {
@@ -400,7 +400,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -425,7 +425,7 @@ mod foo {
     trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
-impl foo::Foo<u32> for S { <|> }"#,
+impl foo::Foo<u32> for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -452,7 +452,7 @@ mod foo {
 }
 struct Param;
 struct S;
-impl foo::Foo<Param> for S { <|> }"#,
+impl foo::Foo<Param> for S { $0 }"#,
             r#"
 mod foo {
     trait Foo<T> { fn foo(&self, bar: T); }
@@ -479,7 +479,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar<u32>::Assoc); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -506,7 +506,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: Bar<Baz>); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub struct Bar<T>;
@@ -532,7 +532,7 @@ mod foo {
     trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
             r#"
 mod foo {
     pub trait Fn<Args> { type Output; }
@@ -554,7 +554,7 @@ impl foo::Foo for S {
             r#"
 trait Foo;
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
         )
     }
 
@@ -568,7 +568,7 @@ trait Foo {
     fn valid(some: u32) -> bool { false }
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
         )
     }
 
@@ -586,7 +586,7 @@ trait Foo {
     fn foo(&self);
 }
 struct S;
-impl Foo for S {}<|>"#,
+impl Foo for S {}$0"#,
             r#"
 #[doc(alias = "test alias")]
 trait Foo {
@@ -621,7 +621,7 @@ trait Foo {
     fn foo(some: u32) -> bool;
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
             r#"
 trait Foo {
     type Output;
@@ -648,7 +648,7 @@ trait Foo<T = Self> {
 }
 
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
             r#"
 trait Foo<T = Self> {
     fn bar(&self, other: &T);
@@ -673,7 +673,7 @@ trait Foo<T1, T2 = Self> {
 }
 
 struct S<T>;
-impl Foo<T> for S<T> { <|> }"#,
+impl Foo<T> for S<T> { $0 }"#,
             r#"
 trait Foo<T1, T2 = Self> {
     fn bar(&self, this: &T1, that: &T2);
@@ -697,7 +697,7 @@ trait Tr {
     type Ty: Copy + 'static;
 }
 
-impl Tr for ()<|> {
+impl Tr for ()$0 {
 }"#,
             r#"
 trait Tr {
@@ -719,7 +719,7 @@ trait Tr {
     fn foo();
 }
 
-impl Tr for ()<|> {
+impl Tr for ()$0 {
     +++
 }"#,
             r#"
@@ -745,7 +745,7 @@ trait Tr {
     fn foo();
 }
 
-impl Tr for ()<|> {
+impl Tr for ()$0 {
     // very important
 }"#,
             r#"
@@ -771,7 +771,7 @@ trait Test {
     fn foo(&self, x: crate)
 }
 impl Test for () {
-    <|>
+    $0
 }
 "#,
             r#"
@@ -796,7 +796,7 @@ trait Foo<BAR> {
     fn foo(&self, bar: BAR);
 }
 impl Foo for () {
-    <|>
+    $0
 }
 "#,
             r#"
diff --git a/crates/assists/src/handlers/add_turbo_fish.rs b/crates/assists/src/handlers/add_turbo_fish.rs
index 1f486c013..8e9ea4fad 100644
--- a/crates/assists/src/handlers/add_turbo_fish.rs
+++ b/crates/assists/src/handlers/add_turbo_fish.rs
@@ -14,7 +14,7 @@ use crate::{
 // ```
 // fn make<T>() -> T { todo!() }
 // fn main() {
-//     let x = make<|>();
+//     let x = make$0();
 // }
 // ```
 // ->
@@ -77,7 +77,7 @@ mod tests {
             r#"
 fn make<T>() -> T {}
 fn main() {
-    make<|>();
+    make$0();
 }
 "#,
             r#"
@@ -97,7 +97,7 @@ fn main() {
             r#"
 fn make<T>() -> T {}
 fn main() {
-    make()<|>;
+    make()$0;
 }
 "#,
             r#"
@@ -119,7 +119,7 @@ impl S {
     fn make<T>(&self) -> T {}
 }
 fn main() {
-    S.make<|>();
+    S.make$0();
 }
 "#,
             r#"
@@ -142,7 +142,7 @@ fn main() {
             r#"
 fn make<T>() -> T {}
 fn main() {
-    make<|>::<()>();
+    make$0::<()>();
 }
 "#,
         );
@@ -156,7 +156,7 @@ fn main() {
             r#"
 fn make() -> () {}
 fn main() {
-    make<|>();
+    make$0();
 }
 "#,
         );
diff --git a/crates/assists/src/handlers/apply_demorgan.rs b/crates/assists/src/handlers/apply_demorgan.rs
index 1a6fdafda..ed4d11455 100644
--- a/crates/assists/src/handlers/apply_demorgan.rs
+++ b/crates/assists/src/handlers/apply_demorgan.rs
@@ -12,7 +12,7 @@ use crate::{utils::invert_boolean_expression, AssistContext, AssistId, AssistKin
 //
 // ```
 // fn main() {
-//     if x != 4 ||<|> !y {}
+//     if x != 4 ||$0 !y {}
 // }
 // ```
 // ->
@@ -68,26 +68,26 @@ mod tests {
 
     #[test]
     fn demorgan_turns_and_into_or() {
-        check_assist(apply_demorgan, "fn f() { !x &&<|> !x }", "fn f() { !(x || x) }")
+        check_assist(apply_demorgan, "fn f() { !x &&$0 !x }", "fn f() { !(x || x) }")
     }
 
     #[test]
     fn demorgan_turns_or_into_and() {
-        check_assist(apply_demorgan, "fn f() { !x ||<|> !x }", "fn f() { !(x && x) }")
+        check_assist(apply_demorgan, "fn f() { !x ||$0 !x }", "fn f() { !(x && x) }")
     }
 
     #[test]
     fn demorgan_removes_inequality() {
-        check_assist(apply_demorgan, "fn f() { x != x ||<|> !x }", "fn f() { !(x == x && x) }")
+        check_assist(apply_demorgan, "fn f() { x != x ||$0 !x }", "fn f() { !(x == x && x) }")
     }
 
     #[test]
     fn demorgan_general_case() {
-        check_assist(apply_demorgan, "fn f() { x ||<|> x }", "fn f() { !(!x && !x) }")
+        check_assist(apply_demorgan, "fn f() { x ||$0 x }", "fn f() { !(!x && !x) }")
     }
 
     #[test]
     fn demorgan_doesnt_apply_with_cursor_not_on_op() {
-        check_assist_not_applicable(apply_demorgan, "fn f() { <|> !x || !x }")
+        check_assist_not_applicable(apply_demorgan, "fn f() { $0 !x || !x }")
     }
 }
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs
index bd5bba646..55620f0f3 100644
--- a/crates/assists/src/handlers/auto_import.rs
+++ b/crates/assists/src/handlers/auto_import.rs
@@ -70,7 +70,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     let map = HashMap<|>::new();
+//     let map = HashMap$0::new();
 // }
 // # pub mod std { pub mod collections { pub struct HashMap { } } }
 // ```
@@ -151,7 +151,7 @@ mod tests {
 
             use std::fmt;
 
-            <|>Formatter
+            $0Formatter
             ",
             r"
             mod std {
@@ -172,7 +172,7 @@ mod tests {
         check_assist(
             auto_import,
             r"
-            <|>PubStruct
+            $0PubStruct
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -198,7 +198,7 @@ mod tests {
             macro_rules! foo {
                 ($i:ident) => { fn foo(a: $i) {} }
             }
-            foo!(Pub<|>Struct);
+            foo!(Pub$0Struct);
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -227,7 +227,7 @@ mod tests {
             use PubMod::PubStruct1;
 
             struct Test {
-                test: Pub<|>Struct2<u8>,
+                test: Pub$0Struct2<u8>,
             }
 
             pub mod PubMod {
@@ -259,7 +259,7 @@ mod tests {
         check_assist(
             auto_import,
             r"
-            PubSt<|>ruct
+            PubSt$0ruct
 
             pub mod PubMod1 {
                 pub struct PubStruct;
@@ -296,7 +296,7 @@ mod tests {
             r"
             use PubMod::PubStruct;
 
-            PubStruct<|>
+            PubStruct$0
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -310,7 +310,7 @@ mod tests {
         check_assist_not_applicable(
             auto_import,
             r"
-            PrivateStruct<|>
+            PrivateStruct$0
 
             pub mod PubMod {
                 struct PrivateStruct;
@@ -324,7 +324,7 @@ mod tests {
         check_assist_not_applicable(
             auto_import,
             "
-            PubStruct<|>",
+            PubStruct$0",
         );
     }
 
@@ -333,7 +333,7 @@ mod tests {
         check_assist_not_applicable(
             auto_import,
             r"
-            use PubStruct<|>;
+            use PubStruct$0;
 
             pub mod PubMod {
                 pub struct PubStruct;
@@ -346,7 +346,7 @@ mod tests {
         check_assist(
             auto_import,
             r"
-            test_function<|>
+            test_function$0
 
             pub mod PubMod {
                 pub fn test_function() {};
@@ -377,7 +377,7 @@ macro_rules! foo {
 
 //- /main.rs crate:main deps:crate_with_macro
 fn main() {
-    foo<|>
+    foo$0
 }
 ",
             r"use crate_with_macro::foo;
@@ -395,7 +395,7 @@ fn main() {
             auto_import,
             r"
             struct AssistInfo {
-                group_label: Option<<|>GroupLabel>,
+                group_label: Option<$0GroupLabel>,
             }
 
             mod m { pub struct GroupLabel; }
@@ -419,7 +419,7 @@ fn main() {
 
             use mod1::mod2;
             fn main() {
-                mod2::mod3::TestStruct<|>
+                mod2::mod3::TestStruct$0
             }
             ",
         );
@@ -436,7 +436,7 @@ fn main() {
 
             use test_mod::test_function;
             fn main() {
-                test_function<|>
+                test_function$0
             }
             ",
         );
@@ -455,7 +455,7 @@ fn main() {
             }
 
             fn main() {
-                TestStruct::test_function<|>
+                TestStruct::test_function$0
             }
             ",
             r"
@@ -488,7 +488,7 @@ fn main() {
             }
 
             fn main() {
-                TestStruct::TEST_CONST<|>
+                TestStruct::TEST_CONST$0
             }
             ",
             r"
@@ -524,7 +524,7 @@ fn main() {
             }
 
             fn main() {
-                test_mod::TestStruct::test_function<|>
+                test_mod::TestStruct::test_function$0
             }
             ",
             r"
@@ -573,7 +573,7 @@ fn main() {
 
             use test_mod::TestTrait2;
             fn main() {
-                test_mod::TestEnum::test_function<|>;
+                test_mod::TestEnum::test_function$0;
             }
             ",
         )
@@ -595,7 +595,7 @@ fn main() {
             }
 
             fn main() {
-                test_mod::TestStruct::TEST_CONST<|>
+                test_mod::TestStruct::TEST_CONST$0
             }
             ",
             r"
@@ -644,7 +644,7 @@ fn main() {
 
             use test_mod::TestTrait2;
             fn main() {
-                test_mod::TestEnum::TEST_CONST<|>;
+                test_mod::TestEnum::TEST_CONST$0;
             }
             ",
         )
@@ -667,7 +667,7 @@ fn main() {
 
             fn main() {
                 let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             ",
             r"
@@ -699,7 +699,7 @@ fn main() {
             //- /main.rs crate:main deps:dep
             fn main() {
                 let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -730,7 +730,7 @@ fn main() {
             r"
             //- /main.rs crate:main deps:dep
             fn main() {
-                dep::test_mod::TestStruct::test_func<|>tion
+                dep::test_mod::TestStruct::test_func$0tion
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -760,7 +760,7 @@ fn main() {
             r"
             //- /main.rs crate:main deps:dep
             fn main() {
-                dep::test_mod::TestStruct::CONST<|>
+                dep::test_mod::TestStruct::CONST$0
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -791,7 +791,7 @@ fn main() {
             //- /main.rs crate:main deps:dep
             fn main() {
                 let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_func<|>tion()
+                test_struct.test_func$0tion()
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -815,7 +815,7 @@ fn main() {
             //- /main.rs crate:main deps:dep
             fn main() {
                 let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
             }
             //- /dep.rs crate:dep
             pub mod test_mod {
@@ -858,7 +858,7 @@ fn main() {
             use test_mod::TestTrait2;
             fn main() {
                 let one = test_mod::TestEnum::One;
-                one.test<|>_method();
+                one.test$0_method();
             }
             ",
         )
@@ -874,7 +874,7 @@ pub struct Struct;
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    Struct<|>
+    Struct$0
 }
 ",
             r"use dep::Struct;
@@ -902,7 +902,7 @@ pub fn panic_fmt() {}
 //- /main.rs crate:main deps:dep
 struct S;
 
-impl f<|>mt::Display for S {}
+impl f$0mt::Display for S {}
 ",
             r"use dep::fmt;
 
@@ -930,7 +930,7 @@ mac!();
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    Cheese<|>;
+    Cheese$0;
 }
 ",
             r"use dep::Cheese;
@@ -954,7 +954,7 @@ pub struct fmt;
 
 //- /main.rs crate:main deps:dep
 fn main() {
-    FMT<|>;
+    FMT$0;
 }
 ",
             r"use dep::FMT;
diff --git a/crates/assists/src/handlers/change_visibility.rs b/crates/assists/src/handlers/change_visibility.rs
index 22d7c95d9..ac8c44124 100644
--- a/crates/assists/src/handlers/change_visibility.rs
+++ b/crates/assists/src/handlers/change_visibility.rs
@@ -13,7 +13,7 @@ use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
 // Adds or changes existing visibility specifier.
 //
 // ```
-// <|>fn frobnicate() {}
+// $0fn frobnicate() {}
 // ```
 // ->
 // ```
@@ -118,23 +118,23 @@ mod tests {
 
     #[test]
     fn change_visibility_adds_pub_crate_to_items() {
-        check_assist(change_visibility, "<|>fn foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "f<|>n foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "<|>struct Foo {}", "pub(crate) struct Foo {}");
-        check_assist(change_visibility, "<|>mod foo {}", "pub(crate) mod foo {}");
-        check_assist(change_visibility, "<|>trait Foo {}", "pub(crate) trait Foo {}");
-        check_assist(change_visibility, "m<|>od {}", "pub(crate) mod {}");
-        check_assist(change_visibility, "unsafe f<|>n foo() {}", "pub(crate) unsafe fn foo() {}");
+        check_assist(change_visibility, "$0fn foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "f$0n foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "$0struct Foo {}", "pub(crate) struct Foo {}");
+        check_assist(change_visibility, "$0mod foo {}", "pub(crate) mod foo {}");
+        check_assist(change_visibility, "$0trait Foo {}", "pub(crate) trait Foo {}");
+        check_assist(change_visibility, "m$0od {}", "pub(crate) mod {}");
+        check_assist(change_visibility, "unsafe f$0n foo() {}", "pub(crate) unsafe fn foo() {}");
     }
 
     #[test]
     fn change_visibility_works_with_struct_fields() {
         check_assist(
             change_visibility,
-            r"struct S { <|>field: u32 }",
+            r"struct S { $0field: u32 }",
             r"struct S { pub(crate) field: u32 }",
         );
-        check_assist(change_visibility, r"struct S ( <|>u32 )", r"struct S ( pub(crate) u32 )");
+        check_assist(change_visibility, r"struct S ( $0u32 )", r"struct S ( pub(crate) u32 )");
     }
 
     #[test]
@@ -142,33 +142,33 @@ mod tests {
         mark::check!(change_visibility_field_false_positive);
         check_assist_not_applicable(
             change_visibility,
-            r"struct S { field: [(); { let <|>x = ();}] }",
+            r"struct S { field: [(); { let $0x = ();}] }",
         )
     }
 
     #[test]
     fn change_visibility_pub_to_pub_crate() {
-        check_assist(change_visibility, "<|>pub fn foo() {}", "pub(crate) fn foo() {}")
+        check_assist(change_visibility, "$0pub fn foo() {}", "pub(crate) fn foo() {}")
     }
 
     #[test]
     fn change_visibility_pub_crate_to_pub() {
-        check_assist(change_visibility, "<|>pub(crate) fn foo() {}", "pub fn foo() {}")
+        check_assist(change_visibility, "$0pub(crate) fn foo() {}", "pub fn foo() {}")
     }
 
     #[test]
     fn change_visibility_const() {
-        check_assist(change_visibility, "<|>const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
+        check_assist(change_visibility, "$0const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
     }
 
     #[test]
     fn change_visibility_static() {
-        check_assist(change_visibility, "<|>static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
+        check_assist(change_visibility, "$0static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
     }
 
     #[test]
     fn change_visibility_type_alias() {
-        check_assist(change_visibility, "<|>type T = ();", "pub(crate) type T = ();");
+        check_assist(change_visibility, "$0type T = ();", "pub(crate) type T = ();");
     }
 
     #[test]
@@ -181,7 +181,7 @@ mod tests {
             // comments
 
             #[derive(Debug)]
-            <|>struct Foo;
+            $0struct Foo;
             ",
             r"
             /// docs
@@ -199,14 +199,14 @@ mod tests {
         check_assist_not_applicable(
             change_visibility,
             r"mod foo { pub enum Foo {Foo1} }
-              fn main() { foo::Foo::Foo1<|> } ",
+              fn main() { foo::Foo::Foo1$0 } ",
         );
     }
 
     #[test]
     fn change_visibility_target() {
-        check_assist_target(change_visibility, "<|>fn foo() {}", "fn");
-        check_assist_target(change_visibility, "pub(crate)<|> fn foo() {}", "pub(crate)");
-        check_assist_target(change_visibility, "struct S { <|>field: u32 }", "field");
+        check_assist_target(change_visibility, "$0fn foo() {}", "fn");
+        check_assist_target(change_visibility, "pub(crate)$0 fn foo() {}", "pub(crate)");
+        check_assist_target(change_visibility, "struct S { $0field: u32 }", "field");
     }
 }
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs
index 667115382..a8a819cfc 100644
--- a/crates/assists/src/handlers/convert_integer_literal.rs
+++ b/crates/assists/src/handlers/convert_integer_literal.rs
@@ -7,7 +7,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel};
 // Converts the base of integer literals to other bases.
 //
 // ```
-// const _: i32 = 10<|>;
+// const _: i32 = 10$0;
 // ```
 // ->
 // ```
@@ -65,47 +65,47 @@ mod tests {
 
     #[test]
     fn binary_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0b1010<|>;", "0b1010");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0b1010$0;", "0b1010");
     }
 
     #[test]
     fn octal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0o12<|>;", "0o12");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0o12$0;", "0o12");
     }
 
     #[test]
     fn decimal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 10<|>;", "10");
+        check_assist_target(convert_integer_literal, "const _: i32 = 10$0;", "10");
     }
 
     #[test]
     fn hexadecimal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0xA<|>;", "0xA");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0xA$0;", "0xA");
     }
 
     #[test]
     fn binary_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0b10_10<|>;", "0b10_10");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0b10_10$0;", "0b10_10");
     }
 
     #[test]
     fn octal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0o1_2<|>;", "0o1_2");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0o1_2$0;", "0o1_2");
     }
 
     #[test]
     fn decimal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 1_0<|>;", "1_0");
+        check_assist_target(convert_integer_literal, "const _: i32 = 1_0$0;", "1_0");
     }
 
     #[test]
     fn hexadecimal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0x_A<|>;", "0x_A");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0x_A$0;", "0x_A");
     }
 
     #[test]
     fn convert_decimal_integer() {
-        let before = "const _: i32 = 1000<|>;";
+        let before = "const _: i32 = 1000$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -131,7 +131,7 @@ mod tests {
 
     #[test]
     fn convert_hexadecimal_integer() {
-        let before = "const _: i32 = 0xFF<|>;";
+        let before = "const _: i32 = 0xFF$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -157,7 +157,7 @@ mod tests {
 
     #[test]
     fn convert_binary_integer() {
-        let before = "const _: i32 = 0b11111111<|>;";
+        let before = "const _: i32 = 0b11111111$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -183,7 +183,7 @@ mod tests {
 
     #[test]
     fn convert_octal_integer() {
-        let before = "const _: i32 = 0o377<|>;";
+        let before = "const _: i32 = 0o377$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -209,7 +209,7 @@ mod tests {
 
     #[test]
     fn convert_integer_with_underscores() {
-        let before = "const _: i32 = 1_00_0<|>;";
+        let before = "const _: i32 = 1_00_0$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -235,7 +235,7 @@ mod tests {
 
     #[test]
     fn convert_integer_with_suffix() {
-        let before = "const _: i32 = 1000i32<|>;";
+        let before = "const _: i32 = 1000i32$0;";
 
         check_assist_by_label(
             convert_integer_literal,
@@ -262,7 +262,7 @@ mod tests {
     #[test]
     fn convert_overflowing_literal() {
         let before = "const _: i32 =
-            111111111111111111111111111111111111111111111111111111111111111111111111<|>;";
+            111111111111111111111111111111111111111111111111111111111111111111111111$0;";
         check_assist_not_applicable(convert_integer_literal, before);
     }
 }
diff --git a/crates/assists/src/handlers/early_return.rs b/crates/assists/src/handlers/early_return.rs
index 7bcc318a9..8bbbb7ed5 100644
--- a/crates/assists/src/handlers/early_return.rs
+++ b/crates/assists/src/handlers/early_return.rs
@@ -24,7 +24,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     <|>if cond {
+//     $0if cond {
 //         foo();
 //         bar();
 //     }
@@ -69,7 +69,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
 
     let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::BlockExpr::cast)?;
 
-    if parent_block.expr()? != if_expr.clone().into() {
+    if parent_block.tail_expr()? != if_expr.clone().into() {
         return None;
     }
 
@@ -200,7 +200,7 @@ mod tests {
             r#"
             fn main() {
                 bar();
-                if<|> true {
+                if$0 true {
                     foo();
 
                     //comment
@@ -230,7 +230,7 @@ mod tests {
             r#"
             fn main(n: Option<String>) {
                 bar();
-                if<|> let Some(n) = n {
+                if$0 let Some(n) = n {
                     foo(n);
 
                     //comment
@@ -260,7 +260,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> let Ok(x) = Err(92) {
+                if$0 let Ok(x) = Err(92) {
                     foo(x);
                 }
             }
@@ -284,7 +284,7 @@ mod tests {
             r#"
             fn main(n: Option<String>) {
                 bar();
-                if<|> let Ok(n) = n {
+                if$0 let Ok(n) = n {
                     foo(n);
 
                     //comment
@@ -315,7 +315,7 @@ mod tests {
             r#"
             fn main() {
                 while true {
-                    if<|> true {
+                    if$0 true {
                         foo();
                         bar();
                     }
@@ -343,7 +343,7 @@ mod tests {
             r#"
             fn main() {
                 while true {
-                    if<|> let Some(n) = n {
+                    if$0 let Some(n) = n {
                         foo(n);
                         bar();
                     }
@@ -372,7 +372,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if<|> true {
+                    if$0 true {
                         foo();
                         bar();
                     }
@@ -400,7 +400,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if<|> let Some(n) = n {
+                    if$0 let Some(n) = n {
                         foo(n);
                         bar();
                     }
@@ -428,7 +428,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     return;
                 }
             }
@@ -443,7 +443,7 @@ mod tests {
             r#"
             fn main() {
                 loop {
-                    if<|> true {
+                    if$0 true {
                         continue;
                     }
                 }
@@ -458,7 +458,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     return
                 }
             }
@@ -472,7 +472,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     foo();
                 } else {
                     bar()
@@ -488,7 +488,7 @@ mod tests {
             convert_to_guarded_return,
             r#"
             fn main() {
-                if<|> true {
+                if$0 true {
                     foo();
                 }
                 bar();
@@ -504,7 +504,7 @@ mod tests {
             r#"
             fn main() {
                 if false {
-                    if<|> true {
+                    if$0 true {
                         foo();
                     }
                 }
diff --git a/crates/assists/src/handlers/expand_glob_import.rs b/crates/assists/src/handlers/expand_glob_import.rs
index f51a9a4ad..5fe617ba4 100644
--- a/crates/assists/src/handlers/expand_glob_import.rs
+++ b/crates/assists/src/handlers/expand_glob_import.rs
@@ -25,7 +25,7 @@ use crate::{
 //     pub struct Baz;
 // }
 //
-// use foo::*<|>;
+// use foo::*$0;
 //
 // fn qux(bar: Bar, baz: Baz) {}
 // ```
@@ -201,7 +201,7 @@ fn is_mod_visible_from(ctx: &AssistContext, module: Module, from: Module) -> boo
 // }
 //
 // ↓ ---------------
-// use foo::*<|>;
+// use foo::*$0;
 // use baz::Baz;
 // ↑ ---------------
 fn find_imported_defs(ctx: &AssistContext, star: SyntaxToken) -> Option<Vec<Def>> {
@@ -303,7 +303,7 @@ mod foo {
     pub fn f() {}
 }
 
-use foo::*<|>;
+use foo::*$0;
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -340,7 +340,7 @@ mod foo {
     pub fn f() {}
 }
 
-use foo::{*<|>, f};
+use foo::{*$0, f};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -378,7 +378,7 @@ mod foo {
 }
 
 use foo::Bar;
-use foo::{*<|>, f};
+use foo::{*$0, f};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -422,7 +422,7 @@ mod foo {
     }
 }
 
-use foo::{bar::{*<|>, f}, baz::*};
+use foo::{bar::{*$0, f}, baz::*};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -470,7 +470,7 @@ mod foo {
     }
 }
 
-use foo::{bar::{Bar, Baz, f}, baz::*<|>};
+use foo::{bar::{Bar, Baz, f}, baz::*$0};
 
 fn qux(bar: Bar, baz: Baz) {
     f();
@@ -529,7 +529,7 @@ mod foo {
 
 use foo::{
     bar::{*, f},
-    baz::{g, qux::*<|>}
+    baz::{g, qux::*$0}
 };
 
 fn qux(bar: Bar, baz: Baz) {
@@ -605,7 +605,7 @@ mod foo {
 
 use foo::{
     bar::{*, f},
-    baz::{g, qux::{h, q::*<|>}}
+    baz::{g, qux::{h, q::*$0}}
 };
 
 fn qux(bar: Bar, baz: Baz) {
@@ -681,7 +681,7 @@ mod foo {
 
 use foo::{
     bar::{*, f},
-    baz::{g, qux::{q::j, *<|>}}
+    baz::{g, qux::{q::j, *$0}}
 };
 
 fn qux(bar: Bar, baz: Baz) {
@@ -747,7 +747,7 @@ fn qux(bar: Bar, baz: Baz) {
         // pub fn baz() {}
 
         // //- /main.rs crate:main deps:foo
-        // use foo::*<|>;
+        // use foo::*$0;
 
         // fn main() {
         //     bar!();
@@ -777,7 +777,7 @@ pub trait Tr {
 impl Tr for () {}
 
 //- /main.rs crate:main deps:foo
-use foo::*<|>;
+use foo::*$0;
 
 fn main() {
     ().method();
@@ -807,7 +807,7 @@ pub trait Tr2 {
 impl Tr2 for () {}
 
 //- /main.rs crate:main deps:foo
-use foo::*<|>;
+use foo::*$0;
 
 fn main() {
     ().method();
@@ -834,7 +834,7 @@ mod foo {
     }
 }
 
-use foo::bar::*<|>;
+use foo::bar::*$0;
 
 fn baz(bar: Bar) {}
 ",
@@ -851,7 +851,7 @@ mod foo {
     }
 }
 
-use foo::bar::baz::*<|>;
+use foo::bar::baz::*$0;
 
 fn qux(baz: Baz) {}
 ",
@@ -869,7 +869,7 @@ fn qux(baz: Baz) {}
         pub struct Qux;
     }
 
-    use foo::Bar<|>;
+    use foo::Bar$0;
 
     fn qux(bar: Bar, baz: Baz) {}
     ",
@@ -885,7 +885,7 @@ mod foo {
     pub struct Bar;
 }
 
-use foo::{*<|>};
+use foo::{*$0};
 
 struct Baz {
     bar: Bar
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
index 030b9cd0c..e3ef04932 100644
--- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -2,12 +2,16 @@ use std::iter;
 
 use either::Either;
 use hir::{AsName, Module, ModuleDef, Name, Variant};
-use ide_db::helpers::{
-    insert_use::{insert_use, ImportScope},
-    mod_path_to_ast,
+use ide_db::{
+    defs::Definition,
+    helpers::{
+        insert_use::{insert_use, ImportScope},
+        mod_path_to_ast,
+    },
+    search::FileReference,
+    RootDatabase,
 };
-use ide_db::{defs::Definition, search::Reference, RootDatabase};
-use rustc_hash::{FxHashMap, FxHashSet};
+use rustc_hash::FxHashSet;
 use syntax::{
     algo::{find_node_at_offset, SyntaxRewriter},
     ast::{self, edit::IndentLevel, make, AstNode, NameOwner, VisibilityOwner},
@@ -21,7 +25,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Extracts a struct from enum variant.
 //
 // ```
-// enum A { <|>One(u32, u32) }
+// enum A { $0One(u32, u32) }
 // ```
 // ->
 // ```
@@ -58,29 +62,29 @@ pub(crate) fn extract_struct_from_enum_variant(
             let mut visited_modules_set = FxHashSet::default();
             let current_module = enum_hir.module(ctx.db());
             visited_modules_set.insert(current_module);
-            let mut rewriters = FxHashMap::default();
-            for reference in usages {
-                let rewriter = rewriters
-                    .entry(reference.file_range.file_id)
-                    .or_insert_with(SyntaxRewriter::default);
-                let source_file = ctx.sema.parse(reference.file_range.file_id);
-                update_reference(
-                    ctx,
-                    rewriter,
-                    reference,
-                    &source_file,
-                    &enum_module_def,
-                    &variant_hir_name,
-                    &mut visited_modules_set,
-                );
-            }
-            let mut rewriter =
-                rewriters.remove(&ctx.frange.file_id).unwrap_or_else(SyntaxRewriter::default);
-            for (file_id, rewriter) in rewriters {
+            let mut def_rewriter = None;
+            for (file_id, references) in usages {
+                let mut rewriter = SyntaxRewriter::default();
+                let source_file = ctx.sema.parse(file_id);
+                for reference in references {
+                    update_reference(
+                        ctx,
+                        &mut rewriter,
+                        reference,
+                        &source_file,
+                        &enum_module_def,
+                        &variant_hir_name,
+                        &mut visited_modules_set,
+                    );
+                }
+                if file_id == ctx.frange.file_id {
+                    def_rewriter = Some(rewriter);
+                    continue;
+                }
                 builder.edit_file(file_id);
                 builder.rewrite(rewriter);
             }
-            builder.edit_file(ctx.frange.file_id);
+            let mut rewriter = def_rewriter.unwrap_or_default();
             update_variant(&mut rewriter, &variant);
             extract_struct_def(
                 &mut rewriter,
@@ -90,6 +94,7 @@ pub(crate) fn extract_struct_from_enum_variant(
                 &variant.parent_enum().syntax().clone().into(),
                 enum_ast.visibility(),
             );
+            builder.edit_file(ctx.frange.file_id);
             builder.rewrite(rewriter);
         },
     )
@@ -117,10 +122,14 @@ fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &Va
         .into_iter()
         .filter(|(_, def)| match def {
             // only check type-namespace
-            hir::ScopeDef::ModuleDef(def) => matches!(def,
-                ModuleDef::Module(_) | ModuleDef::Adt(_) |
-                ModuleDef::Variant(_) | ModuleDef::Trait(_) |
-                ModuleDef::TypeAlias(_) | ModuleDef::BuiltinType(_)
+            hir::ScopeDef::ModuleDef(def) => matches!(
+                def,
+                ModuleDef::Module(_)
+                    | ModuleDef::Adt(_)
+                    | ModuleDef::Variant(_)
+                    | ModuleDef::Trait(_)
+                    | ModuleDef::TypeAlias(_)
+                    | ModuleDef::BuiltinType(_)
             ),
             _ => false,
         })
@@ -201,13 +210,13 @@ fn update_variant(rewriter: &mut SyntaxRewriter, variant: &ast::Variant) -> Opti
 fn update_reference(
     ctx: &AssistContext,
     rewriter: &mut SyntaxRewriter,
-    reference: Reference,
+    reference: FileReference,
     source_file: &SourceFile,
     enum_module_def: &ModuleDef,
     variant_hir_name: &Name,
     visited_modules_set: &mut FxHashSet<Module>,
 ) -> Option<()> {
-    let offset = reference.file_range.range.start();
+    let offset = reference.range.start();
     let (segment, expr) = if let Some(path_expr) =
         find_node_at_offset::<ast::PathExpr>(source_file.syntax(), offset)
     {
@@ -247,7 +256,7 @@ mod tests {
     fn test_extract_struct_several_fields_tuple() {
         check_assist(
             extract_struct_from_enum_variant,
-            "enum A { <|>One(u32, u32) }",
+            "enum A { $0One(u32, u32) }",
             r#"struct One(pub u32, pub u32);
 
 enum A { One(One) }"#,
@@ -258,7 +267,7 @@ enum A { One(One) }"#,
     fn test_extract_struct_several_fields_named() {
         check_assist(
             extract_struct_from_enum_variant,
-            "enum A { <|>One { foo: u32, bar: u32 } }",
+            "enum A { $0One { foo: u32, bar: u32 } }",
             r#"struct One{ pub foo: u32, pub bar: u32 }
 
 enum A { One(One) }"#,
@@ -269,7 +278,7 @@ enum A { One(One) }"#,
     fn test_extract_struct_one_field_named() {
         check_assist(
             extract_struct_from_enum_variant,
-            "enum A { <|>One { foo: u32 } }",
+            "enum A { $0One { foo: u32 } }",
             r#"struct One{ pub foo: u32 }
 
 enum A { One(One) }"#,
@@ -281,7 +290,7 @@ enum A { One(One) }"#,
         check_assist(
             extract_struct_from_enum_variant,
             r#"const One: () = ();
-enum A { <|>One(u32, u32) }"#,
+enum A { $0One(u32, u32) }"#,
             r#"const One: () = ();
 struct One(pub u32, pub u32);
 
@@ -293,7 +302,7 @@ enum A { One(One) }"#,
     fn test_extract_struct_pub_visibility() {
         check_assist(
             extract_struct_from_enum_variant,
-            "pub enum A { <|>One(u32, u32) }",
+            "pub enum A { $0One(u32, u32) }",
             r#"pub struct One(pub u32, pub u32);
 
 pub enum A { One(One) }"#,
@@ -315,7 +324,7 @@ pub enum A { One(One) }"#,
         }
 
         pub enum MyEnum {
-            <|>MyField(u8, u8),
+            $0MyField(u8, u8),
         }
     }
 }
@@ -357,7 +366,7 @@ fn another_fn() {
             extract_struct_from_enum_variant,
             r#"
 enum E {
-    <|>V { i: i32, j: i32 }
+    $0V { i: i32, j: i32 }
 }
 
 fn f() {
@@ -385,7 +394,7 @@ fn f() {
             r#"
 //- /main.rs
 enum E {
-    <|>V(i32, i32)
+    $0V(i32, i32)
 }
 mod foo;
 
@@ -420,7 +429,7 @@ fn f() {
             r#"
 //- /main.rs
 enum E {
-    <|>V { i: i32, j: i32 }
+    $0V { i: i32, j: i32 }
 }
 mod foo;
 
@@ -453,7 +462,7 @@ fn f() {
         check_assist(
             extract_struct_from_enum_variant,
             r#"
-enum A { <|>One { a: u32, b: u32 } }
+enum A { $0One { a: u32, b: u32 } }
 
 struct B(A);
 
@@ -483,29 +492,29 @@ fn foo() {
 
     #[test]
     fn test_extract_enum_not_applicable_for_element_with_no_fields() {
-        check_not_applicable("enum A { <|>One }");
+        check_not_applicable("enum A { $0One }");
     }
 
     #[test]
     fn test_extract_enum_not_applicable_if_struct_exists() {
         check_not_applicable(
             r#"struct One;
-        enum A { <|>One(u8, u32) }"#,
+        enum A { $0One(u8, u32) }"#,
         );
     }
 
     #[test]
     fn test_extract_not_applicable_one_field() {
-        check_not_applicable(r"enum A { <|>One(u32) }");
+        check_not_applicable(r"enum A { $0One(u32) }");
     }
 
     #[test]
     fn test_extract_not_applicable_no_field_tuple() {
-        check_not_applicable(r"enum A { <|>None() }");
+        check_not_applicable(r"enum A { $0None() }");
     }
 
     #[test]
     fn test_extract_not_applicable_no_field_named() {
-        check_not_applicable(r"enum A { <|>None {} }");
+        check_not_applicable(r"enum A { $0None {} }");
     }
 }
diff --git a/crates/assists/src/handlers/extract_variable.rs b/crates/assists/src/handlers/extract_variable.rs
index 9957012fe..98f3dc6ca 100644
--- a/crates/assists/src/handlers/extract_variable.rs
+++ b/crates/assists/src/handlers/extract_variable.rs
@@ -16,7 +16,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     <|>(1 + 2)<|> * 4;
+//     $0(1 + 2)$0 * 4;
 // }
 // ```
 // ->
@@ -139,7 +139,7 @@ impl Anchor {
     fn from(to_extract: &ast::Expr) -> Option<Anchor> {
         to_extract.syntax().ancestors().find_map(|node| {
             if let Some(expr) =
-                node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.expr())
+                node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.tail_expr())
             {
                 if expr.syntax() == &node {
                     mark::hit!(test_extract_var_last_expr);
@@ -187,7 +187,7 @@ mod tests {
             extract_variable,
             r#"
 fn foo() {
-    foo(<|>1 + 1<|>);
+    foo($01 + 1$0);
 }"#,
             r#"
 fn foo() {
@@ -200,7 +200,7 @@ fn foo() {
     #[test]
     fn extract_var_in_comment_is_not_applicable() {
         mark::check!(extract_var_in_comment_is_not_applicable);
-        check_assist_not_applicable(extract_variable, "fn main() { 1 + /* <|>comment<|> */ 1; }");
+        check_assist_not_applicable(extract_variable, "fn main() { 1 + /* $0comment$0 */ 1; }");
     }
 
     #[test]
@@ -210,7 +210,7 @@ fn foo() {
             extract_variable,
             r#"
 fn foo() {
-    <|>1 + 1<|>;
+    $01 + 1$0;
 }"#,
             r#"
 fn foo() {
@@ -221,7 +221,7 @@ fn foo() {
             extract_variable,
             "
 fn foo() {
-    <|>{ let x = 0; x }<|>
+    $0{ let x = 0; x }$0
     something_else();
 }",
             "
@@ -238,7 +238,7 @@ fn foo() {
             extract_variable,
             "
 fn foo() {
-    <|>1<|> + 1;
+    $01$0 + 1;
 }",
             "
 fn foo() {
@@ -255,7 +255,7 @@ fn foo() {
             extract_variable,
             r#"
 fn foo() {
-    bar(<|>1 + 1<|>)
+    bar($01 + 1$0)
 }
 "#,
             r#"
@@ -269,7 +269,7 @@ fn foo() {
             extract_variable,
             r#"
 fn foo() {
-    <|>bar(1 + 1)<|>
+    $0bar(1 + 1)$0
 }
 "#,
             r#"
@@ -289,7 +289,7 @@ fn foo() {
 fn main() {
     let x = true;
     let tuple = match x {
-        true => (<|>2 + 2<|>, true)
+        true => ($02 + 2$0, true)
         _ => (0, false)
     };
 }
@@ -316,7 +316,7 @@ fn main() {
     let tuple = match x {
         true => {
             let y = 1;
-            (<|>2 + y<|>, true)
+            ($02 + y$0, true)
         }
         _ => (0, false)
     };
@@ -344,7 +344,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let lambda = |x: u32| <|>x * 2<|>;
+    let lambda = |x: u32| $0x * 2$0;
 }
 ",
             "
@@ -361,7 +361,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let lambda = |x: u32| { <|>x * 2<|> };
+    let lambda = |x: u32| { $0x * 2$0 };
 }
 ",
             "
@@ -378,7 +378,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let o = <|>Some(true)<|>;
+    let o = $0Some(true)$0;
 }
 ",
             "
@@ -396,7 +396,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let v = <|>bar.foo()<|>;
+    let v = $0bar.foo()$0;
 }
 ",
             "
@@ -414,7 +414,7 @@ fn main() {
             extract_variable,
             "
 fn foo() -> u32 {
-    <|>return 2 + 2<|>;
+    $0return 2 + 2$0;
 }
 ",
             "
@@ -434,7 +434,7 @@ fn foo() -> u32 {
 fn foo() -> u32 {
 
 
-    <|>return 2 + 2<|>;
+    $0return 2 + 2$0;
 }
 ",
             "
@@ -452,7 +452,7 @@ fn foo() -> u32 {
             "
 fn foo() -> u32 {
 
-        <|>return 2 + 2<|>;
+        $0return 2 + 2$0;
 }
 ",
             "
@@ -473,7 +473,7 @@ fn foo() -> u32 {
     // bar
 
 
-    <|>return 2 + 2<|>;
+    $0return 2 + 2$0;
 }
 ",
             "
@@ -497,7 +497,7 @@ fn foo() -> u32 {
             "
 fn main() {
     let result = loop {
-        <|>break 2 + 2<|>;
+        $0break 2 + 2$0;
     };
 }
 ",
@@ -518,7 +518,7 @@ fn main() {
             extract_variable,
             "
 fn main() {
-    let v = <|>0f32 as u32<|>;
+    let v = $00f32 as u32$0;
 }
 ",
             "
@@ -540,7 +540,7 @@ struct S {
 }
 
 fn main() {
-    S { foo: <|>1 + 1<|> }
+    S { foo: $01 + 1$0 }
 }
 "#,
             r#"
@@ -558,18 +558,18 @@ fn main() {
 
     #[test]
     fn test_extract_var_for_return_not_applicable() {
-        check_assist_not_applicable(extract_variable, "fn foo() { <|>return<|>; } ");
+        check_assist_not_applicable(extract_variable, "fn foo() { $0return$0; } ");
     }
 
     #[test]
     fn test_extract_var_for_break_not_applicable() {
-        check_assist_not_applicable(extract_variable, "fn main() { loop { <|>break<|>; }; }");
+        check_assist_not_applicable(extract_variable, "fn main() { loop { $0break$0; }; }");
     }
 
     // FIXME: This is not quite correct, but good enough(tm) for the sorting heuristic
     #[test]
     fn extract_var_target() {
-        check_assist_target(extract_variable, "fn foo() -> u32 { <|>return 2 + 2<|>; }", "2 + 2");
+        check_assist_target(extract_variable, "fn foo() -> u32 { $0return 2 + 2$0; }", "2 + 2");
 
         check_assist_target(
             extract_variable,
@@ -577,7 +577,7 @@ fn main() {
 fn main() {
     let x = true;
     let tuple = match x {
-        true => (<|>2 + 2<|>, true)
+        true => ($02 + 2$0, true)
         _ => (0, false)
     };
 }
diff --git a/crates/assists/src/handlers/fill_match_arms.rs b/crates/assists/src/handlers/fill_match_arms.rs
index cb60a3128..da47187e4 100644
--- a/crates/assists/src/handlers/fill_match_arms.rs
+++ b/crates/assists/src/handlers/fill_match_arms.rs
@@ -21,7 +21,7 @@ use crate::{
 //
 // fn handle(action: Action) {
 //     match action {
-//         <|>
+//         $0
 //     }
 // }
 // ```
@@ -196,7 +196,7 @@ fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::Variant) -> Optio
     let path = mod_path_to_ast(&module.find_use_path(db, ModuleDef::from(var))?);
 
     // FIXME: use HIR for this; it doesn't currently expose struct vs. tuple vs. unit variants though
-    let pat: ast::Pat = match var.source(db).value.kind() {
+    let pat: ast::Pat = match var.source(db)?.value.kind() {
         ast::StructKind::Tuple(field_list) => {
             let pats = iter::repeat(make::wildcard_pat().into()).take(field_list.fields().count());
             make::tuple_struct_pat(path, pats).into()
@@ -231,7 +231,7 @@ mod tests {
                 Cs(i32, Option<i32>),
             }
             fn main() {
-                match A::As<|> {
+                match A::As$0 {
                     A::As,
                     A::Bs{x,y:Some(_)} => {}
                     A::Cs(_, Some(_)) => {}
@@ -249,7 +249,7 @@ mod tests {
             fill_match_arms,
             r#"
             fn main() {
-                match (0, false)<|> {
+                match (0, false)$0 {
                 }
             }
             "#,
@@ -267,7 +267,7 @@ mod tests {
                 Cs(i32, Option<i32>),
             }
             fn main() {
-                match A::As<|> {
+                match A::As$0 {
                     A::Bs { x, y: Some(_) } => {}
                     A::Cs(_, Some(_)) => {}
                 }
@@ -297,7 +297,7 @@ mod tests {
             r#"
 enum A { As, Bs, Cs(Option<i32>) }
 fn main() {
-    match A::As<|> {
+    match A::As$0 {
         A::Cs(_) | A::Bs => {}
     }
 }
@@ -322,7 +322,7 @@ fn main() {
 enum A { As, Bs, Cs, Ds(String), Es(B) }
 enum B { Xs, Ys }
 fn main() {
-    match A::As<|> {
+    match A::As$0 {
         A::Bs if 0 < 1 => {}
         A::Ds(_value) => { let x = 1; }
         A::Es(B::Xs) => (),
@@ -352,7 +352,7 @@ fn main() {
             r#"
 enum A { As, Bs, Cs(Option<i32>) }
 fn main() {
-    match A::As<|> {
+    match A::As$0 {
         A::As(_) => {}
         a @ A::Bs(_) => {}
     }
@@ -380,7 +380,7 @@ enum A { As, Bs, Cs(String), Ds(String, String), Es { x: usize, y: usize } }
 
 fn main() {
     let a = A::As;
-    match a<|> {}
+    match a$0 {}
 }
 "#,
             r#"
@@ -411,7 +411,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (a<|>, b) {}
+                match (a$0, b) {}
             }
             "#,
             r#"
@@ -443,7 +443,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (&a<|>, &b) {}
+                match (&a$0, &b) {}
             }
             "#,
             r#"
@@ -475,7 +475,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (a<|>, b) {
+                match (a$0, b) {
                     (A::Two, B::One) => {}
                 }
             }
@@ -494,7 +494,7 @@ fn main() {
             fn main() {
                 let a = A::One;
                 let b = B::One;
-                match (a<|>, b) {
+                match (a$0, b) {
                     (A::Two, B::One) => {}
                     (A::One, B::One) => {}
                     (A::One, B::Two) => {}
@@ -517,7 +517,7 @@ fn main() {
 
             fn main() {
                 let a = A::One;
-                match (a<|>, ) {
+                match (a$0, ) {
                 }
             }
             "#,
@@ -532,7 +532,7 @@ fn main() {
             enum A { As }
 
             fn foo(a: &A) {
-                match a<|> {
+                match a$0 {
                 }
             }
             "#,
@@ -555,7 +555,7 @@ fn main() {
             }
 
             fn foo(a: &mut A) {
-                match a<|> {
+                match a$0 {
                 }
             }
             "#,
@@ -581,7 +581,7 @@ fn main() {
             enum E { X, Y }
 
             fn main() {
-                match E::X<|> {}
+                match E::X$0 {}
             }
             "#,
             "match E::X {}",
@@ -597,7 +597,7 @@ fn main() {
 
             fn main() {
                 match E::X {
-                    <|>_ => {}
+                    $0_ => {}
                 }
             }
             "#,
@@ -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 8558a8ff0..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,7 @@ 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());
 
-    let in_file_source = record_field_def.source(ctx.db());
+    let in_file_source = record_field_def.source(ctx.db())?;
     let (offset, current_visibility, target) = match in_file_source.value {
         hir::FieldSource::Named(it) => {
             let s = it.syntax();
@@ -145,53 +145,53 @@ fn target_data_for_def(
     fn offset_target_and_file_id<S, Ast>(
         db: &dyn HirDatabase,
         x: S,
-    ) -> (TextSize, Option<ast::Visibility>, TextRange, FileId)
+    ) -> Option<(TextSize, Option<ast::Visibility>, TextRange, FileId)>
     where
         S: HasSource<Ast = Ast>,
         Ast: AstNode + ast::VisibilityOwner,
     {
-        let source = x.source(db);
+        let source = x.source(db)?;
         let in_file_syntax = source.syntax();
         let file_id = in_file_syntax.file_id;
         let syntax = in_file_syntax.value;
         let current_visibility = source.value.visibility();
-        (
+        Some((
             vis_offset(syntax),
             current_visibility,
             syntax.text_range(),
             file_id.original_file(db.upcast()),
-        )
+        ))
     }
 
     let target_name;
     let (offset, current_visibility, target, target_file) = match def {
         hir::ModuleDef::Function(f) => {
             target_name = Some(f.name(db));
-            offset_target_and_file_id(db, f)
+            offset_target_and_file_id(db, f)?
         }
         hir::ModuleDef::Adt(adt) => {
             target_name = Some(adt.name(db));
             match adt {
-                hir::Adt::Struct(s) => offset_target_and_file_id(db, s),
-                hir::Adt::Union(u) => offset_target_and_file_id(db, u),
-                hir::Adt::Enum(e) => offset_target_and_file_id(db, e),
+                hir::Adt::Struct(s) => offset_target_and_file_id(db, s)?,
+                hir::Adt::Union(u) => offset_target_and_file_id(db, u)?,
+                hir::Adt::Enum(e) => offset_target_and_file_id(db, e)?,
             }
         }
         hir::ModuleDef::Const(c) => {
             target_name = c.name(db);
-            offset_target_and_file_id(db, c)
+            offset_target_and_file_id(db, c)?
         }
         hir::ModuleDef::Static(s) => {
             target_name = s.name(db);
-            offset_target_and_file_id(db, s)
+            offset_target_and_file_id(db, s)?
         }
         hir::ModuleDef::Trait(t) => {
             target_name = Some(t.name(db));
-            offset_target_and_file_id(db, t)
+            offset_target_and_file_id(db, t)?
         }
         hir::ModuleDef::TypeAlias(t) => {
             target_name = Some(t.name(db));
-            offset_target_and_file_id(db, t)
+            offset_target_and_file_id(db, t)?
         }
         hir::ModuleDef::Module(m) => {
             target_name = m.name(db);
@@ -218,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() } ",
         )
     }
 
@@ -234,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 } ",
         );
     }
 
@@ -276,7 +276,7 @@ mod tests {
             r"
 //- /main.rs
 mod foo;
-fn main() { foo::Foo<|> }
+fn main() { foo::Foo$0 }
 
 //- /foo.rs
 struct Foo;
@@ -291,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: () }; } ",
         );
@@ -300,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: () }
 ",
@@ -310,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: () }
 ",
@@ -331,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: () } }
 ",
@@ -346,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: () }
 ",
@@ -367,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: () }; } ",
         );
@@ -376,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: () }
 ",
@@ -386,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: () }
 ",
@@ -405,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 } ",
         );
     }
 
@@ -421,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 } ",
         );
     }
 
@@ -437,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; } ",
         );
     }
 
@@ -453,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; } ",
         );
     }
 
@@ -469,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(); } ",
         );
@@ -479,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 {
@@ -495,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(); } ",
         );
     }
 
@@ -506,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;
@@ -525,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 {
@@ -545,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;
 ",
@@ -560,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;
 ",
@@ -572,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: () }
@@ -593,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..dc798daaa 100644
--- a/crates/assists/src/handlers/inline_local_variable.rs
+++ b/crates/assists/src/handlers/inline_local_variable.rs
@@ -1,4 +1,7 @@
-use ide_db::{defs::Definition, search::ReferenceKind};
+use ide_db::{
+    defs::Definition,
+    search::{FileReference, ReferenceKind},
+};
 use syntax::{
     ast::{self, AstNode, AstToken},
     TextRange,
@@ -16,7 +19,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     let x<|> = 1 + 2;
+//     let x$0 = 1 + 2;
 //     x * 4;
 // }
 // ```
@@ -44,8 +47,8 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
 
     let def = ctx.sema.to_def(&bind_pat)?;
     let def = Definition::Local(def);
-    let refs = def.usages(&ctx.sema).all();
-    if refs.is_empty() {
+    let usages = def.usages(&ctx.sema).all();
+    if usages.is_empty() {
         mark::hit!(test_not_applicable_if_variable_unused);
         return None;
     };
@@ -63,48 +66,45 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
         let_stmt.syntax().text_range()
     };
 
-    let mut wrap_in_parens = vec![true; refs.len()];
-
-    for (i, desc) in refs.iter().enumerate() {
-        let usage_node = ctx
-            .covering_node_for_range(desc.file_range.range)
-            .ancestors()
-            .find_map(ast::PathExpr::cast)?;
-        let usage_parent_option = usage_node.syntax().parent().and_then(ast::Expr::cast);
-        let usage_parent = match usage_parent_option {
-            Some(u) => u,
-            None => {
-                wrap_in_parens[i] = false;
-                continue;
-            }
-        };
-
-        wrap_in_parens[i] = match (&initializer_expr, usage_parent) {
-            (ast::Expr::CallExpr(_), _)
-            | (ast::Expr::IndexExpr(_), _)
-            | (ast::Expr::MethodCallExpr(_), _)
-            | (ast::Expr::FieldExpr(_), _)
-            | (ast::Expr::TryExpr(_), _)
-            | (ast::Expr::RefExpr(_), _)
-            | (ast::Expr::Literal(_), _)
-            | (ast::Expr::TupleExpr(_), _)
-            | (ast::Expr::ArrayExpr(_), _)
-            | (ast::Expr::ParenExpr(_), _)
-            | (ast::Expr::PathExpr(_), _)
-            | (ast::Expr::BlockExpr(_), _)
-            | (ast::Expr::EffectExpr(_), _)
-            | (_, ast::Expr::CallExpr(_))
-            | (_, ast::Expr::TupleExpr(_))
-            | (_, ast::Expr::ArrayExpr(_))
-            | (_, ast::Expr::ParenExpr(_))
-            | (_, ast::Expr::ForExpr(_))
-            | (_, ast::Expr::WhileExpr(_))
-            | (_, ast::Expr::BreakExpr(_))
-            | (_, ast::Expr::ReturnExpr(_))
-            | (_, ast::Expr::MatchExpr(_)) => false,
-            _ => true,
-        };
-    }
+    let wrap_in_parens = usages
+        .references
+        .values()
+        .flatten()
+        .map(|&FileReference { range, .. }| {
+            let usage_node =
+                ctx.covering_node_for_range(range).ancestors().find_map(ast::PathExpr::cast)?;
+            let usage_parent_option = usage_node.syntax().parent().and_then(ast::Expr::cast);
+            let usage_parent = match usage_parent_option {
+                Some(u) => u,
+                None => return Ok(false),
+            };
+
+            Ok(!matches!((&initializer_expr, usage_parent),
+                (ast::Expr::CallExpr(_), _)
+                | (ast::Expr::IndexExpr(_), _)
+                | (ast::Expr::MethodCallExpr(_), _)
+                | (ast::Expr::FieldExpr(_), _)
+                | (ast::Expr::TryExpr(_), _)
+                | (ast::Expr::RefExpr(_), _)
+                | (ast::Expr::Literal(_), _)
+                | (ast::Expr::TupleExpr(_), _)
+                | (ast::Expr::ArrayExpr(_), _)
+                | (ast::Expr::ParenExpr(_), _)
+                | (ast::Expr::PathExpr(_), _)
+                | (ast::Expr::BlockExpr(_), _)
+                | (ast::Expr::EffectExpr(_), _)
+                | (_, ast::Expr::CallExpr(_))
+                | (_, ast::Expr::TupleExpr(_))
+                | (_, ast::Expr::ArrayExpr(_))
+                | (_, ast::Expr::ParenExpr(_))
+                | (_, ast::Expr::ForExpr(_))
+                | (_, ast::Expr::WhileExpr(_))
+                | (_, ast::Expr::BreakExpr(_))
+                | (_, ast::Expr::ReturnExpr(_))
+                | (_, ast::Expr::MatchExpr(_))
+            ))
+        })
+        .collect::<Result<Vec<_>, _>>()?;
 
     let init_str = initializer_expr.syntax().text().to_string();
     let init_in_paren = format!("({})", &init_str);
@@ -116,15 +116,16 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
         target,
         move |builder| {
             builder.delete(delete_range);
-            for (desc, should_wrap) in refs.iter().zip(wrap_in_parens) {
+            for (reference, should_wrap) in usages.references.values().flatten().zip(wrap_in_parens)
+            {
                 let replacement =
                     if should_wrap { init_in_paren.clone() } else { init_str.clone() };
-                match desc.kind {
+                match reference.kind {
                     ReferenceKind::FieldShorthandForLocal => {
                         mark::hit!(inline_field_shorthand);
-                        builder.insert(desc.file_range.range.end(), format!(": {}", replacement))
+                        builder.insert(reference.range.end(), format!(": {}", replacement))
                     }
-                    _ => builder.replace(desc.file_range.range, replacement),
+                    _ => builder.replace(reference.range, replacement),
                 }
             }
         },
@@ -146,7 +147,7 @@ mod tests {
             r"
 fn bar(a: usize) {}
 fn foo() {
-    let a<|> = 1;
+    let a$0 = 1;
     a + 1;
     if a > 10 {
     }
@@ -180,7 +181,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 +215,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 +249,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 +282,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 +314,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 +347,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let mut a<|> = 1 + 1;
+    let mut a$0 = 1 + 1;
     a + 1;
 }",
         );
@@ -358,7 +359,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 +378,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 +398,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 +422,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 +446,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 +468,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 +485,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 +501,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 +517,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 +536,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 +555,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 +573,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 +595,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 +611,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 > 0;
+    let a$0 = 1 > 0;
     while a {}
 }",
             r"
@@ -626,7 +627,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 + 1;
+    let a$0 = 1 + 1;
     loop {
         break a;
     }
@@ -646,7 +647,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 > 0;
+    let a$0 = 1 > 0;
     return a;
 }",
             r"
@@ -662,7 +663,7 @@ fn foo() {
             inline_local_variable,
             r"
 fn foo() {
-    let a<|> = 1 > 0;
+    let a$0 = 1 > 0;
     match a {}
 }",
             r"
@@ -680,7 +681,7 @@ fn foo() {
             r"
 struct S { foo: i32}
 fn main() {
-    let <|>foo = 92;
+    let $0foo = 92;
     S { foo }
 }
 ",
@@ -700,7 +701,7 @@ fn main() {
             inline_local_variable,
             r"
 fn foo() {
-    let <|>a = 0;
+    let $0a = 0;
 }
             ",
         )
@@ -713,7 +714,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/pull_assignment_up.rs b/crates/assists/src/handlers/pull_assignment_up.rs
new file mode 100644
index 000000000..13e1cb754
--- /dev/null
+++ b/crates/assists/src/handlers/pull_assignment_up.rs
@@ -0,0 +1,400 @@
+use syntax::{
+    ast::{self, edit::AstNodeEdit, make},
+    AstNode,
+};
+use test_utils::mark;
+
+use crate::{
+    assist_context::{AssistContext, Assists},
+    AssistId, AssistKind,
+};
+
+// Assist: pull_assignment_up
+//
+// Extracts variable assignment to outside an if or match statement.
+//
+// ```
+// fn main() {
+//     let mut foo = 6;
+//
+//     if true {
+//         $0foo = 5;
+//     } else {
+//         foo = 4;
+//     }
+// }
+// ```
+// ->
+// ```
+// fn main() {
+//     let mut foo = 6;
+//
+//     foo = if true {
+//         5
+//     } else {
+//         4
+//     };
+// }
+// ```
+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, &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, &ctx.sema, &name_expr)?,
+        )
+    } else {
+        return None;
+    };
+
+    let expr_stmt = make::expr_stmt(new_stmt);
+
+    acc.add(
+        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, expr_stmt));
+        },
+    )
+}
+
+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, sema, name)?.indent(block.indent_level());
+                Some(arm.replace_descendant(block, new_block))
+            } else {
+                None
+            }
+        })
+        .collect::<Option<Vec<_>>>()?;
+    let new_arm_list = match_expr
+        .match_arm_list()?
+        .replace_descendants(match_expr.match_arm_list()?.arms().zip(new_arm_list));
+    Some(make::expr_match(match_expr.expr()?, new_arm_list))
+}
+
+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, sema, name)?)
+        }
+        ast::ElseBranch::IfExpr(expr) => {
+            mark::hit!(test_pull_assignment_up_chained_if);
+            ast::ElseBranch::IfExpr(ast::IfExpr::cast(
+                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,
+    sema: &hir::Semantics<ide_db::RootDatabase>,
+    name: &ast::Expr,
+) -> Option<ast::BlockExpr> {
+    if block.tail_expr().is_some() {
+        return None;
+    }
+
+    let mut stmts: Vec<_> = block.statements().collect();
+    let stmt = stmts.pop()?;
+
+    if let ast::Stmt::ExprStmt(stmt) = stmt {
+        if let ast::Expr::BinExpr(expr) = stmt.expr()? {
+            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()?)));
+            }
+        }
+    }
+    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::*;
+
+    use crate::tests::{check_assist, check_assist_not_applicable};
+
+    #[test]
+    fn test_pull_assignment_up_if() {
+        check_assist(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    if true {
+        $0a = 2;
+    } else {
+        a = 3;
+    }
+}"#,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    a = if true {
+        2
+    } else {
+        3
+    };
+}"#,
+        );
+    }
+
+    #[test]
+    fn test_pull_assignment_up_match() {
+        check_assist(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    match 1 {
+        1 => {
+            $0a = 2;
+        },
+        2 => {
+            a = 3;
+        },
+        3 => {
+            a = 4;
+        }
+    }
+}"#,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    a = match 1 {
+        1 => {
+            2
+        },
+        2 => {
+            3
+        },
+        3 => {
+            4
+        }
+    };
+}"#,
+        );
+    }
+
+    #[test]
+    fn test_pull_assignment_up_not_last_not_applicable() {
+        check_assist_not_applicable(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    if true {
+        $0a = 2;
+        b = a;
+    } else {
+        a = 3;
+    }
+}"#,
+        )
+    }
+
+    #[test]
+    fn test_pull_assignment_up_chained_if() {
+        mark::check!(test_pull_assignment_up_chained_if);
+        check_assist(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    if true {
+        $0a = 2;
+    } else if false {
+        a = 3;
+    } else {
+        a = 4;
+    }
+}"#,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    a = if true {
+        2
+    } else if false {
+        3
+    } else {
+        4
+    };
+}"#,
+        );
+    }
+
+    #[test]
+    fn test_pull_assignment_up_retains_stmts() {
+        check_assist(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    if true {
+        let b = 2;
+        $0a = 2;
+    } else {
+        let b = 3;
+        a = 3;
+    }
+}"#,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    a = if true {
+        let b = 2;
+        2
+    } else {
+        let b = 3;
+        3
+    };
+}"#,
+        )
+    }
+
+    #[test]
+    fn pull_assignment_up_let_stmt_not_applicable() {
+        check_assist_not_applicable(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    let b = if true {
+        $0a = 2
+    } else {
+        a = 3
+    };
+}"#,
+        )
+    }
+
+    #[test]
+    fn pull_assignment_up_if_missing_assigment_not_applicable() {
+        check_assist_not_applicable(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    if true {
+        $0a = 2;
+    } else {}
+}"#,
+        )
+    }
+
+    #[test]
+    fn pull_assignment_up_match_missing_assigment_not_applicable() {
+        check_assist_not_applicable(
+            pull_assignment_up,
+            r#"
+fn foo() {
+    let mut a = 1;
+
+    match 1 {
+        1 => {
+            $0a = 2;
+        },
+        2 => {
+            a = 3;
+        },
+        3 => {},
+    }
+}"#,
+        )
+    }
+
+    #[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..6114091f2 100644
--- a/crates/assists/src/handlers/remove_dbg.rs
+++ b/crates/assists/src/handlers/remove_dbg.rs
@@ -1,6 +1,6 @@
 use syntax::{
     ast::{self, AstNode},
-    match_ast, SyntaxElement, SyntaxKind, TextRange, TextSize, T,
+    match_ast, SyntaxElement, TextRange, TextSize, T,
 };
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     <|>dbg!(92);
+//     $0dbg!(92);
 // }
 // ```
 // ->
@@ -136,14 +136,14 @@ fn needs_parentheses_around_macro_contents(macro_contents: Vec<SyntaxElement>) -
             symbol_kind => {
                 let symbol_not_in_bracket = unpaired_brackets_in_contents.is_empty();
                 if symbol_not_in_bracket
-                    && symbol_kind != SyntaxKind::COLON // paths
-                    && (symbol_kind != SyntaxKind::DOT // field/method access
+                    && symbol_kind != T![:] // paths
+                    && (symbol_kind != T![.] // field/method access
                         || macro_contents // range expressions consist of two SyntaxKind::Dot in macro invocations
                             .peek()
-                            .map(|element| element.kind() == SyntaxKind::DOT)
+                            .map(|element| element.kind() == T![.])
                             .unwrap_or(false))
-                    && symbol_kind != SyntaxKind::QUESTION // try operator
-                    && (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW)
+                    && symbol_kind != T![?] // try operator
+                    && (symbol_kind.is_punct() || symbol_kind == T![as])
                 {
                     return true;
                 }
@@ -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..c961680e2 100644
--- a/crates/assists/src/handlers/remove_unused_param.rs
+++ b/crates/assists/src/handlers/remove_unused_param.rs
@@ -1,8 +1,8 @@
-use ide_db::{defs::Definition, search::Reference};
+use ide_db::{base_db::FileId, defs::Definition, search::FileReference};
 use syntax::{
     algo::find_node_at_range,
     ast::{self, ArgListOwner},
-    AstNode, SyntaxKind, SyntaxNode, TextRange, T,
+    AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, T,
 };
 use test_utils::mark;
 use SyntaxKind::WHITESPACE;
@@ -16,7 +16,7 @@ use crate::{
 // Removes unused function parameter.
 //
 // ```
-// fn frobnicate(x: i32<|>) {}
+// fn frobnicate(x: i32$0) {}
 //
 // fn main() {
 //     frobnicate(92);
@@ -58,32 +58,41 @@ pub(crate) fn remove_unused_param(acc: &mut Assists, ctx: &AssistContext) -> Opt
         param.syntax().text_range(),
         |builder| {
             builder.delete(range_to_remove(param.syntax()));
-            for usage in fn_def.usages(&ctx.sema).all() {
-                process_usage(ctx, builder, usage, param_position);
+            for (file_id, references) in fn_def.usages(&ctx.sema).all() {
+                process_usages(ctx, builder, file_id, references, param_position);
             }
         },
     )
 }
 
-fn process_usage(
+fn process_usages(
     ctx: &AssistContext,
     builder: &mut AssistBuilder,
-    usage: Reference,
+    file_id: FileId,
+    references: Vec<FileReference>,
     arg_to_remove: usize,
-) -> Option<()> {
-    let source_file = ctx.sema.parse(usage.file_range.file_id);
-    let call_expr: ast::CallExpr =
-        find_node_at_range(source_file.syntax(), usage.file_range.range)?;
+) {
+    let source_file = ctx.sema.parse(file_id);
+    builder.edit_file(file_id);
+    for usage in references {
+        if let Some(text_range) = process_usage(&source_file, usage, arg_to_remove) {
+            builder.delete(text_range);
+        }
+    }
+}
+
+fn process_usage(
+    source_file: &SourceFile,
+    FileReference { range, .. }: FileReference,
+    arg_to_remove: usize,
+) -> Option<TextRange> {
+    let call_expr: ast::CallExpr = find_node_at_range(source_file.syntax(), range)?;
     let call_expr_range = call_expr.expr()?.syntax().text_range();
-    if !call_expr_range.contains_range(usage.file_range.range) {
+    if !call_expr_range.contains_range(range) {
         return None;
     }
     let arg = call_expr.arg_list()?.args().nth(arg_to_remove)?;
-
-    builder.edit_file(usage.file_range.file_id);
-    builder.delete(range_to_remove(arg.syntax()));
-
-    Some(())
+    Some(range_to_remove(arg.syntax()))
 }
 
 fn range_to_remove(node: &SyntaxNode) -> TextRange {
@@ -123,7 +132,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 +148,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 +165,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 +182,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 +199,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 +214,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 +229,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 +247,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 +259,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/reorder_impl.rs b/crates/assists/src/handlers/reorder_impl.rs
new file mode 100644
index 000000000..309f291c8
--- /dev/null
+++ b/crates/assists/src/handlers/reorder_impl.rs
@@ -0,0 +1,201 @@
+use itertools::Itertools;
+use rustc_hash::FxHashMap;
+
+use hir::{PathResolution, Semantics};
+use ide_db::RootDatabase;
+use syntax::{
+    algo,
+    ast::{self, NameOwner},
+    AstNode,
+};
+use test_utils::mark;
+
+use crate::{AssistContext, AssistId, AssistKind, Assists};
+
+// Assist: reorder_impl
+//
+// Reorder the methods of an `impl Trait`. The methods will be ordered
+// in the same order as in the trait definition.
+//
+// ```
+// trait Foo {
+//     fn a() {}
+//     fn b() {}
+//     fn c() {}
+// }
+//
+// struct Bar;
+// $0impl Foo for Bar {
+//     fn b() {}
+//     fn c() {}
+//     fn a() {}
+// }
+// ```
+// ->
+// ```
+// trait Foo {
+//     fn a() {}
+//     fn b() {}
+//     fn c() {}
+// }
+//
+// struct Bar;
+// impl Foo for Bar {
+//     fn a() {}
+//     fn b() {}
+//     fn c() {}
+// }
+// ```
+//
+pub(crate) fn reorder_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+    let impl_ast = ctx.find_node_at_offset::<ast::Impl>()?;
+    let items = impl_ast.assoc_item_list()?;
+    let methods = get_methods(&items);
+
+    let path = impl_ast
+        .trait_()
+        .and_then(|t| match t {
+            ast::Type::PathType(path) => Some(path),
+            _ => None,
+        })?
+        .path()?;
+
+    let ranks = compute_method_ranks(&path, ctx)?;
+    let sorted: Vec<_> = methods
+        .iter()
+        .cloned()
+        .sorted_by_key(|f| {
+            f.name().and_then(|n| ranks.get(&n.to_string()).copied()).unwrap_or(usize::max_value())
+        })
+        .collect();
+
+    // Don't edit already sorted methods:
+    if methods == sorted {
+        mark::hit!(not_applicable_if_sorted);
+        return None;
+    }
+
+    let target = items.syntax().text_range();
+    acc.add(AssistId("reorder_impl", AssistKind::RefactorRewrite), "Sort methods", target, |edit| {
+        let mut rewriter = algo::SyntaxRewriter::default();
+        for (old, new) in methods.iter().zip(&sorted) {
+            rewriter.replace(old.syntax(), new.syntax());
+        }
+        edit.rewrite(rewriter);
+    })
+}
+
+fn compute_method_ranks(path: &ast::Path, ctx: &AssistContext) -> Option<FxHashMap<String, usize>> {
+    let td = trait_definition(path, &ctx.sema)?;
+
+    Some(
+        td.items(ctx.db())
+            .iter()
+            .flat_map(|i| match i {
+                hir::AssocItem::Function(f) => Some(f),
+                _ => None,
+            })
+            .enumerate()
+            .map(|(idx, func)| ((func.name(ctx.db()).to_string(), idx)))
+            .collect(),
+    )
+}
+
+fn trait_definition(path: &ast::Path, sema: &Semantics<RootDatabase>) -> Option<hir::Trait> {
+    match sema.resolve_path(path)? {
+        PathResolution::Def(hir::ModuleDef::Trait(trait_)) => Some(trait_),
+        _ => None,
+    }
+}
+
+fn get_methods(items: &ast::AssocItemList) -> Vec<ast::Fn> {
+    items
+        .assoc_items()
+        .flat_map(|i| match i {
+            ast::AssocItem::Fn(f) => Some(f),
+            _ => None,
+        })
+        .filter(|f| f.name().is_some())
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use test_utils::mark;
+
+    use crate::tests::{check_assist, check_assist_not_applicable};
+
+    use super::*;
+
+    #[test]
+    fn not_applicable_if_sorted() {
+        mark::check!(not_applicable_if_sorted);
+        check_assist_not_applicable(
+            reorder_impl,
+            r#"
+trait Bar {
+    fn a() {}
+    fn z() {}
+    fn b() {}
+}
+struct Foo;
+$0impl Bar for Foo {
+    fn a() {}
+    fn z() {}
+    fn b() {}
+}
+        "#,
+        )
+    }
+
+    #[test]
+    fn not_applicable_if_empty() {
+        check_assist_not_applicable(
+            reorder_impl,
+            r#"
+trait Bar {};
+struct Foo;
+$0impl Bar for Foo {}
+        "#,
+        )
+    }
+
+    #[test]
+    fn reorder_impl_trait_methods() {
+        check_assist(
+            reorder_impl,
+            r#"
+trait Bar {
+    fn a() {}
+    fn c() {}
+    fn b() {}
+    fn d() {}
+}
+
+struct Foo;
+$0impl Bar for Foo {
+    fn d() {}
+    fn b() {}
+    fn c() {}
+    fn a() {}
+}
+        "#,
+            r#"
+trait Bar {
+    fn a() {}
+    fn c() {}
+    fn b() {}
+    fn d() {}
+}
+
+struct Foo;
+impl Bar for Foo {
+    fn a() {}
+    fn c() {}
+    fn b() {}
+    fn d() {}
+}
+        "#,
+        )
+    }
+}
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 fdec886e9..1080294ab 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,7 +116,6 @@ mod handlers {
     mod convert_integer_literal;
     mod early_return;
     mod expand_glob_import;
-    mod extract_module_to_file;
     mod extract_struct_from_enum_variant;
     mod extract_variable;
     mod fill_match_arms;
@@ -124,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;
@@ -138,12 +138,15 @@ 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;
     mod remove_mut;
     mod remove_unused_param;
     mod reorder_fields;
+    mod reorder_impl;
     mod replace_derive_with_manual_impl;
     mod replace_if_let_with_match;
     mod replace_impl_trait_with_generic;
@@ -167,7 +170,7 @@ mod handlers {
             convert_integer_literal::convert_integer_literal,
             early_return::convert_to_guarded_return,
             expand_glob_import::expand_glob_import,
-            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,
@@ -175,13 +178,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,
@@ -190,6 +194,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,
@@ -198,6 +203,7 @@ mod handlers {
             remove_mut::remove_mut,
             remove_unused_param::remove_unused_param,
             reorder_fields::reorder_fields,
+            reorder_impl::reorder_impl,
             replace_derive_with_manual_impl::replace_derive_with_manual_impl,
             replace_if_let_with_match::replace_if_let_with_match,
             replace_if_let_with_match::replace_match_with_if_let,
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 d3dfe24e7..217f577eb 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,26 +238,11 @@ fn qux(bar: Bar, baz: Baz) {}
 }
 
 #[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);
@@ -273,7 +258,7 @@ fn doctest_extract_variable() {
         "extract_variable",
         r#####"
 fn main() {
-    <|>(1 + 2)<|> * 4;
+    $0(1 + 2)$0 * 4;
 }
 "#####,
         r#####"
@@ -294,7 +279,7 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        <|>
+        $0
     }
 }
 "#####,
@@ -320,7 +305,7 @@ mod m {
     fn frobnicate() {}
 }
 fn main() {
-    m::frobnicate<|>() {}
+    m::frobnicate$0() {}
 }
 "#####,
         r#####"
@@ -340,7 +325,7 @@ fn doctest_flip_binexpr() {
         "flip_binexpr",
         r#####"
 fn main() {
-    let _ = 90 +<|> 2;
+    let _ = 90 +$0 2;
 }
 "#####,
         r#####"
@@ -357,7 +342,7 @@ fn doctest_flip_comma() {
         "flip_comma",
         r#####"
 fn main() {
-    ((1, 2),<|> (3, 4));
+    ((1, 2),$0 (3, 4));
 }
 "#####,
         r#####"
@@ -373,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>() { }
@@ -388,7 +373,7 @@ fn doctest_generate_default_from_enum_variant() {
         r#####"
 enum Version {
  Undefined,
- Minor<|>,
+ Minor$0,
  Major,
 }
 "#####,
@@ -415,7 +400,7 @@ fn doctest_generate_derive() {
         r#####"
 struct Point {
     x: u32,
-    y: u32,<|>
+    y: u32,$0
 }
 "#####,
         r#####"
@@ -433,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) }
@@ -455,7 +440,7 @@ fn doctest_generate_function() {
 struct Baz;
 fn baz() -> Baz { Baz }
 fn foo() {
-    bar<|>("", baz());
+    bar$0("", baz());
 }
 
 "#####,
@@ -480,7 +465,7 @@ fn doctest_generate_impl() {
         "generate_impl",
         r#####"
 struct Ctx<T: Clone> {
-    data: T,<|>
+    data: T,$0
 }
 "#####,
         r#####"
@@ -501,7 +486,7 @@ fn doctest_generate_new() {
         "generate_new",
         r#####"
 struct Ctx<T: Clone> {
-     data: T,<|>
+     data: T,$0
 }
 "#####,
         r#####"
@@ -522,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 }
@@ -531,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;
 }
 "#####,
@@ -553,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,
@@ -579,7 +587,7 @@ fn doctest_invert_if() {
         "invert_if",
         r#####"
 fn main() {
-    if<|> !y { A } else { B }
+    if$0 !y { A } else { B }
 }
 "#####,
         r#####"
@@ -596,7 +604,7 @@ fn doctest_make_raw_string() {
         "make_raw_string",
         r#####"
 fn main() {
-    "Hello,<|> World!";
+    "Hello,$0 World!";
 }
 "#####,
         r#####"
@@ -613,7 +621,7 @@ fn doctest_make_usual_string() {
         "make_usual_string",
         r#####"
 fn main() {
-    r#"Hello,<|> "World!""#;
+    r#"Hello,$0 "World!""#;
 }
 "#####,
         r#####"
@@ -629,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#####"
@@ -647,7 +655,7 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        <|>Action::Move(..) => foo(),
+        $0Action::Move(..) => foo(),
         Action::Stop => foo(),
     }
 }
@@ -673,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() },
         _ => (),
     }
 }
@@ -696,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)
 }
 "#####,
@@ -717,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(),
         _ => (),
     }
 }
@@ -738,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 { } } }
 "#####,
@@ -762,7 +814,7 @@ fn doctest_remove_dbg() {
         "remove_dbg",
         r#####"
 fn main() {
-    <|>dbg!(92);
+    $0dbg!(92);
 }
 "#####,
         r#####"
@@ -779,7 +831,7 @@ fn doctest_remove_hash() {
         "remove_hash",
         r#####"
 fn main() {
-    r#"Hello,<|> World!"#;
+    r#"Hello,$0 World!"#;
 }
 "#####,
         r#####"
@@ -796,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#####"
@@ -812,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);
@@ -834,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};
@@ -844,12 +896,47 @@ const test: Foo = Foo {foo: 1, bar: 0}
 }
 
 #[test]
+fn doctest_reorder_impl() {
+    check_doc_test(
+        "reorder_impl",
+        r#####"
+trait Foo {
+    fn a() {}
+    fn b() {}
+    fn c() {}
+}
+
+struct Bar;
+$0impl Foo for Bar {
+    fn b() {}
+    fn c() {}
+    fn a() {}
+}
+"#####,
+        r#####"
+trait Foo {
+    fn a() {}
+    fn b() {}
+    fn c() {}
+}
+
+struct Bar;
+impl Foo for Bar {
+    fn a() {}
+    fn b() {}
+    fn c() {}
+}
+"#####,
+    )
+}
+
+#[test]
 fn doctest_replace_derive_with_manual_impl() {
     check_doc_test(
         "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#####"
@@ -874,7 +961,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()
@@ -899,7 +986,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) {}
@@ -915,7 +1002,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 }
@@ -941,7 +1028,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(),
     }
@@ -966,7 +1053,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;
@@ -982,7 +1069,7 @@ fn doctest_replace_string_with_char() {
         "replace_string_with_char",
         r#####"
 fn main() {
-    find("{<|>");
+    find("{$0");
 }
 "#####,
         r#####"
@@ -1001,7 +1088,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#####"
@@ -1022,7 +1109,7 @@ fn doctest_split_import() {
     check_doc_test(
         "split_import",
         r#####"
-use std::<|>collections::HashMap;
+use std::$0collections::HashMap;
 "#####,
         r#####"
 use std::{collections::HashMap};
@@ -1035,7 +1122,7 @@ fn doctest_toggle_ignore() {
     check_doc_test(
         "toggle_ignore",
         r#####"
-<|>#[test]
+$0#[test]
 fn arithmetics {
     assert_eq!(2 + 2, 5);
 }
@@ -1056,7 +1143,7 @@ fn doctest_unwrap_block() {
         "unwrap_block",
         r#####"
 fn foo() {
-    if true {<|>
+    if true {$0
         println!("foo");
     }
 }
@@ -1074,7 +1161,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 d41084b59..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;
         }
@@ -94,14 +91,18 @@ pub fn filter_assoc_items(
             ast::AssocItem::MacroCall(_) => None,
         }
         .is_some()
-    };
+    }
 
     items
         .iter()
-        .map(|i| match i {
-            hir::AssocItem::Function(i) => ast::AssocItem::Fn(i.source(db).value),
-            hir::AssocItem::TypeAlias(i) => ast::AssocItem::TypeAlias(i.source(db).value),
-            hir::AssocItem::Const(i) => ast::AssocItem::Const(i.source(db).value),
+        // Note: This throws away items with no source.
+        .filter_map(|i| {
+            let item = match i {
+                hir::AssocItem::Function(i) => ast::AssocItem::Fn(i.source(db)?.value),
+                hir::AssocItem::TypeAlias(i) => ast::AssocItem::TypeAlias(i.source(db)?.value),
+                hir::AssocItem::Const(i) => ast::AssocItem::Const(i.source(db)?.value),
+            };
+            Some(item)
         })
         .filter(has_def_name)
         .filter(|it| match it {
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/base_db/src/input.rs b/crates/base_db/src/input.rs
index 9567bcc42..2dd8fbe67 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -190,10 +190,11 @@ pub struct CrateData {
     pub proc_macro: Vec<ProcMacro>,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Edition {
-    Edition2018,
     Edition2015,
+    Edition2018,
+    Edition2021,
 }
 
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
@@ -393,6 +394,7 @@ impl FromStr for Edition {
         let res = match s {
             "2015" => Edition::Edition2015,
             "2018" => Edition::Edition2018,
+            "2021" => Edition::Edition2021,
             _ => return Err(ParseEditionError { invalid_input: s.to_string() }),
         };
         Ok(res)
@@ -404,6 +406,7 @@ impl fmt::Display for Edition {
         f.write_str(match self {
             Edition::Edition2015 => "2015",
             Edition::Edition2018 => "2018",
+            Edition::Edition2021 => "2021",
         })
     }
 }
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 35e169a28..99a1bdd54 100644
--- a/crates/completion/Cargo.toml
+++ b/crates/completion/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-itertools = "0.9.0"
+itertools = "0.10.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 either = "1.6.1"
@@ -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.rs b/crates/completion/src/completions.rs
index d9fe13485..00c9e76f0 100644
--- a/crates/completion/src/completions.rs
+++ b/crates/completion/src/completions.rs
@@ -106,8 +106,9 @@ impl Completions {
         func: hir::Function,
         local_name: Option<String>,
     ) {
-        let item = render_fn(RenderContext::new(ctx), None, local_name, func);
-        self.add(item)
+        if let Some(item) = render_fn(RenderContext::new(ctx), None, local_name, func) {
+            self.add(item)
+        }
     }
 
     pub(crate) fn add_variant_pat(
diff --git a/crates/completion/src/completions/attribute.rs b/crates/completion/src/completions/attribute.rs
index 19ce2482f..e5522980d 100644
--- a/crates/completion/src/completions/attribute.rs
+++ b/crates/completion/src/completions/attribute.rs
@@ -5,7 +5,7 @@
 
 use itertools::Itertools;
 use rustc_hash::FxHashSet;
-use syntax::{ast, AstNode, SyntaxKind};
+use syntax::{ast, AstNode, T};
 
 use crate::{
     context::CompletionContext,
@@ -21,19 +21,16 @@ 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)) => {
+            let path = path.syntax().text();
+            if path == "derive" {
+                complete_derive(acc, ctx, token_tree)
+            } else if path == "feature" {
+                complete_lint(acc, ctx, token_tree, FEATURES)
+            } else if path == "allow" || path == "warn" || path == "deny" || path == "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 +51,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 +92,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 +115,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 +130,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"),
@@ -215,8 +205,7 @@ fn complete_lint(
 fn parse_comma_sep_input(derive_input: ast::TokenTree) -> Result<FxHashSet<String>, ()> {
     match (derive_input.left_delimiter_token(), derive_input.right_delimiter_token()) {
         (Some(left_paren), Some(right_paren))
-            if left_paren.kind() == SyntaxKind::L_PAREN
-                && right_paren.kind() == SyntaxKind::R_PAREN =>
+            if left_paren.kind() == T!['('] && right_paren.kind() == T![')'] =>
         {
             let mut input_derives = FxHashSet::default();
             let mut current_derive = String::new();
@@ -228,13 +217,13 @@ fn parse_comma_sep_input(derive_input: ast::TokenTree) -> Result<FxHashSet<Strin
                 .skip(1)
                 .take_while(|token| token != &right_paren)
             {
-                if SyntaxKind::COMMA == token.kind() {
+                if T![,] == token.kind() {
                     if !current_derive.is_empty() {
                         input_derives.insert(current_derive);
                         current_derive = String::new();
                     }
                 } else {
-                    current_derive.push_str(token.to_string().trim());
+                    current_derive.push_str(token.text().trim());
                 }
             }
 
@@ -417,7 +406,7 @@ mod tests {
     fn empty_derive_completion() {
         check(
             r#"
-#[derive(<|>)]
+#[derive($0)]
 struct Test {}
         "#,
             expect![[r#"
@@ -438,7 +427,7 @@ struct Test {}
     fn no_completion_for_incorrect_derive() {
         check(
             r#"
-#[derive{<|>)]
+#[derive{$0)]
 struct Test {}
 "#,
             expect![[r#""#]],
@@ -449,7 +438,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 +457,7 @@ struct Test {}
     #[test]
     fn test_attribute_completion() {
         check(
-            r#"#[<|>]"#,
+            r#"#[$0]"#,
             expect![[r#"
                 at allow(…)
                 at automatically_derived
@@ -476,7 +465,7 @@ struct Test {}
                 at cfg(…)
                 at cold
                 at deny(…)
-                at deprecated = "…"
+                at deprecated
                 at derive(…)
                 at export_name = "…"
                 at doc = "…"
@@ -488,7 +477,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 +485,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 +497,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 +512,7 @@ struct Test {}
                 at cold
                 at crate_name = ""
                 at deny(…)
-                at deprecated = "…"
+                at deprecated
                 at derive(…)
                 at export_name = "…"
                 at doc = "…"
@@ -537,7 +526,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 +540,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..d04eef65a 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#"
@@ -373,20 +373,20 @@ fn foo(a: A) {
     fn macro_expansion_resilient() {
         check(
             r#"
-macro_rules! dbg {
+macro_rules! d {
     () => {};
     ($val:expr) => {
         match $val { tmp => { tmp } }
     };
     // Trailing comma with single argument is ignored
-    ($val:expr,) => { $crate::dbg!($val) };
+    ($val:expr,) => { $crate::d!($val) };
     ($($val:expr),+ $(,)?) => {
-        ($($crate::dbg!($val)),+,)
+        ($($crate::d!($val)),+,)
     };
 }
 struct A { the_field: u32 }
 fn foo(a: A) {
-    dbg!(a.<|>)
+    d!(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..9c34ed0b6 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,
@@ -36,11 +35,14 @@ pub(crate) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
         None => return,
     };
 
+    let ref_removed_ty =
+        std::iter::successors(Some(receiver_ty.clone()), |ty| ty.remove_ref()).last().unwrap();
+
     let cap = match ctx.config.snippet_cap {
         Some(it) => it,
         None => return,
     };
-    let try_enum = TryEnum::from_ty(&ctx.sema, &receiver_ty);
+    let try_enum = TryEnum::from_ty(&ctx.sema, &ref_removed_ty);
     if let Some(try_enum) = &try_enum {
         match try_enum {
             TryEnum::Result => {
@@ -311,7 +313,7 @@ mod tests {
             r#"
 fn main() {
     let bar = true;
-    bar.<|>
+    bar.$0
 }
 "#,
             expect![[r#"
@@ -343,7 +345,7 @@ fn foo(elt: bool) -> bool {
 
 fn main() {
     let bar = true;
-    foo(bar.<|>)
+    foo(bar.$0)
 }
 "#,
             expect![[r#"
@@ -369,7 +371,7 @@ fn main() {
             r#"
 fn main() {
     let bar: u8 = 12;
-    bar.<|>
+    bar.$0
 }
 "#,
             expect![[r#"
@@ -393,7 +395,7 @@ fn main() {
         check(
             r#"
 fn main() {
-    baz.l<|>
+    baz.l$0
     res
 }
 "#,
@@ -425,7 +427,7 @@ enum Option<T> { Some(T), None }
 
 fn main() {
     let bar = Option::Some(true);
-    bar.<|>
+    bar.$0
 }
 "#,
             r#"
@@ -450,7 +452,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 
 fn main() {
     let bar = Result::Ok(true);
-    bar.<|>
+    bar.$0
 }
 "#,
             r#"
@@ -469,7 +471,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 +482,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 +497,68 @@ 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 }"#);
+        check_edit(
+            "ifl",
+            r#"
+enum Option<T> { Some(T), None }
+
+fn main() {
+    let bar = &Option::Some(true);
+    bar.$0
+}
+"#,
+            r#"
+enum Option<T> { Some(T), None }
+
+fn main() {
+    let bar = &Option::Some(true);
+    if let Some($1) = bar {
+    $0
+}
+}
+"#,
+        )
     }
 
     #[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 91bf4a8ad..bb6354ded 100644
--- a/crates/completion/src/completions/record.rs
+++ b/crates/completion/src/completions/record.rs
@@ -20,13 +20,17 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
 
             let missing_fields = ctx.sema.record_literal_missing_fields(record_lit);
             if impl_default_trait && !missing_fields.is_empty() {
+                let completion_text = "..Default::default()";
+                let completion_text = completion_text
+                    .strip_prefix(ctx.token.to_string().as_str())
+                    .unwrap_or(completion_text);
                 acc.add(
                     CompletionItem::new(
                         CompletionKind::Snippet,
                         ctx.source_range(),
                         "..Default::default()",
                     )
-                    .insert_text("..Default::default()")
+                    .insert_text(completion_text)
                     .kind(CompletionItemKind::Field)
                     .build(),
                 );
@@ -48,7 +52,10 @@ mod tests {
     use expect_test::{expect, Expect};
     use ide_db::helpers::FamousDefs;
 
-    use crate::{test_utils::completion_list, CompletionKind};
+    use crate::{
+        test_utils::{self, completion_list},
+        CompletionKind,
+    };
 
     fn check(ra_fixture: &str, expect: Expect) {
         let actual = completion_list(ra_fixture, CompletionKind::Reference);
@@ -63,6 +70,18 @@ mod tests {
         expect.assert_eq(&actual);
     }
 
+    fn check_edit(what: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
+        test_utils::check_edit(
+            what,
+            &format!(
+                "//- /main.rs crate:main deps:core{}\n{}",
+                ra_fixture_before,
+                FamousDefs::FIXTURE,
+            ),
+            &(ra_fixture_after.to_owned() + "\n"),
+        );
+    }
+
     #[test]
     fn test_record_literal_field_default() {
         let test_code = r#"
@@ -80,7 +99,7 @@ impl core::default::Default for S {
 fn process(f: S) {
     let other = S {
         foo: 5,
-        .<|>
+        .$0
     };
 }
 "#;
@@ -102,6 +121,51 @@ fn process(f: S) {
     }
 
     #[test]
+    fn test_record_literal_field_default_completion() {
+        check_edit(
+            "..Default::default()",
+            r#"
+struct S { foo: u32, bar: usize }
+
+impl core::default::Default for S {
+    fn default() -> Self {
+        S {
+            foo: 0,
+            bar: 0,
+        }
+    }
+}
+
+fn process(f: S) {
+    let other = S {
+        foo: 5,
+        .$0
+    };
+}
+"#,
+            r#"
+struct S { foo: u32, bar: usize }
+
+impl core::default::Default for S {
+    fn default() -> Self {
+        S {
+            foo: 0,
+            bar: 0,
+        }
+    }
+}
+
+fn process(f: S) {
+    let other = S {
+        foo: 5,
+        ..Default::default()
+    };
+}
+"#,
+        );
+    }
+
+    #[test]
     fn test_record_literal_field_without_default() {
         let test_code = r#"
 struct S { foo: u32, bar: usize }
@@ -109,7 +173,7 @@ struct S { foo: u32, bar: usize }
 fn process(f: S) {
     let other = S {
         foo: 5,
-        .<|>
+        .$0
     };
 }
 "#;
@@ -137,7 +201,7 @@ struct S { foo: u32 }
 
 fn process(f: S) {
     match f {
-        S { f<|>: 92 } => (),
+        S { f$0: 92 } => (),
     }
 }
 "#,
@@ -155,7 +219,7 @@ enum E { S { foo: u32, bar: () } }
 
 fn process(e: E) {
     match e {
-        E::S { <|> } => (),
+        E::S { $0 } => (),
     }
 }
 "#,
@@ -175,7 +239,7 @@ struct S { foo: u32 }
 
 fn process(f: S) {
     m!(match f {
-        S { f<|>: 92 } => (),
+        S { f$0: 92 } => (),
     })
 }
 ",
@@ -199,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#"
@@ -215,7 +279,7 @@ fn main() {
             r#"
 struct A { the_field: u32 }
 fn foo() {
-   A { the<|> }
+   A { the$0 }
 }
 "#,
             expect![[r#"
@@ -230,7 +294,7 @@ fn foo() {
             r#"
 enum E { A { a: u32 } }
 fn foo() {
-    let _ = E::A { <|> }
+    let _ = E::A { $0 }
 }
 "#,
             expect![[r#"
@@ -247,7 +311,7 @@ struct A { a: u32 }
 struct B { b: u32 }
 
 fn foo() {
-   let _: A = B { <|> }
+   let _: A = B { $0 }
 }
 "#,
             expect![[r#"
@@ -263,7 +327,7 @@ fn foo() {
 struct A<T> { a: T }
 
 fn foo() {
-   let _: A<u32> = A { <|> }
+   let _: A<u32> = A { $0 }
 }
 "#,
             expect![[r#"
@@ -279,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#"
@@ -299,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#"
@@ -317,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 c4e0d0669..135ae49dc 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 <|> }`
+        T![const] => 0,
+        // `impl .. { fn/type $0 }`
         // FN/TYPE_ALIAS  0
         //   FN_KW        <- *
-        SyntaxKind::FN_KW | SyntaxKind::TYPE_KW => 0,
-        // `impl .. { fn/type/const foo<|> }`
+        T![fn] | T![type] => 0,
+        // `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,8 +120,8 @@ 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 }`
-        _ if token.kind() == SyntaxKind::CONST_KW => ImplCompletionKind::Const,
+        // `impl ... { const $0 fn/type/const }`
+        _ if token.kind() == T![const] => ImplCompletionKind::Const,
         SyntaxKind::CONST | SyntaxKind::ERROR => ImplCompletionKind::Const,
         SyntaxKind::TYPE_ALIAS => ImplCompletionKind::TypeAlias,
         SyntaxKind::FN => ImplCompletionKind::Fn,
@@ -156,19 +156,21 @@ fn add_function_impl(
     };
     let range = TextRange::new(fn_def_node.text_range().start(), ctx.source_range().end());
 
-    let function_decl = function_declaration(&func.source(ctx.db).value);
-    match ctx.config.snippet_cap {
-        Some(cap) => {
-            let snippet = format!("{} {{\n    $0\n}}", function_decl);
-            builder.snippet_edit(cap, TextEdit::replace(range, snippet))
-        }
-        None => {
-            let header = format!("{} {{", function_decl);
-            builder.text_edit(TextEdit::replace(range, header))
+    if let Some(src) = func.source(ctx.db) {
+        let function_decl = function_declaration(&src.value);
+        match ctx.config.snippet_cap {
+            Some(cap) => {
+                let snippet = format!("{} {{\n    $0\n}}", function_decl);
+                builder.snippet_edit(cap, TextEdit::replace(range, snippet))
+            }
+            None => {
+                let header = format!("{} {{", function_decl);
+                builder.text_edit(TextEdit::replace(range, header))
+            }
         }
+        .kind(completion_kind)
+        .add_to(acc);
     }
-    .kind(completion_kind)
-    .add_to(acc);
 }
 
 fn add_type_alias_impl(
@@ -200,16 +202,19 @@ fn add_const_impl(
     let const_name = const_.name(ctx.db).map(|n| n.to_string());
 
     if let Some(const_name) = const_name {
-        let snippet = make_const_compl_syntax(&const_.source(ctx.db).value);
-
-        let range = TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());
-
-        CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
-            .text_edit(TextEdit::replace(range, snippet))
-            .lookup_by(const_name)
-            .kind(CompletionItemKind::Const)
-            .set_documentation(const_.docs(ctx.db))
-            .add_to(acc);
+        if let Some(source) = const_.source(ctx.db) {
+            let snippet = make_const_compl_syntax(&source.value);
+
+            let range =
+                TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());
+
+            CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
+                .text_edit(TextEdit::replace(range, snippet))
+                .lookup_by(const_name)
+                .kind(CompletionItemKind::Const)
+                .set_documentation(const_.docs(ctx.db))
+                .add_to(acc);
+        }
     }
 }
 
@@ -262,7 +267,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    t<|>
+    t$0
 }
 "#,
             expect![["
@@ -282,7 +287,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        t<|>
+        t$0
     }
 }
 ",
@@ -296,7 +301,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        fn t<|>
+        fn t$0
     }
 }
 ",
@@ -310,7 +315,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        fn <|>
+        fn $0
     }
 }
 ",
@@ -325,7 +330,7 @@ struct T;
 
 impl Test for T {
     fn test() {
-        foo.<|>
+        foo.$0
     }
 }
 ",
@@ -338,7 +343,7 @@ trait Test { fn test(_: i32); fn test2(); }
 struct T;
 
 impl Test for T {
-    fn test(t<|>)
+    fn test(t$0)
 }
 ",
             expect![[""]],
@@ -350,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![[""]],
@@ -365,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![[""]],
@@ -377,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![[""]],
@@ -389,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![[""]],
@@ -402,7 +407,7 @@ struct T;
 
 impl Test for T {
     const TEST: u32 = {
-        t<|>
+        t$0
     };
 }
 ",
@@ -416,7 +421,7 @@ struct T;
 
 impl Test for T {
     const TEST: u32 = {
-        fn <|>
+        fn $0
     };
 }
 ",
@@ -430,7 +435,7 @@ struct T;
 
 impl Test for T {
     const TEST: u32 = {
-        fn t<|>
+        fn t$0
     };
 }
 ",
@@ -446,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![[""]],
@@ -458,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![[""]],
@@ -476,7 +481,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    t<|>
+    t$0
 }
 "#,
             r#"
@@ -505,7 +510,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    fn t<|>
+    fn t$0
 }
 "#,
             r#"
@@ -535,7 +540,7 @@ struct T;
 
 impl Test for T {
     fn foo() {}
-    fn f<|>
+    fn f$0
 }
 "#,
             expect![[r#"
@@ -555,7 +560,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    fn f<|>
+    fn f$0
 }
 "#,
             r#"
@@ -580,7 +585,7 @@ trait Test {
 struct T;
 
 impl Test for T {
-    fn f<|>
+    fn f$0
 }
 "#,
             r#"
@@ -609,7 +614,7 @@ trait Test {
 }
 
 impl Test for () {
-    type S<|>
+    type S$0
 }
 "#,
             "
@@ -634,7 +639,7 @@ trait Test {
 }
 
 impl Test for () {
-    const S<|>
+    const S$0
 }
 "#,
             "
@@ -656,7 +661,7 @@ trait Test {
 }
 
 impl Test for () {
-    const S<|>
+    const S$0
 }
 "#,
             "
@@ -719,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() {}",
@@ -728,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..f3ce91dd1 100644
--- a/crates/completion/src/patterns.rs
+++ b/crates/completion/src/patterns.rs
@@ -5,7 +5,7 @@ use syntax::{
     ast::{self, LoopBodyOwner},
     match_ast, AstNode, Direction, NodeOrToken, SyntaxElement,
     SyntaxKind::*,
-    SyntaxNode, SyntaxToken,
+    SyntaxNode, SyntaxToken, T,
 };
 
 #[cfg(test)]
@@ -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,26 +112,26 @@ 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 {
     element
         .into_token()
         .and_then(|it| previous_non_trivia_token(it))
-        .filter(|it| it.kind() == UNSAFE_KW)
+        .filter(|it| it.kind() == T![unsafe])
         .is_some()
 }
 #[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 {
     element
         .into_token()
         .and_then(|it| previous_non_trivia_token(it))
-        .filter(|it| it.kind() == IF_KW)
+        .filter(|it| it.kind() == T![if])
         .is_some()
 }
 
@@ -139,32 +139,32 @@ pub(crate) fn fn_is_prev(element: SyntaxElement) -> bool {
     element
         .into_token()
         .and_then(|it| previous_non_trivia_token(it))
-        .filter(|it| it.kind() == FN_KW)
+        .filter(|it| it.kind() == T![fn])
         .is_some()
 }
 #[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()
         .and_then(|it| previous_non_trivia_token(it))
         .and_then(|it| previous_non_trivia_token(it))
-        .filter(|it| it.kind() == FOR_KW)
+        .filter(|it| it.kind() == T![for])
         .is_some()
 }
 #[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 1ba7201a1..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};
@@ -157,8 +157,7 @@ impl<'a> Render<'a> {
 
         let kind = match resolution {
             ScopeDef::ModuleDef(Function(func)) => {
-                let item = render_fn(self.ctx, import_to_add, Some(local_name), *func);
-                return Some(item);
+                return render_fn(self.ctx, import_to_add, Some(local_name), *func);
             }
             ScopeDef::ModuleDef(Variant(_))
                 if self.ctx.completion.is_pat_binding_or_const
@@ -321,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) {
@@ -339,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()
@@ -359,7 +358,7 @@ mod tests {
             r#"
 enum Foo { Foo { x: i32, y: i32 } }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -382,7 +381,7 @@ fn main() { Foo::Fo<|> }
             r#"
 enum Foo { Foo (i32, i32) }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -407,7 +406,7 @@ fn main() { Foo::Fo<|> }
             r#"
 enum Foo { Foo }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -431,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#"
                 [
@@ -484,7 +483,7 @@ fn something_deprecated() {}
 #[deprecated(since = "1.0.0")]
 fn something_else_deprecated() {}
 
-fn main() { som<|> }
+fn main() { som$0 }
 "#,
             expect![[r#"
                 [
@@ -524,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#"
                 [
@@ -552,7 +551,7 @@ struct S {
 }
 impl S {
     /// Method docs
-    fn bar(self) { self.<|> }
+    fn bar(self) { self.$0 }
 }"#,
             expect![[r#"
                 [
@@ -585,7 +584,7 @@ impl S {
 
         check(
             r#"
-use self::my<|>;
+use self::my$0;
 
 /// mod docs
 mod my { }
@@ -644,7 +643,7 @@ impl S {
     #[inline]
     fn the_method(&self) { }
 }
-fn foo(s: S) { s.<|> }
+fn foo(s: S) { s.$0 }
 "#,
             expect![[r#"
                 [
@@ -672,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#"
@@ -693,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() {} }
@@ -708,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) {}
@@ -720,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;
@@ -737,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> {}
@@ -748,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,);
@@ -759,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> {}
@@ -770,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> {}
@@ -786,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]
@@ -803,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]
@@ -820,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]
@@ -833,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]
@@ -848,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]
@@ -863,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/const_.rs b/crates/completion/src/render/const_.rs
index 039bdabc0..ce924f309 100644
--- a/crates/completion/src/render/const_.rs
+++ b/crates/completion/src/render/const_.rs
@@ -15,7 +15,7 @@ pub(crate) fn render_const<'a>(
     ctx: RenderContext<'a>,
     const_: hir::Const,
 ) -> Option<CompletionItem> {
-    ConstRender::new(ctx, const_).render()
+    ConstRender::new(ctx, const_)?.render()
 }
 
 #[derive(Debug)]
@@ -26,9 +26,9 @@ struct ConstRender<'a> {
 }
 
 impl<'a> ConstRender<'a> {
-    fn new(ctx: RenderContext<'a>, const_: hir::Const) -> ConstRender<'a> {
-        let ast_node = const_.source(ctx.db()).value;
-        ConstRender { ctx, const_, ast_node }
+    fn new(ctx: RenderContext<'a>, const_: hir::Const) -> Option<ConstRender<'a>> {
+        let ast_node = const_.source(ctx.db())?.value;
+        Some(ConstRender { ctx, const_, ast_node })
     }
 
     fn render(self) -> Option<CompletionItem> {
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 316e05b52..f5b0ce3e3 100644
--- a/crates/completion/src/render/function.rs
+++ b/crates/completion/src/render/function.rs
@@ -14,9 +14,9 @@ pub(crate) fn render_fn<'a>(
     import_to_add: Option<ImportEdit>,
     local_name: Option<String>,
     fn_: hir::Function,
-) -> CompletionItem {
+) -> Option<CompletionItem> {
     let _p = profile::span("render_fn");
-    FunctionRender::new(ctx, local_name, fn_).render(import_to_add)
+    Some(FunctionRender::new(ctx, local_name, fn_)?.render(import_to_add))
 }
 
 #[derive(Debug)]
@@ -32,11 +32,11 @@ impl<'a> FunctionRender<'a> {
         ctx: RenderContext<'a>,
         local_name: Option<String>,
         fn_: hir::Function,
-    ) -> FunctionRender<'a> {
+    ) -> Option<FunctionRender<'a>> {
         let name = local_name.unwrap_or_else(|| fn_.name(ctx.db()).to_string());
-        let ast_node = fn_.source(ctx.db()).value;
+        let ast_node = fn_.source(ctx.db())?.value;
 
-        FunctionRender { ctx, name, func: fn_, ast_node }
+        Some(FunctionRender { ctx, name, func: fn_, ast_node })
     }
 
     fn render(self, import_to_add: Option<ImportEdit>) -> CompletionItem {
@@ -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 dac79592f..f893e420a 100644
--- a/crates/completion/src/render/macro_.rs
+++ b/crates/completion/src/render/macro_.rs
@@ -39,20 +39,13 @@ impl<'a> MacroRender<'a> {
     }
 
     fn render(&self, import_to_add: Option<ImportEdit>) -> Option<CompletionItem> {
-        // FIXME: Currently proc-macro do not have ast-node,
-        // such that it does not have source
-        // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
-        if self.macro_.is_proc_macro() {
-            return None;
-        }
-
         let mut builder =
             CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), &self.label())
                 .kind(CompletionItemKind::Macro)
                 .set_documentation(self.docs.clone())
                 .set_deprecated(self.ctx.is_deprecated(self.macro_))
                 .add_import(import_to_add)
-                .detail(self.detail());
+                .set_detail(self.detail());
 
         let needs_bang = self.needs_bang();
         builder = match self.ctx.snippet_cap() {
@@ -95,9 +88,9 @@ impl<'a> MacroRender<'a> {
         format!("{}!", self.name)
     }
 
-    fn detail(&self) -> String {
-        let ast_node = self.macro_.source(self.ctx.db()).value;
-        macro_label(&ast_node)
+    fn detail(&self) -> Option<String> {
+        let ast_node = self.macro_.source(self.ctx.db())?.value;
+        Some(macro_label(&ast_node))
     }
 }
 
@@ -142,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 { () => () }
@@ -156,7 +149,7 @@ use foo::frobnicate;
             "frobnicate!",
             r#"
 macro_rules! frobnicate { () => () }
-fn main() { frob<|>!(); }
+fn main() { frob$0!(); }
 "#,
             r#"
 macro_rules! frobnicate { () => () }
@@ -180,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.
@@ -205,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/render/type_alias.rs b/crates/completion/src/render/type_alias.rs
index 9605c7fa9..69b445b9c 100644
--- a/crates/completion/src/render/type_alias.rs
+++ b/crates/completion/src/render/type_alias.rs
@@ -15,7 +15,7 @@ pub(crate) fn render_type_alias<'a>(
     ctx: RenderContext<'a>,
     type_alias: hir::TypeAlias,
 ) -> Option<CompletionItem> {
-    TypeAliasRender::new(ctx, type_alias).render()
+    TypeAliasRender::new(ctx, type_alias)?.render()
 }
 
 #[derive(Debug)]
@@ -26,9 +26,9 @@ struct TypeAliasRender<'a> {
 }
 
 impl<'a> TypeAliasRender<'a> {
-    fn new(ctx: RenderContext<'a>, type_alias: hir::TypeAlias) -> TypeAliasRender<'a> {
-        let ast_node = type_alias.source(ctx.db()).value;
-        TypeAliasRender { ctx, type_alias, ast_node }
+    fn new(ctx: RenderContext<'a>, type_alias: hir::TypeAlias) -> Option<TypeAliasRender<'a>> {
+        let ast_node = type_alias.source(ctx.db())?.value;
+        Some(TypeAliasRender { ctx, type_alias, ast_node })
     }
 
     fn render(self) -> Option<CompletionItem> {
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..1d19c7886 100644
--- a/crates/flycheck/Cargo.toml
+++ b/crates/flycheck/Cargo.toml
@@ -12,8 +12,9 @@ doctest = false
 [dependencies]
 crossbeam-channel = "0.5.0"
 log = "0.4.8"
-cargo_metadata = "=0.12.0"
+cargo_metadata = "0.12.2"
 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/Cargo.toml b/crates/hir/Cargo.toml
index 6dc5ad63b..d4ea7327e 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -14,7 +14,7 @@ log = "0.4.8"
 rustc-hash = "1.1.0"
 either = "1.5.3"
 arrayvec = "0.5.1"
-itertools = "0.9.0"
+itertools = "0.10.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
diff --git a/crates/hir/src/attrs.rs b/crates/hir/src/attrs.rs
index d32ce37ed..99fb65bac 100644
--- a/crates/hir/src/attrs.rs
+++ b/crates/hir/src/attrs.rs
@@ -3,15 +3,15 @@ use hir_def::{
     attr::{Attrs, Documentation},
     path::ModPath,
     resolver::HasResolver,
-    AttrDefId, ModuleDefId,
+    AttrDefId, GenericParamId, ModuleDefId,
 };
 use hir_expand::hygiene::Hygiene;
 use hir_ty::db::HirDatabase;
 use syntax::ast;
 
 use crate::{
-    Adt, Const, Enum, Field, Function, MacroDef, Module, ModuleDef, Static, Struct, Trait,
-    TypeAlias, Union, Variant,
+    Adt, Const, ConstParam, Enum, Field, Function, GenericParam, LifetimeParam, MacroDef, Module,
+    ModuleDef, Static, Struct, Trait, TypeAlias, TypeParam, Union, Variant,
 };
 
 pub trait HasAttrs {
@@ -62,25 +62,27 @@ impl_has_attrs![
     (Function, FunctionId),
     (Adt, AdtId),
     (Module, ModuleId),
+    (GenericParam, GenericParamId),
 ];
 
-macro_rules! impl_has_attrs_adt {
-    ($($adt:ident),*) => {$(
-        impl HasAttrs for $adt {
+macro_rules! impl_has_attrs_enum {
+    ($($variant:ident),* for $enum:ident) => {$(
+        impl HasAttrs for $variant {
             fn attrs(self, db: &dyn HirDatabase) -> Attrs {
-                Adt::$adt(self).attrs(db)
+                $enum::$variant(self).attrs(db)
             }
             fn docs(self, db: &dyn HirDatabase) -> Option<Documentation> {
-                Adt::$adt(self).docs(db)
+                $enum::$variant(self).docs(db)
             }
             fn resolve_doc_path(self, db: &dyn HirDatabase, link: &str, ns: Option<Namespace>) -> Option<ModuleDef> {
-                Adt::$adt(self).resolve_doc_path(db, link, ns)
+                $enum::$variant(self).resolve_doc_path(db, link, ns)
             }
         }
     )*};
 }
 
-impl_has_attrs_adt![Struct, Union, Enum];
+impl_has_attrs_enum![Struct, Union, Enum for Adt];
+impl_has_attrs_enum![TypeParam, ConstParam, LifetimeParam for GenericParam];
 
 fn resolve_doc_path(
     db: &dyn HirDatabase,
@@ -99,6 +101,12 @@ fn resolve_doc_path(
         AttrDefId::TraitId(it) => it.resolver(db.upcast()),
         AttrDefId::TypeAliasId(it) => it.resolver(db.upcast()),
         AttrDefId::ImplId(it) => it.resolver(db.upcast()),
+        AttrDefId::GenericParamId(it) => match it {
+            GenericParamId::TypeParamId(it) => it.parent,
+            GenericParamId::LifetimeParamId(it) => it.parent,
+            GenericParamId::ConstParamId(it) => it.parent,
+        }
+        .resolver(db.upcast()),
         AttrDefId::MacroDefId(_) => return None,
     };
     let path = ast::Path::parse(link).ok()?;
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs
index b7ded3478..6cbf5cecf 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,
@@ -18,10 +16,10 @@ use hir_def::{
     resolver::{HasResolver, Resolver},
     src::HasSource as _,
     type_ref::{Mutability, TypeRef},
-    AdtId, AssocContainerId, AssocItemId, AssocItemLoc, AttrDefId, ConstId, DefWithBodyId, EnumId,
-    FunctionId, GenericDefId, HasModule, ImplId, LifetimeParamId, LocalEnumVariantId, LocalFieldId,
-    LocalModuleId, Lookup, ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId,
-    UnionId,
+    AdtId, AssocContainerId, AssocItemId, AssocItemLoc, AttrDefId, ConstId, ConstParamId,
+    DefWithBodyId, EnumId, FunctionId, GenericDefId, HasModule, ImplId, LifetimeParamId,
+    LocalEnumVariantId, LocalFieldId, LocalModuleId, Lookup, ModuleId, StaticId, StructId, TraitId,
+    TypeAliasId, TypeParamId, UnionId,
 };
 use hir_def::{find_path::PrefixKind, item_scope::ItemInNs, visibility::Visibility};
 use hir_expand::{
@@ -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,
@@ -39,7 +37,7 @@ use hir_ty::{
     TyDefId, TyKind, TypeCtor,
 };
 use rustc_hash::FxHashSet;
-use stdx::impl_from;
+use stdx::{format_to, impl_from};
 use syntax::{
     ast::{self, AttrsOwner, NameOwner},
     AstNode, SmolStr,
@@ -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;
@@ -797,6 +807,19 @@ impl Function {
     pub fn has_body(self, db: &dyn HirDatabase) -> bool {
         db.function_data(self.id).has_body
     }
+
+    /// A textual representation of the HIR of this function for debugging purposes.
+    pub fn debug_hir(self, db: &dyn HirDatabase) -> String {
+        let body = db.body(self.id.into());
+
+        let mut result = String::new();
+        format_to!(result, "HIR expressions in the body of `{}`:\n", self.name(db));
+        for (id, expr) in body.exprs.iter() {
+            format_to!(result, "{:?}: {:?}\n", id, expr);
+        }
+
+        result
+    }
 }
 
 // Note: logically, this belongs to `hir_ty`, but we are not using it there yet.
@@ -983,13 +1006,7 @@ impl MacroDef {
 
     /// XXX: this parses the file
     pub fn name(self, db: &dyn HirDatabase) -> Option<Name> {
-        // FIXME: Currently proc-macro do not have ast-node,
-        // such that it does not have source
-        // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
-        if self.is_proc_macro() {
-            return None;
-        }
-        self.source(db).value.name().map(|it| it.as_name())
+        self.source(db)?.value.name().map(|it| it.as_name())
     }
 
     /// Indicate it is a proc-macro
@@ -1125,7 +1142,12 @@ impl GenericDef {
                 id: LifetimeParamId { parent: self.into(), local_id },
             })
             .map(GenericParam::LifetimeParam);
-        ty_params.chain(lt_params).collect()
+        let const_params = generics
+            .consts
+            .iter()
+            .map(|(local_id, _)| ConstParam { id: ConstParamId { parent: self.into(), local_id } })
+            .map(GenericParam::ConstParam);
+        ty_params.chain(lt_params).chain(const_params).collect()
     }
 
     pub fn type_params(self, db: &dyn HirDatabase) -> Vec<TypeParam> {
@@ -1237,8 +1259,27 @@ impl Label {
 pub enum GenericParam {
     TypeParam(TypeParam),
     LifetimeParam(LifetimeParam),
+    ConstParam(ConstParam),
+}
+impl_from!(TypeParam, LifetimeParam, ConstParam for GenericParam);
+
+impl GenericParam {
+    pub fn module(self, db: &dyn HirDatabase) -> Module {
+        match self {
+            GenericParam::TypeParam(it) => it.module(db),
+            GenericParam::LifetimeParam(it) => it.module(db),
+            GenericParam::ConstParam(it) => it.module(db),
+        }
+    }
+
+    pub fn name(self, db: &dyn HirDatabase) -> Name {
+        match self {
+            GenericParam::TypeParam(it) => it.name(db),
+            GenericParam::LifetimeParam(it) => it.name(db),
+            GenericParam::ConstParam(it) => it.name(db),
+        }
+    }
 }
-impl_from!(TypeParam, LifetimeParam for GenericParam);
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct TypeParam {
@@ -1265,6 +1306,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)?;
@@ -1280,6 +1333,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,
@@ -1300,6 +1367,32 @@ impl LifetimeParam {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct ConstParam {
+    pub(crate) id: ConstParamId,
+}
+
+impl ConstParam {
+    pub fn name(self, db: &dyn HirDatabase) -> Name {
+        let params = db.generic_params(self.id.parent);
+        params.consts[self.id.local_id].name.clone()
+    }
+
+    pub fn module(self, db: &dyn HirDatabase) -> Module {
+        self.id.parent.module(db.upcast()).into()
+    }
+
+    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)]
 pub struct Impl {
     pub(crate) id: ImplId,
@@ -1352,7 +1445,7 @@ impl Impl {
     }
 
     pub fn is_builtin_derive(self, db: &dyn HirDatabase) -> Option<InFile<ast::Attr>> {
-        let src = self.source(db);
+        let src = self.source(db)?;
         let item = src.file_id.is_builtin_derive(db.upcast())?;
         let hygenic = hir_expand::hygiene::Hygiene::new(db.upcast(), item.file_id);
 
@@ -1567,9 +1660,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/db.rs b/crates/hir/src/db.rs
index d01e1b33d..d5d4cf5b6 100644
--- a/crates/hir/src/db.rs
+++ b/crates/hir/src/db.rs
@@ -10,8 +10,8 @@ pub use hir_def::db::{
     TypeAliasDataQuery, UnionDataQuery,
 };
 pub use hir_expand::db::{
-    AstDatabase, AstDatabaseStorage, AstIdMapQuery, InternEagerExpansionQuery, InternMacroQuery,
-    MacroArgTextQuery, MacroDefQuery, MacroExpandQuery, ParseMacroExpansionQuery,
+    AstDatabase, AstDatabaseStorage, AstIdMapQuery, HygieneFrameQuery, InternEagerExpansionQuery,
+    InternMacroQuery, MacroArgTextQuery, MacroDefQuery, MacroExpandQuery, ParseMacroExpansionQuery,
 };
 pub use hir_ty::db::*;
 
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/src/from_id.rs b/crates/hir/src/from_id.rs
index a0792b9a6..c8c5fecd7 100644
--- a/crates/hir/src/from_id.rs
+++ b/crates/hir/src/from_id.rs
@@ -1,18 +1,18 @@
 //! Utility module for converting between hir_def ids and code_model wrappers.
 //!
-//! It's unclear if we need this long-term, but it's definitelly useful while we
+//! It's unclear if we need this long-term, but it's definitely useful while we
 //! are splitting the hir.
 
 use hir_def::{
     expr::{LabelId, PatId},
     item_scope::ItemInNs,
-    AdtId, AssocItemId, DefWithBodyId, EnumVariantId, FieldId, GenericDefId, ModuleDefId,
-    VariantId,
+    AdtId, AssocItemId, DefWithBodyId, EnumVariantId, FieldId, GenericDefId, GenericParamId,
+    ModuleDefId, VariantId,
 };
 
 use crate::{
-    Adt, AssocItem, DefWithBody, Field, GenericDef, Label, Local, MacroDef, ModuleDef, Variant,
-    VariantDef,
+    code_model::GenericParam, Adt, AssocItem, DefWithBody, Field, GenericDef, Label, Local,
+    MacroDef, ModuleDef, Variant, VariantDef,
 };
 
 macro_rules! from_id {
@@ -44,6 +44,7 @@ from_id![
     (hir_def::ImplId, crate::Impl),
     (hir_def::TypeParamId, crate::TypeParam),
     (hir_def::LifetimeParamId, crate::LifetimeParam),
+    (hir_def::ConstParamId, crate::ConstParam),
     (hir_expand::MacroDefId, crate::MacroDef)
 ];
 
@@ -67,6 +68,26 @@ impl From<Adt> for AdtId {
     }
 }
 
+impl From<GenericParamId> for GenericParam {
+    fn from(id: GenericParamId) -> Self {
+        match id {
+            GenericParamId::TypeParamId(it) => GenericParam::TypeParam(it.into()),
+            GenericParamId::LifetimeParamId(it) => GenericParam::LifetimeParam(it.into()),
+            GenericParamId::ConstParamId(it) => GenericParam::ConstParam(it.into()),
+        }
+    }
+}
+
+impl From<GenericParam> for GenericParamId {
+    fn from(id: GenericParam) -> Self {
+        match id {
+            GenericParam::TypeParam(it) => GenericParamId::TypeParamId(it.id),
+            GenericParam::LifetimeParam(it) => GenericParamId::LifetimeParamId(it.id),
+            GenericParam::ConstParam(it) => GenericParamId::ConstParamId(it.id),
+        }
+    }
+}
+
 impl From<EnumVariantId> for Variant {
     fn from(id: EnumVariantId) -> Self {
         Variant { parent: id.parent.into(), id: id.local_id }
diff --git a/crates/hir/src/has_source.rs b/crates/hir/src/has_source.rs
index 0dc07c33e..7c57d8378 100644
--- a/crates/hir/src/has_source.rs
+++ b/crates/hir/src/has_source.rs
@@ -10,13 +10,13 @@ use hir_expand::InFile;
 use syntax::ast;
 
 use crate::{
-    db::HirDatabase, Const, Enum, Field, FieldSource, Function, Impl, LifetimeParam, MacroDef,
-    Module, Static, Struct, Trait, TypeAlias, TypeParam, Union, Variant,
+    db::HirDatabase, Const, ConstParam, Enum, Field, FieldSource, Function, Impl, LifetimeParam,
+    MacroDef, Module, Static, Struct, Trait, TypeAlias, TypeParam, Union, Variant,
 };
 
 pub trait HasSource {
     type Ast;
-    fn source(self, db: &dyn HirDatabase) -> InFile<Self::Ast>;
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>>;
 }
 
 /// NB: Module is !HasSource, because it has two source nodes at the same time:
@@ -46,97 +46,104 @@ impl Module {
 
 impl HasSource for Field {
     type Ast = FieldSource;
-    fn source(self, db: &dyn HirDatabase) -> InFile<FieldSource> {
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
         let var = VariantId::from(self.parent);
         let src = var.child_source(db.upcast());
-        src.map(|it| match it[self.id].clone() {
+        let field_source = src.map(|it| match it[self.id].clone() {
             Either::Left(it) => FieldSource::Pos(it),
             Either::Right(it) => FieldSource::Named(it),
-        })
+        });
+        Some(field_source)
     }
 }
 impl HasSource for Struct {
     type Ast = ast::Struct;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Struct> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for Union {
     type Ast = ast::Union;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Union> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for Enum {
     type Ast = ast::Enum;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Enum> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for Variant {
     type Ast = ast::Variant;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Variant> {
-        self.parent.id.child_source(db.upcast()).map(|map| map[self.id].clone())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<ast::Variant>> {
+        Some(self.parent.id.child_source(db.upcast()).map(|map| map[self.id].clone()))
     }
 }
 impl HasSource for Function {
     type Ast = ast::Fn;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Fn> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for Const {
     type Ast = ast::Const;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Const> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for Static {
     type Ast = ast::Static;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Static> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for Trait {
     type Ast = ast::Trait;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Trait> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for TypeAlias {
     type Ast = ast::TypeAlias;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::TypeAlias> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 impl HasSource for MacroDef {
     type Ast = ast::Macro;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Macro> {
-        InFile {
-            file_id: self.id.ast_id.expect("MacroDef without ast_id").file_id,
-            value: self.id.ast_id.expect("MacroDef without ast_id").to_node(db.upcast()),
-        }
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        let ast_id = self.id.ast_id?;
+        Some(InFile { file_id: ast_id.file_id, value: ast_id.to_node(db.upcast()) })
     }
 }
 impl HasSource for Impl {
     type Ast = ast::Impl;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Impl> {
-        self.id.lookup(db.upcast()).source(db.upcast())
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        Some(self.id.lookup(db.upcast()).source(db.upcast()))
     }
 }
 
 impl HasSource for TypeParam {
     type Ast = Either<ast::Trait, ast::TypeParam>;
-    fn source(self, db: &dyn HirDatabase) -> InFile<Self::Ast> {
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
         let child_source = self.id.parent.child_source(db.upcast());
-        child_source.map(|it| it[self.id.local_id].clone())
+        Some(child_source.map(|it| it[self.id.local_id].clone()))
     }
 }
 
 impl HasSource for LifetimeParam {
     type Ast = ast::LifetimeParam;
-    fn source(self, db: &dyn HirDatabase) -> InFile<Self::Ast> {
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
+        let child_source = self.id.parent.child_source(db.upcast());
+        Some(child_source.map(|it| it[self.id.local_id].clone()))
+    }
+}
+
+impl HasSource for ConstParam {
+    type Ast = ast::ConstParam;
+    fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
         let child_source = self.id.parent.child_source(db.upcast());
-        child_source.map(|it| it[self.id.local_id].clone())
+        Some(child_source.map(|it| it[self.id.local_id].clone()))
     }
 }
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 7ac9fd507..769945c47 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -34,9 +34,10 @@ pub use crate::{
     attrs::{HasAttrs, Namespace},
     code_model::{
         Access, Adt, AsAssocItem, AssocItem, AssocItemContainer, Callable, CallableKind, Const,
-        Crate, CrateDependency, DefWithBody, Enum, Field, FieldSource, Function, GenericDef,
-        HasVisibility, Impl, Label, LifetimeParam, Local, MacroDef, Module, ModuleDef, ScopeDef,
-        Static, Struct, Trait, Type, TypeAlias, TypeParam, Union, Variant, VariantDef,
+        ConstParam, Crate, CrateDependency, DefWithBody, Enum, Field, FieldSource, Function,
+        GenericDef, GenericParam, HasVisibility, Impl, Label, LifetimeParam, Local, MacroDef,
+        Module, ModuleDef, ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, Union,
+        Variant, VariantDef,
     },
     has_source::HasSource,
     semantics::{PathResolution, Semantics, SemanticsScope},
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 67cd16e31..cd689c869 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -25,9 +25,9 @@ use crate::{
     diagnostics::Diagnostic,
     semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
     source_analyzer::{resolve_hir_path, SourceAnalyzer},
-    AssocItem, Callable, Crate, Field, Function, HirFileId, Impl, InFile, Label, LifetimeParam,
-    Local, MacroDef, Module, ModuleDef, Name, Path, ScopeDef, Trait, Type, TypeAlias, TypeParam,
-    VariantDef,
+    AssocItem, Callable, ConstParam, Crate, Field, Function, HirFileId, Impl, InFile, Label,
+    LifetimeParam, Local, MacroDef, Module, ModuleDef, Name, Path, ScopeDef, Trait, Type,
+    TypeAlias, TypeParam, VariantDef,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -38,6 +38,7 @@ pub enum PathResolution {
     Local(Local),
     /// A generic parameter
     TypeParam(TypeParam),
+    ConstParam(ConstParam),
     SelfType(Impl),
     Macro(MacroDef),
     AssocItem(AssocItem),
@@ -59,7 +60,9 @@ impl PathResolution {
             PathResolution::Def(ModuleDef::TypeAlias(alias)) => {
                 Some(TypeNs::TypeAliasId((*alias).into()))
             }
-            PathResolution::Local(_) | PathResolution::Macro(_) => None,
+            PathResolution::Local(_) | PathResolution::Macro(_) | PathResolution::ConstParam(_) => {
+                None
+            }
             PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())),
             PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())),
             PathResolution::AssocItem(AssocItem::Const(_))
@@ -744,6 +747,7 @@ to_def_impls![
     (crate::Variant, ast::Variant, enum_variant_to_def),
     (crate::TypeParam, ast::TypeParam, type_param_to_def),
     (crate::LifetimeParam, ast::LifetimeParam, lifetime_param_to_def),
+    (crate::ConstParam, ast::ConstParam, const_param_to_def),
     (crate::MacroDef, ast::MacroRules, macro_rules_to_def),
     (crate::Local, ast::IdentPat, bind_pat_to_def),
     (crate::Label, ast::Label, label_to_def),
diff --git a/crates/hir/src/semantics/source_to_def.rs b/crates/hir/src/semantics/source_to_def.rs
index 424e6e8a9..4b9ebff72 100644
--- a/crates/hir/src/semantics/source_to_def.rs
+++ b/crates/hir/src/semantics/source_to_def.rs
@@ -6,9 +6,9 @@ use hir_def::{
     dyn_map::DynMap,
     expr::{LabelId, PatId},
     keys::{self, Key},
-    ConstId, DefWithBodyId, EnumId, EnumVariantId, FieldId, FunctionId, GenericDefId, ImplId,
-    LifetimeParamId, ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId,
-    VariantId,
+    ConstId, ConstParamId, DefWithBodyId, EnumId, EnumVariantId, FieldId, FunctionId, GenericDefId,
+    ImplId, LifetimeParamId, ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId,
+    UnionId, VariantId,
 };
 use hir_expand::{name::AsName, AstId, MacroDefKind};
 use rustc_hash::FxHashMap;
@@ -157,6 +157,18 @@ impl SourceToDefCtx<'_, '_> {
         dyn_map[keys::LIFETIME_PARAM].get(&src).copied()
     }
 
+    pub(super) fn const_param_to_def(
+        &mut self,
+        src: InFile<ast::ConstParam>,
+    ) -> Option<ConstParamId> {
+        let container: ChildContainer =
+            self.find_generic_param_container(src.as_ref().map(|it| it.syntax()))?.into();
+        let db = self.db;
+        let dyn_map =
+            &*self.cache.entry(container).or_insert_with(|| container.child_by_source(db));
+        dyn_map[keys::CONST_PARAM].get(&src).copied()
+    }
+
     // FIXME: use DynMap as well?
     pub(super) fn macro_rules_to_def(
         &mut self,
diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs
index bddc49c05..30a8e513d 100644
--- a/crates/hir/src/source_analyzer.rs
+++ b/crates/hir/src/source_analyzer.rs
@@ -479,6 +479,7 @@ pub(crate) fn resolve_hir_path(
                 ValueNs::StructId(it) => PathResolution::Def(Struct::from(it).into()),
                 ValueNs::EnumVariantId(it) => PathResolution::Def(Variant::from(it).into()),
                 ValueNs::ImplSelf(impl_id) => PathResolution::SelfType(impl_id.into()),
+                ValueNs::GenericParam(it) => PathResolution::ConstParam(it.into()),
             };
             Some(res)
         });
diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
index a88b5f57e..7ef966cd2 100644
--- a/crates/hir_def/Cargo.toml
+++ b/crates/hir_def/Cargo.toml
@@ -17,7 +17,7 @@ either = "1.5.3"
 anymap = "0.12.1"
 drop_bomb = "0.1.4"
 fst = { version = "0.4", default-features = false }
-itertools = "0.9.0"
+itertools = "0.10.0"
 indexmap = "1.4.0"
 smallvec = "1.4.0"
 
@@ -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 042e119b1..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, 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),
@@ -235,11 +231,70 @@ impl Attrs {
             AttrDefId::StaticId(it) => attrs_from_item_tree(it.lookup(db).id, db),
             AttrDefId::FunctionId(it) => attrs_from_item_tree(it.lookup(db).id, db),
             AttrDefId::TypeAliasId(it) => attrs_from_item_tree(it.lookup(db).id, db),
+            AttrDefId::GenericParamId(it) => match it {
+                GenericParamId::TypeParamId(it) => {
+                    let src = it.parent.child_source(db);
+                    RawAttrs::from_attrs_owner(
+                        db,
+                        src.with_value(
+                            src.value[it.local_id].as_ref().either(|it| it as _, |it| it as _),
+                        ),
+                    )
+                }
+                GenericParamId::LifetimeParamId(it) => {
+                    let src = it.parent.child_source(db);
+                    RawAttrs::from_attrs_owner(db, src.with_value(&src.value[it.local_id]))
+                }
+                GenericParamId::ConstParamId(it) => {
+                    let src = it.parent.child_source(db);
+                    RawAttrs::from_attrs_owner(db, src.with_value(&src.value[it.local_id]))
+                }
+            },
         };
 
         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 }
     }
@@ -260,14 +315,13 @@ impl Attrs {
     }
 
     pub fn docs(&self) -> Option<Documentation> {
-        let docs = self
-            .by_key("doc")
-            .attrs()
-            .flat_map(|attr| match attr.input.as_ref()? {
-                AttrInput::Literal(s) => Some(s),
-                AttrInput::TokenTree(_) => None,
-            })
-            .intersperse(&SmolStr::new_inline("\n"))
+        let docs = self.by_key("doc").attrs().flat_map(|attr| match attr.input.as_ref()? {
+            AttrInput::Literal(s) => Some(s),
+            AttrInput::TokenTree(_) => None,
+        });
+        // FIXME: Replace `Itertools::intersperse` with `Iterator::intersperse[_with]` until the
+        // libstd api gets stabilized (https://github.com/rust-lang/rust/issues/79524).
+        let docs = Itertools::intersperse(docs, &SmolStr::new_inline("\n"))
             .map(|it| it.as_str())
             .collect::<String>();
         if docs.is_empty() {
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index 17c72779b..3dc33f248 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
@@ -581,7 +581,7 @@ impl ExprCollector<'_> {
         match res.value {
             Some((mark, expansion)) => {
                 // FIXME: Statements are too complicated to recover from error for now.
-                // It is because we don't have any hygenine for local variable expansion right now.
+                // It is because we don't have any hygiene for local variable expansion right now.
                 if T::can_cast(syntax::SyntaxKind::MACRO_STMTS) && res.err.is_some() {
                     self.expander.exit(self.db, mark);
                     collector(self, None);
@@ -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)
     }
 
@@ -959,7 +959,7 @@ impl ExprCollector<'_> {
 
     fn collect_tuple_pat(&mut self, args: AstChildren<ast::Pat>) -> (Vec<PatId>, Option<usize>) {
         // Find the location of the `..`, if there is one. Note that we do not
-        // consider the possiblity of there being multiple `..` here.
+        // consider the possibility of there being multiple `..` here.
         let ellipsis = args.clone().position(|p| matches!(p, ast::Pat::RestPat(_)));
         // We want to skip the `..` pattern here, since we account for it above.
         let args = args
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/expr.rs b/crates/hir_def/src/expr.rs
index 6a481769d..76f5721e5 100644
--- a/crates/hir_def/src/expr.rs
+++ b/crates/hir_def/src/expr.rs
@@ -1,6 +1,6 @@
 //! This module describes hir-level representation of expressions.
 //!
-//! This representaion is:
+//! This representation is:
 //!
 //! 1. Identity-based. Each expression has an `id`, so we can distinguish
 //!    between different `1` in `1 + 1`.
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/generics.rs b/crates/hir_def/src/generics.rs
index bb8fca009..9b5b886c2 100644
--- a/crates/hir_def/src/generics.rs
+++ b/crates/hir_def/src/generics.rs
@@ -21,11 +21,11 @@ use crate::{
     keys,
     src::{HasChildSource, HasSource},
     type_ref::{LifetimeRef, TypeBound, TypeRef},
-    AdtId, GenericDefId, LifetimeParamId, LocalLifetimeParamId, LocalTypeParamId, Lookup,
-    TypeParamId,
+    AdtId, ConstParamId, GenericDefId, LifetimeParamId, LocalConstParamId, LocalLifetimeParamId,
+    LocalTypeParamId, Lookup, TypeParamId,
 };
 
-/// Data about a generic parameter (to a function, struct, impl, ...).
+/// Data about a generic type parameter (to a function, struct, impl, ...).
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct TypeParamData {
     pub name: Option<Name>,
@@ -33,12 +33,19 @@ pub struct TypeParamData {
     pub provenance: TypeParamProvenance,
 }
 
-/// Data about a generic parameter (to a function, struct, impl, ...).
+/// Data about a generic lifetime parameter (to a function, struct, impl, ...).
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct LifetimeParamData {
     pub name: Name,
 }
 
+/// Data about a generic const parameter (to a function, struct, impl, ...).
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct ConstParamData {
+    pub name: Name,
+    pub ty: TypeRef,
+}
+
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum TypeParamProvenance {
     TypeParamList,
@@ -51,6 +58,7 @@ pub enum TypeParamProvenance {
 pub struct GenericParams {
     pub types: Arena<TypeParamData>,
     pub lifetimes: Arena<LifetimeParamData>,
+    pub consts: Arena<ConstParamData>,
     pub where_predicates: Vec<WherePredicate>,
 }
 
@@ -76,6 +84,7 @@ pub enum WherePredicateTypeTarget {
 pub(crate) struct SourceMap {
     pub(crate) type_params: ArenaMap<LocalTypeParamId, Either<ast::Trait, ast::TypeParam>>,
     lifetime_params: ArenaMap<LocalLifetimeParamId, ast::LifetimeParam>,
+    const_params: ArenaMap<LocalConstParamId, ast::ConstParam>,
 }
 
 impl GenericParams {
@@ -268,6 +277,13 @@ impl GenericParams {
             let lifetime_ref = LifetimeRef::new_name(name);
             self.fill_bounds(&lower_ctx, &lifetime_param, Either::Right(lifetime_ref));
         }
+        for const_param in params.const_params() {
+            let name = const_param.name().map_or_else(Name::missing, |it| it.as_name());
+            let ty = const_param.ty().map_or(TypeRef::Error, |it| TypeRef::from_ast(lower_ctx, it));
+            let param = ConstParamData { name, ty };
+            let param_id = self.consts.alloc(param);
+            sm.const_params.insert(param_id, const_param.clone());
+        }
     }
 
     fn fill_where_predicates(&mut self, lower_ctx: &LowerCtx, where_clause: ast::WhereClause) {
@@ -353,12 +369,16 @@ impl GenericParams {
         });
     }
 
-    pub fn find_by_name(&self, name: &Name) -> Option<LocalTypeParamId> {
+    pub fn find_type_by_name(&self, name: &Name) -> Option<LocalTypeParamId> {
         self.types
             .iter()
             .find_map(|(id, p)| if p.name.as_ref() == Some(name) { Some(id) } else { None })
     }
 
+    pub fn find_const_by_name(&self, name: &Name) -> Option<LocalConstParamId> {
+        self.consts.iter().find_map(|(id, p)| if p.name == *name { Some(id) } else { None })
+    }
+
     pub fn find_trait_self_param(&self) -> Option<LocalTypeParamId> {
         self.types.iter().find_map(|(id, p)| {
             if p.provenance == TypeParamProvenance::TraitSelf {
@@ -390,6 +410,16 @@ impl HasChildSource<LocalLifetimeParamId> for GenericDefId {
     }
 }
 
+impl HasChildSource<LocalConstParamId> for GenericDefId {
+    type Value = ast::ConstParam;
+    fn child_source(
+        &self,
+        db: &dyn DefDatabase,
+    ) -> InFile<ArenaMap<LocalConstParamId, Self::Value>> {
+        GenericParams::new(db, *self).1.map(|source_maps| source_maps.const_params)
+    }
+}
+
 impl ChildBySource for GenericDefId {
     fn child_by_source(&self, db: &dyn DefDatabase) -> DynMap {
         let mut res = DynMap::default();
@@ -406,6 +436,10 @@ impl ChildBySource for GenericDefId {
             let id = LifetimeParamId { parent: *self, local_id };
             res[keys::LIFETIME_PARAM].insert(sm.with_value(src.clone()), id);
         }
+        for (local_id, src) in sm.value.const_params.iter() {
+            let id = ConstParamId { parent: *self, local_id };
+            res[keys::CONST_PARAM].insert(sm.with_value(src.clone()), id);
+        }
         res
     }
 }
diff --git a/crates/hir_def/src/import_map.rs b/crates/hir_def/src/import_map.rs
index c4dc894df..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,8 +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 test_utils::mark;
 
-    use crate::{data::FunctionData, test_db::TestDB, AssocContainerId, Lookup};
+    use crate::{test_db::TestDB, AssocContainerId, Lookup};
 
     use super::*;
 
@@ -450,45 +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
-                            {
-                                full_path += &format!(
-                                    "::{}",
-                                    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 {
@@ -747,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
@@ -782,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)
             "#]],
         );
 
@@ -796,7 +863,7 @@ mod tests {
                 dep::Fmt (t)
                 dep::Fmt (v)
                 dep::Fmt (m)
-                dep::fmt::Display::fmt (f)
+                dep::fmt::Display::fmt (a)
             "#]],
         );
 
@@ -810,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)
             "#]],
         );
     }
@@ -851,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)
             "#]],
         );
 
@@ -864,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/item_tree.rs b/crates/hir_def/src/item_tree.rs
index 100dbf5d6..b6f510731 100644
--- a/crates/hir_def/src/item_tree.rs
+++ b/crates/hir_def/src/item_tree.rs
@@ -260,6 +260,7 @@ impl GenericParamsStorage {
     fn alloc(&mut self, params: GenericParams) -> GenericParamsId {
         if params.types.is_empty()
             && params.lifetimes.is_empty()
+            && params.consts.is_empty()
             && params.where_predicates.is_empty()
         {
             return GenericParamsId::EMPTY;
@@ -269,8 +270,12 @@ impl GenericParamsStorage {
     }
 }
 
-static EMPTY_GENERICS: GenericParams =
-    GenericParams { types: Arena::new(), lifetimes: Arena::new(), where_predicates: Vec::new() };
+static EMPTY_GENERICS: GenericParams = GenericParams {
+    types: Arena::new(),
+    lifetimes: Arena::new(),
+    consts: Arena::new(),
+    where_predicates: Vec::new(),
+};
 
 #[derive(Default, Debug, Eq, PartialEq)]
 struct ItemTreeData {
diff --git a/crates/hir_def/src/keys.rs b/crates/hir_def/src/keys.rs
index 9c585de2c..89b3ed868 100644
--- a/crates/hir_def/src/keys.rs
+++ b/crates/hir_def/src/keys.rs
@@ -8,8 +8,8 @@ use syntax::{ast, AstNode, AstPtr};
 
 use crate::{
     dyn_map::{DynMap, Policy},
-    ConstId, EnumId, EnumVariantId, FieldId, FunctionId, ImplId, LifetimeParamId, StaticId,
-    StructId, TraitId, TypeAliasId, TypeParamId, UnionId,
+    ConstId, ConstParamId, EnumId, EnumVariantId, FieldId, FunctionId, ImplId, LifetimeParamId,
+    StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId,
 };
 
 pub type Key<K, V> = crate::dyn_map::Key<InFile<K>, V, AstPtrPolicy<K, V>>;
@@ -29,6 +29,7 @@ pub const TUPLE_FIELD: Key<ast::TupleField, FieldId> = Key::new();
 pub const RECORD_FIELD: Key<ast::RecordField, FieldId> = Key::new();
 pub const TYPE_PARAM: Key<ast::TypeParam, TypeParamId> = Key::new();
 pub const LIFETIME_PARAM: Key<ast::LifetimeParam, LifetimeParamId> = Key::new();
+pub const CONST_PARAM: Key<ast::ConstParam, ConstParamId> = Key::new();
 
 pub const MACRO: Key<ast::MacroCall, MacroDefId> = Key::new();
 
diff --git a/crates/hir_def/src/lib.rs b/crates/hir_def/src/lib.rs
index ba09a9126..211cb2faf 100644
--- a/crates/hir_def/src/lib.rs
+++ b/crates/hir_def/src/lib.rs
@@ -232,6 +232,13 @@ pub struct LifetimeParamId {
 pub type LocalLifetimeParamId = Idx<generics::LifetimeParamData>;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct ConstParamId {
+    pub parent: GenericDefId,
+    pub local_id: LocalConstParamId,
+}
+pub type LocalConstParamId = Idx<generics::ConstParamData>;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ContainerId {
     ModuleId(ModuleId),
     DefWithBodyId(DefWithBodyId),
@@ -254,6 +261,15 @@ pub enum AdtId {
 }
 impl_from!(StructId, UnionId, EnumId for AdtId);
 
+/// A generic param
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub enum GenericParamId {
+    TypeParamId(TypeParamId),
+    LifetimeParamId(LifetimeParamId),
+    ConstParamId(ConstParamId),
+}
+impl_from!(TypeParamId, LifetimeParamId, ConstParamId for GenericParamId);
+
 /// The defs which can be visible in the module.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ModuleDefId {
@@ -350,6 +366,7 @@ pub enum AttrDefId {
     TypeAliasId(TypeAliasId),
     MacroDefId(MacroDefId),
     ImplId(ImplId),
+    GenericParamId(GenericParamId),
 }
 
 impl_from!(
@@ -363,7 +380,8 @@ impl_from!(
     TraitId,
     TypeAliasId,
     MacroDefId,
-    ImplId
+    ImplId,
+    GenericParamId
     for AttrDefId
 );
 
@@ -488,6 +506,15 @@ impl AttrDefId {
             AttrDefId::TraitId(it) => it.lookup(db).container.module(db).krate,
             AttrDefId::TypeAliasId(it) => it.lookup(db).module(db).krate,
             AttrDefId::ImplId(it) => it.lookup(db).container.module(db).krate,
+            AttrDefId::GenericParamId(it) => {
+                match it {
+                    GenericParamId::TypeParamId(it) => it.parent,
+                    GenericParamId::LifetimeParamId(it) => it.parent,
+                    GenericParamId::ConstParamId(it) => it.parent,
+                }
+                .module(db)
+                .krate
+            }
             // FIXME: `MacroDefId` should store the defining module, then this can implement
             // `HasModule`
             AttrDefId::MacroDefId(it) => it.krate,
diff --git a/crates/hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs
index 9bf358775..5682e122d 100644
--- a/crates/hir_def/src/nameres.rs
+++ b/crates/hir_def/src/nameres.rs
@@ -454,7 +454,7 @@ mod diagnostics {
                                     });
                                 for token in tokens {
                                     if token.kind() == SyntaxKind::IDENT
-                                        && token.to_string() == *name
+                                        && token.text() == name.as_str()
                                     {
                                         precise_location = Some(token.text_range());
                                         break 'outer;
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index a636ec77d..f027fd48d 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};
@@ -267,7 +267,7 @@ impl DefCollector<'_> {
 
         // Resolve all indeterminate resolved imports again
         // As some of the macros will expand newly import shadowing partial resolved imports
-        // FIXME: We maybe could skip this, if we handle the Indetermine imports in `resolve_imports`
+        // FIXME: We maybe could skip this, if we handle the indeterminate imports in `resolve_imports`
         // correctly
         let partial_resolved = self.resolved_imports.iter().filter_map(|directive| {
             if let PartialResolvedImport::Indeterminate(_) = directive.status {
@@ -402,7 +402,7 @@ impl DefCollector<'_> {
 
     /// Define a proc macro
     ///
-    /// A proc macro is similar to normal macro scope, but it would not visiable in legacy textual scoped.
+    /// A proc macro is similar to normal macro scope, but it would not visible in legacy textual scoped.
     /// And unconditionally exported.
     fn define_proc_macro(&mut self, name: Name, macro_: MacroDefId) {
         self.update(
@@ -592,7 +592,7 @@ impl DefCollector<'_> {
                     // XXX: urgh, so this works by accident! Here, we look at
                     // the enum data, and, in theory, this might require us to
                     // look back at the crate_def_map, creating a cycle. For
-                    // example, `enum E { crate::some_macro!(); }`. Luckely, the
+                    // example, `enum E { crate::some_macro!(); }`. Luckily, the
                     // only kind of macro that is allowed inside enum is a
                     // `cfg_macro`, and we don't need to run name resolution for
                     // it, but this is sheer luck!
@@ -655,7 +655,7 @@ impl DefCollector<'_> {
         &mut self,
         module_id: LocalModuleId,
         resolutions: &[(Option<Name>, PerNs)],
-        // All resolutions are imported with this visibility; the visibilies in
+        // All resolutions are imported with this visibility; the visibilities in
         // the `PerNs` values are ignored and overwritten
         vis: Visibility,
         import_type: ImportType,
@@ -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_def/src/path/lower.rs b/crates/hir_def/src/path/lower.rs
index 8a01e6eea..9518ac109 100644
--- a/crates/hir_def/src/path/lower.rs
+++ b/crates/hir_def/src/path/lower.rs
@@ -123,7 +123,7 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
     // We follow what it did anyway :)
     if segments.len() == 1 && kind == PathKind::Plain {
         if let Some(_macro_call) = path.syntax().parent().and_then(ast::MacroCall::cast) {
-            if let Some(crate_id) = hygiene.local_inner_macros() {
+            if let Some(crate_id) = hygiene.local_inner_macros(path) {
                 kind = PathKind::DollarCrate(crate_id);
             }
         }
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs
index 779754ada..61059c349 100644
--- a/crates/hir_def/src/resolver.rs
+++ b/crates/hir_def/src/resolver.rs
@@ -20,14 +20,14 @@ use crate::{
     path::{ModPath, PathKind},
     per_ns::PerNs,
     visibility::{RawVisibility, Visibility},
-    AdtId, AssocContainerId, ConstId, ContainerId, DefWithBodyId, EnumId, EnumVariantId,
-    FunctionId, GenericDefId, HasModule, ImplId, LocalModuleId, Lookup, ModuleDefId, ModuleId,
-    StaticId, StructId, TraitId, TypeAliasId, TypeParamId, VariantId,
+    AdtId, AssocContainerId, ConstId, ConstParamId, ContainerId, DefWithBodyId, EnumId,
+    EnumVariantId, FunctionId, GenericDefId, HasModule, ImplId, LocalModuleId, Lookup, ModuleDefId,
+    ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, VariantId,
 };
 
 #[derive(Debug, Clone, Default)]
 pub struct Resolver {
-    // FIXME: all usages generally call `.rev`, so maybe reverse once in consturciton?
+    // FIXME: all usages generally call `.rev`, so maybe reverse once in construction?
     scopes: Vec<Scope>,
 }
 
@@ -93,6 +93,7 @@ pub enum ValueNs {
     StaticId(StaticId),
     StructId(StructId),
     EnumVariantId(EnumVariantId),
+    GenericParam(ConstParamId),
 }
 
 impl Resolver {
@@ -163,7 +164,7 @@ impl Resolver {
                 }
 
                 Scope::GenericParams { params, def } => {
-                    if let Some(local_id) = params.find_by_name(first_name) {
+                    if let Some(local_id) = params.find_type_by_name(first_name) {
                         let idx = if path.segments.len() == 1 { None } else { Some(1) };
                         return Some((
                             TypeNs::GenericParam(TypeParamId { local_id, parent: *def }),
@@ -285,11 +286,17 @@ impl Resolver {
                 Scope::ExprScope(_) => continue,
 
                 Scope::GenericParams { params, def } if n_segments > 1 => {
-                    if let Some(local_id) = params.find_by_name(first_name) {
+                    if let Some(local_id) = params.find_type_by_name(first_name) {
                         let ty = TypeNs::GenericParam(TypeParamId { local_id, parent: *def });
                         return Some(ResolveValueResult::Partial(ty, 1));
                     }
                 }
+                Scope::GenericParams { params, def } if n_segments == 1 => {
+                    if let Some(local_id) = params.find_const_by_name(first_name) {
+                        let val = ValueNs::GenericParam(ConstParamId { local_id, parent: *def });
+                        return Some(ResolveValueResult::ValueNs(val));
+                    }
+                }
                 Scope::GenericParams { .. } => continue,
 
                 Scope::ImplDefScope(impl_) => {
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/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs
index 6382521fb..80b60d59f 100644
--- a/crates/hir_expand/src/builtin_macro.rs
+++ b/crates/hir_expand/src/builtin_macro.rs
@@ -259,7 +259,8 @@ fn format_args_expand(
     }
     for arg in &mut args {
         // Remove `key =`.
-        if matches!(arg.get(1), Some(tt::TokenTree::Leaf(tt::Leaf::Punct(p))) if p.char == '=') {
+        if matches!(arg.get(1), Some(tt::TokenTree::Leaf(tt::Leaf::Punct(p))) if p.char == '=' && p.spacing != tt::Spacing::Joint)
+        {
             arg.drain(..2);
         }
     }
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index 06f0a3ed9..c62086390 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -8,9 +8,9 @@ use parser::FragmentKind;
 use syntax::{algo::diff, ast::NameOwner, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode};
 
 use crate::{
-    ast_id_map::AstIdMap, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerCallLoc, EagerMacroId,
-    HirFileId, HirFileIdRepr, LazyMacroId, MacroCallId, MacroCallLoc, MacroDefId, MacroDefKind,
-    MacroFile, ProcMacroExpander,
+    ast_id_map::AstIdMap, hygiene::HygieneFrame, BuiltinDeriveExpander, BuiltinFnLikeExpander,
+    EagerCallLoc, EagerMacroId, HirFileId, HirFileIdRepr, LazyMacroId, MacroCallId, MacroCallLoc,
+    MacroDefId, MacroDefKind, MacroFile, ProcMacroExpander,
 };
 
 /// Total limit on the number of tokens produced by any macro invocation.
@@ -40,7 +40,7 @@ impl TokenExpander {
             // FIXME switch these to ExpandResult as well
             TokenExpander::BuiltinDerive(it) => it.expand(db, id, tt).into(),
             TokenExpander::ProcMacro(_) => {
-                // We store the result in salsa db to prevent non-determinisc behavior in
+                // We store the result in salsa db to prevent non-deterministic behavior in
                 // some proc-macro implementation
                 // See #4315 for details
                 db.expand_proc_macro(id.into()).into()
@@ -94,6 +94,8 @@ pub trait AstDatabase: SourceDatabase {
     fn intern_eager_expansion(&self, eager: EagerCallLoc) -> EagerMacroId;
 
     fn expand_proc_macro(&self, call: MacroCallId) -> Result<tt::Subtree, mbe::ExpandError>;
+
+    fn hygiene_frame(&self, file_id: HirFileId) -> Arc<HygieneFrame>;
 }
 
 /// This expands the given macro call, but with different arguments. This is
@@ -369,6 +371,10 @@ fn parse_macro_with_arg(
     }
 }
 
+fn hygiene_frame(db: &dyn AstDatabase, file_id: HirFileId) -> Arc<HygieneFrame> {
+    Arc::new(HygieneFrame::new(db, file_id))
+}
+
 /// Given a `MacroCallId`, return what `FragmentKind` it belongs to.
 /// FIXME: Not completed
 fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
@@ -404,7 +410,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
         TRY_EXPR => FragmentKind::Expr,
         TUPLE_EXPR => FragmentKind::Expr,
         PAREN_EXPR => FragmentKind::Expr,
-
+        ARRAY_EXPR => FragmentKind::Expr,
         FOR_EXPR => FragmentKind::Expr,
         PATH_EXPR => FragmentKind::Expr,
         CLOSURE_EXPR => FragmentKind::Expr,
diff --git a/crates/hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs
index 6354b090d..ae7b51a08 100644
--- a/crates/hir_expand/src/eager.rs
+++ b/crates/hir_expand/src/eager.rs
@@ -218,6 +218,12 @@ fn eager_macro_recur(
             }
         };
 
+        // check if the whole original sytnax is replaced
+        // Note that SyntaxRewriter cannot replace the root node itself
+        if child.syntax() == &original {
+            return Ok(insert);
+        }
+
         rewriter.replace(child.syntax(), &insert);
     }
 
diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs
index 7ab0a5e52..8db581b77 100644
--- a/crates/hir_expand/src/hygiene.rs
+++ b/crates/hir_expand/src/hygiene.rs
@@ -2,65 +2,209 @@
 //!
 //! Specifically, `ast` + `Hygiene` allows you to create a `Name`. Note that, at
 //! this moment, this is horribly incomplete and handles only `$crate`.
+use std::sync::Arc;
+
 use base_db::CrateId;
 use either::Either;
-use syntax::ast;
+use mbe::Origin;
+use parser::SyntaxKind;
+use syntax::{ast, AstNode, SyntaxNode, TextRange, TextSize};
 
 use crate::{
-    db::AstDatabase,
+    db::{self, AstDatabase},
     name::{AsName, Name},
-    HirFileId, HirFileIdRepr, MacroCallId, MacroDefKind,
+    HirFileId, HirFileIdRepr, InFile, MacroCallId, MacroCallLoc, MacroDefKind, MacroFile,
 };
 
 #[derive(Clone, Debug)]
 pub struct Hygiene {
-    // This is what `$crate` expands to
-    def_crate: Option<CrateId>,
-
-    // Indicate this is a local inner macro
-    local_inner: bool,
+    frames: Option<HygieneFrames>,
 }
 
 impl Hygiene {
     pub fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Hygiene {
-        let (def_crate, local_inner) = match file_id.0 {
-            HirFileIdRepr::FileId(_) => (None, false),
-            HirFileIdRepr::MacroFile(macro_file) => match macro_file.macro_call_id {
-                MacroCallId::LazyMacro(id) => {
-                    let loc = db.lookup_intern_macro(id);
-                    match loc.def.kind {
-                        MacroDefKind::Declarative => (Some(loc.def.krate), loc.def.local_inner),
-                        MacroDefKind::BuiltIn(_) => (Some(loc.def.krate), false),
-                        MacroDefKind::BuiltInDerive(_) => (None, false),
-                        MacroDefKind::BuiltInEager(_) => (None, false),
-                        MacroDefKind::ProcMacro(_) => (None, false),
-                    }
-                }
-                MacroCallId::EagerMacro(_id) => (None, false),
-            },
-        };
-        Hygiene { def_crate, local_inner }
+        Hygiene { frames: Some(HygieneFrames::new(db, file_id.clone())) }
     }
 
     pub fn new_unhygienic() -> Hygiene {
-        Hygiene { def_crate: None, local_inner: false }
+        Hygiene { frames: None }
     }
 
     // FIXME: this should just return name
     pub fn name_ref_to_name(&self, name_ref: ast::NameRef) -> Either<Name, CrateId> {
-        if let Some(def_crate) = self.def_crate {
+        if let Some(frames) = &self.frames {
             if name_ref.text() == "$crate" {
-                return Either::Right(def_crate);
+                if let Some(krate) = frames.root_crate(name_ref.syntax()) {
+                    return Either::Right(krate);
+                }
             }
         }
+
         Either::Left(name_ref.as_name())
     }
 
-    pub fn local_inner_macros(&self) -> Option<CrateId> {
-        if self.local_inner {
-            self.def_crate
-        } else {
-            None
+    pub fn local_inner_macros(&self, path: ast::Path) -> Option<CrateId> {
+        let mut token = path.syntax().first_token()?.text_range();
+        let frames = self.frames.as_ref()?;
+        let mut current = frames.0.clone();
+
+        loop {
+            let (mapped, origin) = current.expansion.as_ref()?.map_ident_up(token)?;
+            if origin == Origin::Def {
+                return if current.local_inner { frames.root_crate(path.syntax()) } else { None };
+            }
+            current = current.call_site.as_ref()?.clone();
+            token = mapped.value;
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+struct HygieneFrames(Arc<HygieneFrame>);
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct HygieneFrame {
+    expansion: Option<HygieneInfo>,
+
+    // Indicate this is a local inner macro
+    local_inner: bool,
+    krate: Option<CrateId>,
+
+    call_site: Option<Arc<HygieneFrame>>,
+    def_site: Option<Arc<HygieneFrame>>,
+}
+
+impl HygieneFrames {
+    fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Self {
+        HygieneFrames(Arc::new(HygieneFrame::new(db, file_id)))
+    }
+
+    fn root_crate(&self, node: &SyntaxNode) -> Option<CrateId> {
+        let mut token = node.first_token()?.text_range();
+        let mut result = self.0.krate;
+        let mut current = self.0.clone();
+
+        while let Some((mapped, origin)) =
+            current.expansion.as_ref().and_then(|it| it.map_ident_up(token))
+        {
+            result = current.krate;
+
+            let site = match origin {
+                Origin::Def => &current.def_site,
+                Origin::Call => &current.call_site,
+            };
+
+            let site = match site {
+                None => break,
+                Some(it) => it,
+            };
+
+            current = site.clone();
+            token = mapped.value;
         }
+
+        result
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+struct HygieneInfo {
+    arg_start: InFile<TextSize>,
+    /// The `macro_rules!` arguments.
+    def_start: Option<InFile<TextSize>>,
+
+    macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>,
+    macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>,
+    exp_map: Arc<mbe::TokenMap>,
+}
+
+impl HygieneInfo {
+    fn map_ident_up(&self, token: TextRange) -> Option<(InFile<TextRange>, Origin)> {
+        let token_id = self.exp_map.token_by_range(token)?;
+
+        let (token_id, origin) = self.macro_def.0.map_id_up(token_id);
+        let (token_map, tt) = match origin {
+            mbe::Origin::Call => (&self.macro_arg.1, self.arg_start),
+            mbe::Origin::Def => (
+                &self.macro_def.1,
+                self.def_start
+                    .as_ref()
+                    .expect("`Origin::Def` used with non-`macro_rules!` macro")
+                    .clone(),
+            ),
+        };
+
+        let range = token_map.range_by_token(token_id)?.by_kind(SyntaxKind::IDENT)?;
+        Some((tt.with_value(range + tt.value), origin))
+    }
+}
+
+fn make_hygiene_info(
+    db: &dyn AstDatabase,
+    macro_file: MacroFile,
+    loc: &MacroCallLoc,
+) -> Option<HygieneInfo> {
+    let arg_tt = loc.kind.arg(db)?;
+
+    let def_offset = loc.def.ast_id.and_then(|id| {
+        let def_tt = match id.to_node(db) {
+            ast::Macro::MacroRules(mac) => mac.token_tree()?.syntax().text_range().start(),
+            ast::Macro::MacroDef(_) => return None,
+        };
+        Some(InFile::new(id.file_id, def_tt))
+    });
+
+    let macro_def = db.macro_def(loc.def)?;
+    let (_, exp_map) = db.parse_macro_expansion(macro_file).value?;
+    let macro_arg = db.macro_arg(macro_file.macro_call_id)?;
+
+    Some(HygieneInfo {
+        arg_start: InFile::new(loc.kind.file_id(), arg_tt.text_range().start()),
+        def_start: def_offset,
+        macro_arg,
+        macro_def,
+        exp_map,
+    })
+}
+
+impl HygieneFrame {
+    pub(crate) fn new(db: &dyn AstDatabase, file_id: HirFileId) -> HygieneFrame {
+        let (info, krate, local_inner) = match file_id.0 {
+            HirFileIdRepr::FileId(_) => (None, None, false),
+            HirFileIdRepr::MacroFile(macro_file) => match macro_file.macro_call_id {
+                MacroCallId::EagerMacro(_id) => (None, None, false),
+                MacroCallId::LazyMacro(id) => {
+                    let loc = db.lookup_intern_macro(id);
+                    let info = make_hygiene_info(db, macro_file, &loc);
+                    match loc.def.kind {
+                        MacroDefKind::Declarative => {
+                            (info, Some(loc.def.krate), loc.def.local_inner)
+                        }
+                        MacroDefKind::BuiltIn(_) => (info, Some(loc.def.krate), false),
+                        MacroDefKind::BuiltInDerive(_) => (info, None, false),
+                        MacroDefKind::BuiltInEager(_) => (info, None, false),
+                        MacroDefKind::ProcMacro(_) => (info, None, false),
+                    }
+                }
+            },
+        };
+
+        let info = match info {
+            None => {
+                return HygieneFrame {
+                    expansion: None,
+                    local_inner,
+                    krate,
+                    call_site: None,
+                    def_site: None,
+                };
+            }
+            Some(it) => it,
+        };
+
+        let def_site = info.def_start.map(|it| db.hygiene_frame(it.file_id));
+        let call_site = Some(db.hygiene_frame(info.arg_start.file_id));
+
+        HygieneFrame { expansion: Some(info), local_inner, krate, call_site, def_site }
     }
 }
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 965c1780a..b0a453961 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -10,16 +10,16 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-itertools = "0.9.0"
+itertools = "0.10.0"
 arrayvec = "0.5.1"
 smallvec = "1.2.0"
 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/db.rs b/crates/hir_ty/src/db.rs
index 66bdb8e88..f3567c49e 100644
--- a/crates/hir_ty/src/db.rs
+++ b/crates/hir_ty/src/db.rs
@@ -5,8 +5,8 @@ use std::sync::Arc;
 use arena::map::ArenaMap;
 use base_db::{impl_intern_key, salsa, CrateId, Upcast};
 use hir_def::{
-    db::DefDatabase, expr::ExprId, DefWithBodyId, FunctionId, GenericDefId, ImplId, LocalFieldId,
-    TypeParamId, VariantId,
+    db::DefDatabase, expr::ExprId, ConstParamId, DefWithBodyId, FunctionId, GenericDefId, ImplId,
+    LocalFieldId, TypeParamId, VariantId,
 };
 
 use crate::{
@@ -37,6 +37,9 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
     #[salsa::cycle(crate::lower::impl_self_ty_recover)]
     fn impl_self_ty(&self, def: ImplId) -> Binders<Ty>;
 
+    #[salsa::invoke(crate::lower::const_param_ty_query)]
+    fn const_param_ty(&self, def: ConstParamId) -> Ty;
+
     #[salsa::invoke(crate::lower::impl_trait_query)]
     fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>;
 
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 849415706..107417c27 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,
@@ -156,7 +156,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
         // FIXME: Due to shortcomings in the current type system implementation, only emit this
         // diagnostic if there are no type mismatches in the containing function.
         if self.infer.type_mismatches.iter().next().is_some() {
-            return Some(());
+            return None;
         }
 
         let is_method_call = matches!(expr, Expr::MethodCall { .. });
@@ -170,6 +170,14 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
                 let mut args = args.clone();
                 args.insert(0, *receiver);
 
+                let receiver = &self.infer.type_of_expr[*receiver];
+                if receiver.strip_references().is_unknown() {
+                    // if the receiver is of unknown type, it's very likely we
+                    // don't know enough to correctly resolve the method call.
+                    // This is kind of a band-aid for #6975.
+                    return None;
+                }
+
                 // FIXME: note that we erase information about substs here. This
                 // is not right, but, luckily, doesn't matter as we care only
                 // about the number of params
@@ -298,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,
+                });
             }
         }
     }
@@ -358,7 +379,7 @@ pub fn record_literal_missing_fields(
     id: ExprId,
     expr: &Expr,
 ) -> Option<(VariantId, Vec<LocalFieldId>, /*exhaustive*/ bool)> {
-    let (fields, exhausitve) = match expr {
+    let (fields, exhaustive) = match expr {
         Expr::RecordLit { path: _, fields, spread } => (fields, spread.is_none()),
         _ => return None,
     };
@@ -379,7 +400,7 @@ pub fn record_literal_missing_fields(
     if missed_fields.is_empty() {
         return None;
     }
-    Some((variant_def, missed_fields, exhausitve))
+    Some((variant_def, missed_fields, exhaustive))
 }
 
 pub fn record_pattern_missing_fields(
@@ -505,6 +526,22 @@ fn f() {
     }
 
     #[test]
+    fn method_unknown_receiver() {
+        // note: this is incorrect code, so there might be errors on this in the
+        // future, but we shouldn't emit an argument count diagnostic here
+        check_diagnostics(
+            r#"
+trait Foo { fn method(&self, arg: usize) {} }
+
+fn f() {
+    let x;
+    x.method();
+}
+"#,
+        );
+    }
+
+    #[test]
     fn tuple_struct() {
         check_diagnostics(
             r#"
diff --git a/crates/hir_ty/src/diagnostics/match_check.rs b/crates/hir_ty/src/diagnostics/match_check.rs
index 62c329731..61c47eec8 100644
--- a/crates/hir_ty/src/diagnostics/match_check.rs
+++ b/crates/hir_ty/src/diagnostics/match_check.rs
@@ -14,7 +14,7 @@
 //! The algorithm implemented here is a modified version of the one described in
 //! <http://moscova.inria.fr/~maranget/papers/warn/index.html>.
 //! However, to save future implementors from reading the original paper, we
-//! summarise the algorithm here to hopefully save time and be a little clearer
+//! summarize the algorithm here to hopefully save time and be a little clearer
 //! (without being so rigorous).
 //!
 //! The core of the algorithm revolves about a "usefulness" check. In particular, we
@@ -132,7 +132,7 @@
 //! The algorithm is inductive (on the number of columns: i.e., components of tuple patterns).
 //! That means we're going to check the components from left-to-right, so the algorithm
 //! operates principally on the first component of the matrix and new pattern-stack `p`.
-//! This algorithm is realised in the `is_useful` function.
+//! This algorithm is realized in the `is_useful` function.
 //!
 //! Base case (`n = 0`, i.e., an empty tuple pattern):
 //! - If `P` already contains an empty pattern (i.e., if the number of patterns `m > 0`), then
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 0e827a29e..d2f1b4014 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -1,14 +1,15 @@
 //! FIXME: write short doc here
 
-use std::fmt;
+use std::{borrow::Cow, fmt};
 
 use crate::{
     db::HirDatabase, utils::generics, ApplicationTy, CallableDefId, FnSig, GenericPredicate,
-    Lifetime, Obligation, OpaqueTyId, ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
+    Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
 };
+use arrayvec::ArrayVec;
 use hir_def::{
-    find_path, generics::TypeParamProvenance, item_scope::ItemInNs, AdtId, AssocContainerId,
-    Lookup, ModuleId,
+    db::DefDatabase, find_path, generics::TypeParamProvenance, item_scope::ItemInNs, AdtId,
+    AssocContainerId, HasModule, Lookup, ModuleId, TraitId,
 };
 use hir_expand::name::Name;
 
@@ -168,7 +169,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)
@@ -257,25 +258,45 @@ impl HirDisplay for ApplicationTy {
                 t.hir_fmt(f)?;
                 write!(f, "; _]")?;
             }
-            TypeCtor::RawPtr(m) => {
+            TypeCtor::RawPtr(m) | TypeCtor::Ref(m) => {
                 let t = self.parameters.as_single();
+                let ty_display =
+                    t.into_displayable(f.db, f.max_size, f.omit_verbose_types, f.display_target);
 
-                write!(f, "*{}", m.as_keyword_for_ptr())?;
-                if matches!(t, Ty::Dyn(predicates) if predicates.len() > 1) {
-                    write!(f, "(")?;
-                    t.hir_fmt(f)?;
-                    write!(f, ")")?;
+                if matches!(self.ctor, TypeCtor::RawPtr(_)) {
+                    write!(f, "*{}", m.as_keyword_for_ptr())?;
                 } else {
-                    t.hir_fmt(f)?;
+                    write!(f, "&{}", m.as_keyword_for_ref())?;
+                }
+
+                let datas;
+                let predicates = match t {
+                    Ty::Dyn(predicates) if predicates.len() > 1 => {
+                        Cow::Borrowed(predicates.as_ref())
+                    }
+                    &Ty::Opaque(OpaqueTy {
+                        opaque_ty_id: OpaqueTyId::ReturnTypeImplTrait(func, idx),
+                        ref parameters,
+                    }) => {
+                        datas =
+                            f.db.return_type_impl_traits(func).expect("impl trait id without data");
+                        let data = (*datas)
+                            .as_ref()
+                            .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
+                        let bounds = data.subst(parameters);
+                        Cow::Owned(bounds.value)
+                    }
+                    _ => Cow::Borrowed(&[][..]),
+                };
+
+                if let [GenericPredicate::Implemented(trait_ref), _] = predicates.as_ref() {
+                    let trait_ = trait_ref.trait_;
+                    if fn_traits(f.db.upcast(), trait_).any(|it| it == trait_) {
+                        return write!(f, "{}", ty_display);
+                    }
                 }
-            }
-            TypeCtor::Ref(m) => {
-                let t = self.parameters.as_single();
-                let ty_display =
-                    t.into_displayable(f.db, f.max_size, f.omit_verbose_types, f.display_target);
 
-                write!(f, "&{}", m.as_keyword_for_ref())?;
-                if matches!(t, Ty::Dyn(predicates) if predicates.len() > 1) {
+                if predicates.len() > 1 {
                     write!(f, "(")?;
                     write!(f, "{}", ty_display)?;
                     write!(f, ")")?;
@@ -595,7 +616,18 @@ impl HirDisplay for FnSig {
     }
 }
 
-fn write_bounds_like_dyn_trait(
+fn fn_traits(db: &dyn DefDatabase, trait_: TraitId) -> impl Iterator<Item = TraitId> {
+    let krate = trait_.lookup(db).container.module(db).krate;
+    let fn_traits = [
+        db.lang_item(krate, "fn".into()),
+        db.lang_item(krate, "fn_mut".into()),
+        db.lang_item(krate, "fn_once".into()),
+    ];
+    // FIXME: Replace ArrayVec when into_iter is a thing on arrays
+    ArrayVec::from(fn_traits).into_iter().flatten().flat_map(|it| it.as_trait())
+}
+
+pub fn write_bounds_like_dyn_trait(
     predicates: &[GenericPredicate],
     f: &mut HirFormatter,
 ) -> Result<(), HirDisplayError> {
@@ -607,10 +639,15 @@ fn write_bounds_like_dyn_trait(
     // predicate for that trait).
     let mut first = true;
     let mut angle_open = false;
+    let mut is_fn_trait = false;
     for p in predicates.iter() {
         match p {
             GenericPredicate::Implemented(trait_ref) => {
-                if angle_open {
+                let trait_ = trait_ref.trait_;
+                if !is_fn_trait {
+                    is_fn_trait = fn_traits(f.db.upcast(), trait_).any(|it| it == trait_);
+                }
+                if !is_fn_trait && angle_open {
                     write!(f, ">")?;
                     angle_open = false;
                 }
@@ -620,14 +657,27 @@ fn write_bounds_like_dyn_trait(
                 // We assume that the self type is $0 (i.e. the
                 // existential) here, which is the only thing that's
                 // possible in actual Rust, and hence don't print it
-                write!(f, "{}", f.db.trait_data(trait_ref.trait_).name)?;
-                if trait_ref.substs.len() > 1 {
-                    write!(f, "<")?;
-                    f.write_joined(&trait_ref.substs[1..], ", ")?;
-                    // there might be assoc type bindings, so we leave the angle brackets open
-                    angle_open = true;
+                write!(f, "{}", f.db.trait_data(trait_).name)?;
+                if let [_, params @ ..] = &*trait_ref.substs.0 {
+                    if is_fn_trait {
+                        if let Some(args) = params.first().and_then(|it| it.as_tuple()) {
+                            write!(f, "(")?;
+                            f.write_joined(&*args.0, ", ")?;
+                            write!(f, ")")?;
+                        }
+                    } else if !params.is_empty() {
+                        write!(f, "<")?;
+                        f.write_joined(params, ", ")?;
+                        // there might be assoc type bindings, so we leave the angle brackets open
+                        angle_open = true;
+                    }
                 }
             }
+            GenericPredicate::Projection(projection_pred) if is_fn_trait => {
+                is_fn_trait = false;
+                write!(f, " -> ")?;
+                projection_pred.ty.hir_fmt(f)?;
+            }
             GenericPredicate::Projection(projection_pred) => {
                 // in types in actual Rust, these will always come
                 // after the corresponding Implemented predicate
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 70a3f3075..f2fc69b2f 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -648,6 +648,8 @@ impl<'a> InferenceContext<'a> {
             }
             Expr::Array(array) => {
                 let elem_ty = match &expected.ty {
+                    // FIXME: remove when https://github.com/rust-lang/rust/issues/80501 is fixed
+                    #[allow(unreachable_patterns)]
                     ty_app!(TypeCtor::Array, st) | ty_app!(TypeCtor::Slice, st) => {
                         st.as_single().clone()
                     }
diff --git a/crates/hir_ty/src/infer/path.rs b/crates/hir_ty/src/infer/path.rs
index 80d7ed10e..5d541104e 100644
--- a/crates/hir_ty/src/infer/path.rs
+++ b/crates/hir_ty/src/infer/path.rs
@@ -89,6 +89,7 @@ impl<'a> InferenceContext<'a> {
                     return None;
                 }
             }
+            ValueNs::GenericParam(it) => return Some(self.db.const_param_ty(it)),
         };
 
         let ty = self.db.value_ty(typable);
diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs
index 357bd92f9..e00c7e176 100644
--- a/crates/hir_ty/src/lib.rs
+++ b/crates/hir_ty/src/lib.rs
@@ -791,6 +791,10 @@ impl Ty {
         matches!(self, Ty::Apply(ApplicationTy { ctor: TypeCtor::Never, .. }))
     }
 
+    pub fn is_unknown(&self) -> bool {
+        matches!(self, Ty::Unknown)
+    }
+
     /// If this is a `dyn Trait` type, this returns the `Trait` part.
     pub fn dyn_trait_ref(&self) -> Option<&TraitRef> {
         match self {
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs
index 8da56cd11..9594cce8b 100644
--- a/crates/hir_ty/src/lower.rs
+++ b/crates/hir_ty/src/lower.rs
@@ -16,9 +16,9 @@ use hir_def::{
     path::{GenericArg, Path, PathSegment, PathSegments},
     resolver::{HasResolver, Resolver, TypeNs},
     type_ref::{TypeBound, TypeRef},
-    AdtId, AssocContainerId, AssocItemId, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId,
-    HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId, TypeParamId,
-    UnionId, VariantId,
+    AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId,
+    GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId,
+    TypeAliasId, TypeParamId, UnionId, VariantId,
 };
 use hir_expand::name::Name;
 use smallvec::SmallVec;
@@ -491,16 +491,16 @@ impl Ty {
     fn from_hir_path_inner(
         ctx: &TyLoweringContext<'_>,
         segment: PathSegment<'_>,
-        typable: TyDefId,
+        typeable: TyDefId,
         infer_args: bool,
     ) -> Ty {
-        let generic_def = match typable {
+        let generic_def = match typeable {
             TyDefId::BuiltinType(_) => None,
             TyDefId::AdtId(it) => Some(it.into()),
             TyDefId::TypeAliasId(it) => Some(it.into()),
         };
         let substs = substs_from_path_segment(ctx, segment, generic_def, infer_args);
-        ctx.db.ty(typable).subst(&substs)
+        ctx.db.ty(typeable).subst(&substs)
     }
 
     /// Collect generic arguments from a path into a `Substs`. See also
@@ -1221,6 +1221,15 @@ pub(crate) fn impl_self_ty_query(db: &dyn HirDatabase, impl_id: ImplId) -> Binde
     Binders::new(generics.len(), Ty::from_hir(&ctx, &impl_data.target_type))
 }
 
+pub(crate) fn const_param_ty_query(db: &dyn HirDatabase, def: ConstParamId) -> Ty {
+    let parent_data = db.generic_params(def.parent);
+    let data = &parent_data.consts[def.local_id];
+    let resolver = def.parent.resolver(db.upcast());
+    let ctx = TyLoweringContext::new(db, &resolver);
+
+    Ty::from_hir(&ctx, &data.ty)
+}
+
 pub(crate) fn impl_self_ty_recover(
     db: &dyn HirDatabase,
     _cycle: &[String],
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/hir_ty/src/tests/display_source_code.rs b/crates/hir_ty/src/tests/display_source_code.rs
index b502135d8..3d29021aa 100644
--- a/crates/hir_ty/src/tests/display_source_code.rs
+++ b/crates/hir_ty/src/tests/display_source_code.rs
@@ -39,3 +39,18 @@ fn main() {
 "#,
     );
 }
+
+#[test]
+fn render_raw_ptr_impl_ty() {
+    check_types_source_code(
+        r#"
+trait Sized {}
+trait Unpin {}
+fn foo() -> *const (impl Unpin + Sized) { loop {} }
+fn main() {
+    let foo = foo();
+    foo;
+}   //^ *const (impl Unpin + Sized)
+"#,
+    );
+}
diff --git a/crates/hir_ty/src/tests/macros.rs b/crates/hir_ty/src/tests/macros.rs
index a7656b864..c64f0b5b5 100644
--- a/crates/hir_ty/src/tests/macros.rs
+++ b/crates/hir_ty/src/tests/macros.rs
@@ -371,6 +371,37 @@ expand!();
 }
 
 #[test]
+fn infer_macro_with_dollar_crate_in_def_site() {
+    check_types(
+        r#"
+//- /main.rs crate:main deps:foo
+use foo::expand;
+
+macro_rules! list {
+    ($($tt:tt)*) => { $($tt)* }
+}
+
+fn test() {
+    let r = expand!();
+    r;
+  //^ u128
+}
+
+//- /lib.rs crate:foo
+#[macro_export]
+macro_rules! expand {
+    () => { list!($crate::m!()) };
+}
+
+#[macro_export]
+macro_rules! m {
+    () => { 0u128 };
+}
+"#,
+    );
+}
+
+#[test]
 fn infer_type_value_non_legacy_macro_use_as() {
     check_infer(
         r#"
@@ -540,6 +571,52 @@ fn bar() -> u32 {0}
 }
 
 #[test]
+fn infer_builtin_macros_include_str() {
+    check_types(
+        r#"
+//- /main.rs
+#[rustc_builtin_macro]
+macro_rules! include_str {() => {}}
+
+fn main() {
+    let a = include_str!("foo.rs");
+    a;
+} //^ &str
+
+//- /foo.rs
+hello
+"#,
+    );
+}
+
+#[test]
+fn infer_builtin_macros_include_str_with_lazy_nested() {
+    check_types(
+        r#"
+//- /main.rs
+#[rustc_builtin_macro]
+macro_rules! concat {() => {}}
+#[rustc_builtin_macro]
+macro_rules! include_str {() => {}}
+
+macro_rules! m {
+    ($x:expr) => {
+        concat!("foo", $x)
+    };
+}
+
+fn main() {
+    let a = include_str!(m!(".rs"));
+    a;
+} //^ &str
+
+//- /foo.rs
+hello
+"#,
+    );
+}
+
+#[test]
 #[ignore]
 fn include_accidentally_quadratic() {
     let file = project_dir().join("crates/syntax/test_data/accidentally_quadratic");
diff --git a/crates/hir_ty/src/tests/regression.rs b/crates/hir_ty/src/tests/regression.rs
index 307a257b1..cffe8630b 100644
--- a/crates/hir_ty/src/tests/regression.rs
+++ b/crates/hir_ty/src/tests/regression.rs
@@ -326,6 +326,24 @@ fn infer_paren_macro_call() {
 }
 
 #[test]
+fn infer_array_macro_call() {
+    check_infer(
+        r#"
+        macro_rules! bar { () => {0u32} }
+        fn test() {
+            let a = [bar!()];
+        }
+        "#,
+        expect![[r#"
+            !0..4 '0u32': u32
+            44..69 '{     ...()]; }': ()
+            54..55 'a': [u32; _]
+            58..66 '[bar!()]': [u32; _]
+        "#]],
+    );
+}
+
+#[test]
 fn bug_1030() {
     check_infer(
         r#"
diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index a61282d5a..8d431b920 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -2375,3 +2375,19 @@ fn infer_operator_overload() {
         "#]],
     );
 }
+
+#[test]
+fn infer_const_params() {
+    check_infer(
+        r#"
+        fn foo<const FOO: usize>() {
+            let bar = FOO;
+        }
+        "#,
+        expect![[r#"
+            27..49 '{     ...FOO; }': ()
+            37..40 'bar': usize
+            43..46 'FOO': usize
+        "#]],
+    );
+}
diff --git a/crates/hir_ty/src/tests/traits.rs b/crates/hir_ty/src/tests/traits.rs
index 41d097519..e5a3f95a6 100644
--- a/crates/hir_ty/src/tests/traits.rs
+++ b/crates/hir_ty/src/tests/traits.rs
@@ -3038,16 +3038,16 @@ fn infer_box_fn_arg() {
             406..417 '&self.inner': &*mut T
             407..411 'self': &Box<T>
             407..417 'self.inner': *mut T
-            478..575 '{     ...(&s) }': FnOnce::Output<dyn FnOnce<(&Option<i32>,)>, (&Option<i32>,)>
+            478..575 '{     ...(&s) }': FnOnce::Output<dyn FnOnce(&Option<i32>), (&Option<i32>,)>
             488..489 's': Option<i32>
             492..504 'Option::None': Option<i32>
-            514..515 'f': Box<dyn FnOnce<(&Option<i32>,)>>
+            514..515 'f': Box<dyn FnOnce(&Option<i32>)>
             549..562 'box (|ps| {})': Box<|{unknown}| -> ()>
             554..561 '|ps| {}': |{unknown}| -> ()
             555..557 'ps': {unknown}
             559..561 '{}': ()
-            568..569 'f': Box<dyn FnOnce<(&Option<i32>,)>>
-            568..573 'f(&s)': FnOnce::Output<dyn FnOnce<(&Option<i32>,)>, (&Option<i32>,)>
+            568..569 'f': Box<dyn FnOnce(&Option<i32>)>
+            568..573 'f(&s)': FnOnce::Output<dyn FnOnce(&Option<i32>), (&Option<i32>,)>
             570..572 '&s': &Option<i32>
             571..572 's': Option<i32>
         "#]],
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 4d483580d..bb28cca4d 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 [dependencies]
 either = "1.5.3"
 indexmap = "1.4.0"
-itertools = "0.9.0"
+itertools = "0.10.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 oorandom = "11.1.2"
@@ -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 60e0cd4ad..e8999a7f3 100644
--- a/crates/ide/src/call_hierarchy.rs
+++ b/crates/ide/src/call_hierarchy.rs
@@ -5,10 +5,10 @@ use indexmap::IndexMap;
 use hir::Semantics;
 use ide_db::call_info::FnCallNode;
 use ide_db::RootDatabase;
-use syntax::{ast, match_ast, AstNode, TextRange};
+use syntax::{ast, AstNode, TextRange};
 
 use crate::{
-    display::ToNav, goto_definition, references, FilePosition, NavigationTarget, RangeInfo,
+    display::TryToNav, goto_definition, references, FilePosition, NavigationTarget, RangeInfo,
 };
 
 #[derive(Debug, Clone)]
@@ -47,28 +47,23 @@ pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Optio
 
     let mut calls = CallLocations::default();
 
-    for reference in refs.info.references() {
-        let file_id = reference.file_range.file_id;
+    for (&file_id, references) in refs.info.references().iter() {
         let file = sema.parse(file_id);
         let file = file.syntax();
-        let token = file.token_at_offset(reference.file_range.range.start()).next()?;
-        let token = sema.descend_into_macros(token);
-        let syntax = token.parent();
-
-        // This target is the containing function
-        if let Some(nav) = syntax.ancestors().find_map(|node| {
-            match_ast! {
-                match node {
-                    ast::Fn(it) => {
-                        let def = sema.to_def(&it)?;
-                        Some(def.to_nav(sema.db))
-                    },
-                    _ => None,
-                }
+        for reference in references {
+            let token = file.token_at_offset(reference.range.start()).next()?;
+            let token = sema.descend_into_macros(token);
+            let syntax = token.parent();
+
+            // This target is the containing function
+            if let Some(nav) = syntax.ancestors().find_map(|node| {
+                let fn_ = ast::Fn::cast(node)?;
+                let def = sema.to_def(&fn_)?;
+                def.try_to_nav(sema.db)
+            }) {
+                let relative_range = reference.range;
+                calls.add(&nav, relative_range);
             }
-        }) {
-            let relative_range = reference.file_range.range;
-            calls.add(&nav, relative_range);
         }
     }
 
@@ -91,29 +86,21 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio
         .filter_map(|node| FnCallNode::with_node_exact(&node))
         .filter_map(|call_node| {
             let name_ref = call_node.name_ref()?;
-
-            if let Some(func_target) = match &call_node {
+            let func_target = match call_node {
                 FnCallNode::CallExpr(expr) => {
                     //FIXME: Type::as_callable is broken
                     let callable = sema.type_of_expr(&expr.expr()?)?.as_callable(db)?;
                     match callable.kind() {
-                        hir::CallableKind::Function(it) => {
-                            let fn_def: hir::Function = it.into();
-                            let nav = fn_def.to_nav(db);
-                            Some(nav)
-                        }
+                        hir::CallableKind::Function(it) => it.try_to_nav(db),
                         _ => None,
                     }
                 }
                 FnCallNode::MethodCallExpr(expr) => {
                     let function = sema.resolve_method_call(&expr)?;
-                    Some(function.to_nav(db))
+                    function.try_to_nav(db)
                 }
-            } {
-                Some((func_target, name_ref.syntax().text_range()))
-            } else {
-                None
-            }
+            }?;
+            Some((func_target, name_ref.syntax().text_range()))
         })
         .for_each(|(nav, range)| calls.add(&nav, range));
 
@@ -178,7 +165,7 @@ mod tests {
 //- /lib.rs
 fn callee() {}
 fn caller() {
-    call<|>ee();
+    call$0ee();
 }
 "#,
             "callee Function FileId(0) 0..14 3..9",
@@ -192,7 +179,7 @@ fn caller() {
         check_hierarchy(
             r#"
 //- /lib.rs
-fn call<|>ee() {}
+fn call$0ee() {}
 fn caller() {
     callee();
 }
@@ -210,7 +197,7 @@ fn caller() {
 //- /lib.rs
 fn callee() {}
 fn caller() {
-    call<|>ee();
+    call$0ee();
     callee();
 }
 "#,
@@ -227,7 +214,7 @@ fn caller() {
 //- /lib.rs
 fn callee() {}
 fn caller1() {
-    call<|>ee();
+    call$0ee();
 }
 
 fn caller2() {
@@ -250,7 +237,7 @@ fn caller2() {
 //- /lib.rs cfg:test
 fn callee() {}
 fn caller1() {
-    call<|>ee();
+    call$0ee();
 }
 
 #[cfg(test)]
@@ -281,7 +268,7 @@ mod foo;
 use foo::callee;
 
 fn caller() {
-    call<|>ee();
+    call$0ee();
 }
 
 //- /foo/mod.rs
@@ -299,7 +286,7 @@ pub fn callee() {}
             r#"
 //- /lib.rs
 fn callee() {}
-fn call<|>er() {
+fn call$0er() {
     callee();
     callee();
 }
@@ -318,7 +305,7 @@ fn call<|>er() {
 mod foo;
 use foo::callee;
 
-fn call<|>er() {
+fn call$0er() {
     callee();
 }
 
@@ -337,7 +324,7 @@ pub fn callee() {}
             r#"
 //- /lib.rs
 fn caller1() {
-    call<|>er2();
+    call$0er2();
 }
 
 fn caller2() {
@@ -365,7 +352,7 @@ fn a() {
 fn b() {}
 
 fn main() {
-    a<|>()
+    a$0()
 }
 "#,
             "a Function FileId(0) 0..18 3..4",
@@ -376,7 +363,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 d79f5c170..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,20 +158,20 @@ fn missing_record_expr_field_fix(
     let record_fields = match VariantDef::from(def_id) {
         VariantDef::Struct(s) => {
             module = s.module(sema.db);
-            let source = s.source(sema.db);
+            let source = s.source(sema.db)?;
             def_file_id = source.file_id;
             let fields = source.value.field_list()?;
             record_field_list(fields)?
         }
         VariantDef::Union(u) => {
             module = u.module(sema.db);
-            let source = u.source(sema.db);
+            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);
-            let source = e.source(sema.db);
+            let source = e.source(sema.db)?;
             def_file_id = source.file_id;
             let fields = source.value.field_list()?;
             record_field_list(fields)?
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index 6431e7d6d..4eecae697 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -24,6 +24,7 @@ pub enum SymbolKind {
     Impl,
     Field,
     TypeParam,
+    ConstParam,
     LifetimeParam,
     ValueParam,
     SelfParam,
@@ -209,21 +210,12 @@ impl ToNav for FileSymbol {
 impl TryToNav for Definition {
     fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
         match self {
-            Definition::Macro(it) => {
-                // FIXME: Currently proc-macro do not have ast-node,
-                // such that it does not have source
-                // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
-                if it.is_proc_macro() {
-                    return None;
-                }
-                Some(it.to_nav(db))
-            }
-            Definition::Field(it) => Some(it.to_nav(db)),
+            Definition::Macro(it) => it.try_to_nav(db),
+            Definition::Field(it) => it.try_to_nav(db),
             Definition::ModuleDef(it) => it.try_to_nav(db),
-            Definition::SelfType(it) => Some(it.to_nav(db)),
+            Definition::SelfType(it) => it.try_to_nav(db),
             Definition::Local(it) => Some(it.to_nav(db)),
-            Definition::TypeParam(it) => Some(it.to_nav(db)),
-            Definition::LifetimeParam(it) => Some(it.to_nav(db)),
+            Definition::GenericParam(it) => it.try_to_nav(db),
             Definition::Label(it) => Some(it.to_nav(db)),
         }
     }
@@ -231,18 +223,17 @@ impl TryToNav for Definition {
 
 impl TryToNav for hir::ModuleDef {
     fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let res = match self {
-            hir::ModuleDef::Module(it) => it.to_nav(db),
-            hir::ModuleDef::Function(it) => it.to_nav(db),
-            hir::ModuleDef::Adt(it) => it.to_nav(db),
-            hir::ModuleDef::Variant(it) => it.to_nav(db),
-            hir::ModuleDef::Const(it) => it.to_nav(db),
-            hir::ModuleDef::Static(it) => it.to_nav(db),
-            hir::ModuleDef::Trait(it) => it.to_nav(db),
-            hir::ModuleDef::TypeAlias(it) => it.to_nav(db),
-            hir::ModuleDef::BuiltinType(_) => return None,
-        };
-        Some(res)
+        match self {
+            hir::ModuleDef::Module(it) => Some(it.to_nav(db)),
+            hir::ModuleDef::Function(it) => it.try_to_nav(db),
+            hir::ModuleDef::Adt(it) => it.try_to_nav(db),
+            hir::ModuleDef::Variant(it) => it.try_to_nav(db),
+            hir::ModuleDef::Const(it) => it.try_to_nav(db),
+            hir::ModuleDef::Static(it) => it.try_to_nav(db),
+            hir::ModuleDef::Trait(it) => it.try_to_nav(db),
+            hir::ModuleDef::TypeAlias(it) => it.try_to_nav(db),
+            hir::ModuleDef::BuiltinType(_) => None,
+        }
     }
 }
 
@@ -277,13 +268,13 @@ impl ToNavFromAst for hir::Trait {
     const KIND: SymbolKind = SymbolKind::Trait;
 }
 
-impl<D> ToNav for D
+impl<D> TryToNav for D
 where
     D: HasSource + ToNavFromAst + Copy + HasAttrs,
     D::Ast: ast::NameOwner + ShortLabel,
 {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
-        let src = self.source(db);
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
         let mut res = NavigationTarget::from_named(
             db,
             src.as_ref().map(|it| it as &dyn ast::NameOwner),
@@ -291,7 +282,7 @@ where
         );
         res.docs = self.docs(db);
         res.description = src.value.short_label();
-        res
+        Some(res)
     }
 }
 
@@ -310,9 +301,9 @@ impl ToNav for hir::Module {
     }
 }
 
-impl ToNav for hir::Impl {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
-        let src = self.source(db);
+impl TryToNav for hir::Impl {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
         let derive_attr = self.is_builtin_derive(db);
         let frange = if let Some(item) = &derive_attr {
             item.syntax().original_file_range(db)
@@ -325,21 +316,21 @@ impl ToNav for hir::Impl {
             src.value.self_ty().map(|ty| src.with_value(ty.syntax()).original_file_range(db).range)
         };
 
-        NavigationTarget::from_syntax(
+        Some(NavigationTarget::from_syntax(
             frange.file_id,
             "impl".into(),
             focus_range,
             frange.range,
             SymbolKind::Impl,
-        )
+        ))
     }
 }
 
-impl ToNav for hir::Field {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
-        let src = self.source(db);
+impl TryToNav for hir::Field {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
 
-        match &src.value {
+        let field_source = match &src.value {
             FieldSource::Named(it) => {
                 let mut res =
                     NavigationTarget::from_named(db, src.with_value(it), SymbolKind::Field);
@@ -357,13 +348,14 @@ impl ToNav for hir::Field {
                     SymbolKind::Field,
                 )
             }
-        }
+        };
+        Some(field_source)
     }
 }
 
-impl ToNav for hir::MacroDef {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
-        let src = self.source(db);
+impl TryToNav for hir::MacroDef {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
         log::debug!("nav target {:#?}", src.value.syntax());
         let mut res = NavigationTarget::from_named(
             db,
@@ -371,26 +363,36 @@ impl ToNav for hir::MacroDef {
             SymbolKind::Macro,
         );
         res.docs = self.docs(db);
-        res
+        Some(res)
     }
 }
 
-impl ToNav for hir::Adt {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+impl TryToNav for hir::Adt {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
         match self {
-            hir::Adt::Struct(it) => it.to_nav(db),
-            hir::Adt::Union(it) => it.to_nav(db),
-            hir::Adt::Enum(it) => it.to_nav(db),
+            hir::Adt::Struct(it) => it.try_to_nav(db),
+            hir::Adt::Union(it) => it.try_to_nav(db),
+            hir::Adt::Enum(it) => it.try_to_nav(db),
         }
     }
 }
 
-impl ToNav for hir::AssocItem {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+impl TryToNav for hir::AssocItem {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
         match self {
-            AssocItem::Function(it) => it.to_nav(db),
-            AssocItem::Const(it) => it.to_nav(db),
-            AssocItem::TypeAlias(it) => it.to_nav(db),
+            AssocItem::Function(it) => it.try_to_nav(db),
+            AssocItem::Const(it) => it.try_to_nav(db),
+            AssocItem::TypeAlias(it) => it.try_to_nav(db),
+        }
+    }
+}
+
+impl TryToNav for hir::GenericParam {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        match self {
+            hir::GenericParam::TypeParam(it) => it.try_to_nav(db),
+            hir::GenericParam::ConstParam(it) => it.try_to_nav(db),
+            hir::GenericParam::LifetimeParam(it) => it.try_to_nav(db),
         }
     }
 }
@@ -444,9 +446,9 @@ impl ToNav for hir::Label {
     }
 }
 
-impl ToNav for hir::TypeParam {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
-        let src = self.source(db);
+impl TryToNav for hir::TypeParam {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
         let full_range = match &src.value {
             Either::Left(it) => it.syntax().text_range(),
             Either::Right(it) => it.syntax().text_range(),
@@ -455,7 +457,7 @@ impl ToNav for hir::TypeParam {
             Either::Left(_) => None,
             Either::Right(it) => it.name().map(|it| it.syntax().text_range()),
         };
-        NavigationTarget {
+        Some(NavigationTarget {
             file_id: src.file_id.original_file(db),
             name: self.name(db).to_string().into(),
             kind: Some(SymbolKind::TypeParam),
@@ -464,15 +466,15 @@ impl ToNav for hir::TypeParam {
             container_name: None,
             description: None,
             docs: None,
-        }
+        })
     }
 }
 
-impl ToNav for hir::LifetimeParam {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
-        let src = self.source(db);
+impl TryToNav for hir::LifetimeParam {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
         let full_range = src.value.syntax().text_range();
-        NavigationTarget {
+        Some(NavigationTarget {
             file_id: src.file_id.original_file(db),
             name: self.name(db).to_string().into(),
             kind: Some(SymbolKind::LifetimeParam),
@@ -481,7 +483,24 @@ impl ToNav for hir::LifetimeParam {
             container_name: None,
             description: None,
             docs: None,
-        }
+        })
+    }
+}
+
+impl TryToNav for hir::ConstParam {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
+        let full_range = src.value.syntax().text_range();
+        Some(NavigationTarget {
+            file_id: src.file_id.original_file(db),
+            name: self.name(db).to_string().into(),
+            kind: Some(SymbolKind::ConstParam),
+            full_range,
+            focus_range: src.value.name().map(|n| n.syntax().text_range()),
+            container_name: None,
+            description: None,
+            docs: None,
+        })
     }
 }
 
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 e10516f43..de10406bc 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -1,6 +1,6 @@
 //! Resolves and rewrites links in markdown documentation.
 
-use std::{convert::TryFrom, iter::once};
+use std::{convert::TryFrom, iter::once, ops::Range};
 
 use itertools::Itertools;
 use pulldown_cmark::{BrokenLink, CowStr, Event, InlineStr, LinkType, Options, Parser, Tag};
@@ -39,7 +39,7 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Defi
         if target.contains("://") {
             (target.to_string(), title.to_string())
         } else {
-            // Two posibilities:
+            // Two possibilities:
             // * path-based links: `../../module/struct.MyStruct.html`
             // * module-based links (AKA intra-doc links): `super::super::module::MyStruct`
             if let Some(rewritten) = rewrite_intra_doc_link(db, *definition, target, title) {
@@ -61,6 +61,30 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Defi
     out
 }
 
+pub(crate) fn extract_definitions_from_markdown(
+    markdown: &str,
+) -> Vec<(String, Option<hir::Namespace>, Range<usize>)> {
+    let mut res = vec![];
+    let mut cb = |link: BrokenLink| {
+        Some((
+            /*url*/ link.reference.to_owned().into(),
+            /*title*/ link.reference.to_owned().into(),
+        ))
+    };
+    let doc = Parser::new_with_broken_link_callback(markdown, Options::empty(), Some(&mut cb));
+    for (event, range) in doc.into_offset_iter() {
+        match event {
+            Event::Start(Tag::Link(_link_type, ref target, ref title)) => {
+                let link = if target.is_empty() { title } else { target };
+                let (link, ns) = parse_link(link);
+                res.push((link.to_string(), ns, range));
+            }
+            _ => {}
+        }
+    }
+    res
+}
+
 /// Remove all links in markdown documentation.
 pub(crate) fn remove_links(markdown: &str) -> String {
     let mut drop_link = false;
@@ -192,8 +216,7 @@ fn rewrite_intra_doc_link(
         Definition::Field(it) => it.resolve_doc_path(db, link, ns),
         Definition::SelfType(_)
         | Definition::Local(_)
-        | Definition::TypeParam(_)
-        | Definition::LifetimeParam(_)
+        | Definition::GenericParam(_)
         | Definition::Label(_) => return None,
     }?;
     let krate = resolved.module(db)?.krate();
@@ -419,7 +442,7 @@ fn get_symbol_fragment(db: &dyn HirDatabase, field_or_assoc: &FieldOrAssocItem)
                     function.as_assoc_item(db).map(|assoc| assoc.container(db)),
                     Some(AssocItemContainer::Trait(..))
                 );
-                // This distinction may get more complicated when specialisation is available.
+                // This distinction may get more complicated when specialization is available.
                 // Rustdoc makes this decision based on whether a method 'has defaultness'.
                 // Currently this is only the case for provided trait methods.
                 if is_trait_method && !function.has_body(db) {
@@ -463,7 +486,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"#]],
         );
@@ -473,7 +496,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"##]],
         );
@@ -486,7 +509,7 @@ pub fn fo<|>o() {}
 pub struct Foo;
 
 impl Foo {
-    pub fn met<|>hod() {}
+    pub fn met$0hod() {}
 }
 
 "#,
@@ -499,7 +522,7 @@ impl Foo {
         check(
             r#"
 pub trait Bar {
-    fn met<|>hod() {}
+    fn met$0hod() {}
 }
 
 "#,
@@ -512,7 +535,7 @@ pub trait Bar {
         check(
             r#"
 pub trait Foo {
-    fn met<|>hod();
+    fn met$0hod();
 }
 
 "#,
@@ -525,7 +548,7 @@ pub trait Foo {
         check(
             r#"
 pub struct Foo {
-    pub fie<|>ld: ()
+    pub fie$0ld: ()
 }
 
 "#,
@@ -538,7 +561,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"#]],
@@ -563,7 +586,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..cd4afc804 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/crates/ide/src/goto_definition.rs
@@ -1,14 +1,18 @@
 use either::Either;
-use hir::Semantics;
+use hir::{HasAttrs, ModuleDef, Semantics};
 use ide_db::{
     base_db::FileId,
-    defs::{NameClass, NameRefClass},
+    defs::{Definition, NameClass, NameRefClass},
     symbol_index, RootDatabase,
 };
-use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
+use syntax::{
+    ast, match_ast, AstNode, AstToken, SyntaxKind::*, SyntaxToken, TextSize, TokenAtOffset, T,
+};
 
 use crate::{
     display::{ToNav, TryToNav},
+    doc_links::extract_definitions_from_markdown,
+    runnables::doc_owner_to_def,
     FilePosition, NavigationTarget, RangeInfo, SymbolKind,
 };
 
@@ -30,6 +34,10 @@ pub(crate) fn goto_definition(
     let original_token = pick_best(file.token_at_offset(position.offset))?;
     let token = sema.descend_into_macros(original_token.clone());
     let parent = token.parent();
+    if let Some(comment) = ast::Comment::cast(token.clone()) {
+        let nav = def_for_doc_comment(&sema, position, &comment)?.try_to_nav(db)?;
+        return Some(RangeInfo::new(original_token.text_range(), vec![nav]));
+    }
 
     let nav_targets = match_ast! {
         match parent {
@@ -68,11 +76,58 @@ pub(crate) fn goto_definition(
     Some(RangeInfo::new(original_token.text_range(), nav_targets))
 }
 
+fn def_for_doc_comment(
+    sema: &Semantics<RootDatabase>,
+    position: FilePosition,
+    doc_comment: &ast::Comment,
+) -> Option<hir::ModuleDef> {
+    let parent = doc_comment.syntax().parent();
+    let (link, ns) = extract_positioned_link_from_comment(position, doc_comment)?;
+
+    let def = doc_owner_to_def(sema, parent)?;
+    match def {
+        Definition::ModuleDef(def) => match def {
+            ModuleDef::Module(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Function(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Adt(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Variant(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Const(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Static(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Trait(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::TypeAlias(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::BuiltinType(_) => return None,
+        },
+        Definition::Macro(it) => it.resolve_doc_path(sema.db, &link, ns),
+        Definition::Field(it) => it.resolve_doc_path(sema.db, &link, ns),
+        Definition::SelfType(_)
+        | Definition::Local(_)
+        | Definition::GenericParam(_)
+        | Definition::Label(_) => return None,
+    }
+}
+
+fn extract_positioned_link_from_comment(
+    position: FilePosition,
+    comment: &ast::Comment,
+) -> Option<(String, Option<hir::Namespace>)> {
+    let comment_range = comment.syntax().text_range();
+    let doc_comment = comment.doc_comment()?;
+    let def_links = extract_definitions_from_markdown(doc_comment);
+    let (def_link, ns, _) = def_links.iter().min_by_key(|(_, _, def_link_range)| {
+        let matched_position = comment_range.start() + TextSize::from(def_link_range.start as u32);
+        match position.offset.checked_sub(matched_position) {
+            Some(distance) => distance,
+            None => comment_range.end(),
+        }
+    })?;
+    Some((def_link.to_string(), ns.clone()))
+}
+
 fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
     return tokens.max_by_key(priority);
     fn priority(n: &SyntaxToken) -> usize {
         match n.kind() {
-            IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] => 2,
+            IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] | COMMENT => 2,
             kind if kind.is_trivia() => 0,
             _ => 1,
         }
@@ -166,7 +221,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 +234,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 +248,7 @@ mod tests {
             r#"
 struct Foo;
      //^^^
-enum E { X(Foo<|>) }
+enum E { X(Foo$0) }
 "#,
         );
     }
@@ -204,7 +259,7 @@ enum E { X(Foo<|>) }
             r#"
 struct Foo;
      //^^^
-enum E { X(<|>Foo) }
+enum E { X($0Foo) }
 "#,
         );
     }
@@ -217,7 +272,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 +288,7 @@ struct Foo;
         check(
             r#"
 //- /lib.rs
-mod <|>foo;
+mod $0foo;
 
 //- /foo.rs
 // empty
@@ -244,7 +299,7 @@ mod <|>foo;
         check(
             r#"
 //- /lib.rs
-mod <|>foo;
+mod $0foo;
 
 //- /foo/mod.rs
 // empty
@@ -260,7 +315,7 @@ mod <|>foo;
 macro_rules! foo { () => { () } }
            //^^^
 fn bar() {
-    <|>foo!();
+    $0foo!();
 }
 "#,
         );
@@ -273,7 +328,7 @@ fn bar() {
 //- /lib.rs
 use foo::foo;
 fn bar() {
-    <|>foo!();
+    $0foo!();
 }
 
 //- /foo/lib.rs
@@ -289,7 +344,7 @@ macro_rules! foo { () => { () } }
         check(
             r#"
 //- /lib.rs
-use foo::foo<|>;
+use foo::foo$0;
 
 //- /foo/lib.rs
 #[macro_export]
@@ -312,7 +367,7 @@ define_fn!(foo);
          //^^^
 
 fn bar() {
-   <|>foo();
+   $0foo();
 }
 "#,
         );
@@ -331,7 +386,7 @@ macro_rules! define_fn {
 //^^^^^^^^^^^^^
 
 fn bar() {
-   <|>foo();
+   $0foo();
 }
 "#,
         );
@@ -347,7 +402,7 @@ macro_rules! foo {() => {0}}
 
 fn bar() {
     match (0,1) {
-        (<|>foo!(), _) => {}
+        ($0foo!(), _) => {}
     }
 }
 "#,
@@ -363,7 +418,7 @@ macro_rules! foo {() => {0}}
            //^^^
 fn bar() {
     match 0 {
-        <|>foo!() => {}
+        $0foo!() => {}
     }
 }
 "#,
@@ -375,7 +430,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 +444,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 +465,7 @@ impl Foo {
 }
 
 fn bar(foo: &Foo) {
-    foo.frobnicate<|>();
+    foo.frobnicate$0();
 }
 "#,
         );
@@ -425,7 +480,7 @@ struct Foo {
 } //^^^^
 
 fn bar(foo: &Foo) {
-    foo.spam<|>;
+    foo.spam$0;
 }
 "#,
         );
@@ -442,7 +497,7 @@ struct Foo {
 
 fn bar() -> Foo {
     Foo {
-        spam<|>: 0,
+        spam$0: 0,
     }
 }
 "#,
@@ -459,7 +514,7 @@ struct Foo {
 } //^^^^
 
 fn bar(foo: Foo) -> Foo {
-    let Foo { spam<|>: _, } = foo
+    let Foo { spam$0: _, } = foo
 }
 "#,
         );
@@ -474,7 +529,7 @@ struct Foo { spam: u32 }
            //^^^^
 
 fn bar() -> Foo {
-    Foo { spam<|>: m!() }
+    Foo { spam$0: m!() }
 }
 ",
         );
@@ -489,7 +544,7 @@ struct Foo(u32);
 
 fn bar() {
     let foo = Foo(0);
-    foo.<|>0;
+    foo.$00;
 }
 "#,
         );
@@ -505,7 +560,7 @@ impl Foo {
 }    //^^^^^^^^^^
 
 fn bar(foo: &Foo) {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
         );
@@ -520,7 +575,7 @@ trait Foo {
 }    //^^^^^^^^^^
 
 fn bar() {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
         );
@@ -537,7 +592,7 @@ trait Trait {
 impl Trait for Foo {}
 
 fn bar() {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
         );
@@ -551,7 +606,7 @@ struct Foo;
 impl Foo {
    //^^^
     pub fn new() -> Self {
-        Self<|> {}
+        Self$0 {}
     }
 }
 "#,
@@ -561,7 +616,7 @@ impl Foo {
 struct Foo;
 impl Foo {
    //^^^
-    pub fn new() -> Self<|> {
+    pub fn new() -> Self$0 {
         Self {}
     }
 }
@@ -573,7 +628,7 @@ impl Foo {
 enum Foo { A }
 impl Foo {
    //^^^
-    pub fn new() -> Self<|> {
+    pub fn new() -> Self$0 {
         Foo::A
     }
 }
@@ -585,7 +640,7 @@ impl Foo {
 enum Foo { A }
 impl Foo {
    //^^^
-    pub fn thing(a: &Self<|>) {
+    pub fn thing(a: &Self$0) {
     }
 }
 "#,
@@ -603,7 +658,7 @@ trait Make {
 impl Make for Foo {
             //^^^
     fn new() -> Self {
-        Self<|> {}
+        Self$0 {}
     }
 }
 "#,
@@ -617,7 +672,7 @@ trait Make {
 }
 impl Make for Foo {
             //^^^
-    fn new() -> Self<|> {
+    fn new() -> Self$0 {
         Self {}
     }
 }
@@ -629,7 +684,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 +692,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 +715,7 @@ enum Foo<|> { Variant }
             r#"
 enum Foo {
     Variant1,
-    Variant2<|>,
+    Variant2$0,
   //^^^^^^^^
     Variant3,
 }
@@ -669,35 +724,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 +769,7 @@ fn foo() {}
  //^^^
 id! {
     fn bar() {
-        fo<|>o();
+        fo$0o();
     }
 }
 mod confuse_index { fn foo(); }
@@ -743,7 +798,7 @@ pub mod __export {
 fn foo() -> i8 {}
  //^^^
 fn test() {
-    format!("{}", fo<|>o())
+    format!("{}", fo$0o())
 }
 "#,
         );
@@ -761,7 +816,7 @@ macro_rules! include {}
 //^^^^^^^^^^^^^^^^^^^
 
 fn f() {
-    foo<|>();
+    foo$0();
 }
 
 mod confuse_index {
@@ -778,7 +833,7 @@ fn foo() {}
     fn goto_for_type_param() {
         check(
             r#"
-struct Foo<T: Clone> { t: <|>T }
+struct Foo<T: Clone> { t: $0T }
          //^
 "#,
         );
@@ -796,7 +851,7 @@ fn foo() {
     let x = 1;
       //^
     id!({
-        let y = <|>x;
+        let y = $0x;
         let z = y;
     });
 }
@@ -814,7 +869,7 @@ fn foo() {
     id!({
         let y = x;
           //^
-        let z = <|>y;
+        let z = $0y;
     });
 }
 "#,
@@ -829,7 +884,7 @@ fn main() {
     fn foo() {
         let x = 92;
           //^
-        <|>x;
+        $0x;
     }
 }
 "#,
@@ -843,7 +898,7 @@ fn main() {
 fn bar() {
     macro_rules! foo { () => { () } }
                //^^^
-    <|>foo!();
+    $0foo!();
 }
 "#,
         );
@@ -857,7 +912,7 @@ struct Foo { x: i32 }
 fn main() {
     let x = 92;
       //^
-    Foo { x<|> };
+    Foo { x$0 };
 }
 "#,
         )
@@ -872,7 +927,7 @@ enum Foo {
 }       //^
 fn baz(foo: Foo) {
     match foo {
-        Foo::Bar { x<|> } => x
+        Foo::Bar { x$0 } => x
     };
 }
 "#,
@@ -887,7 +942,7 @@ enum Foo { Bar }
          //^^^
 impl Foo {
     fn baz(self) {
-        match self { Self::Bar<|> => {} }
+        match self { Self::Bar$0 => {} }
     }
 }
 "#,
@@ -902,7 +957,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 +971,7 @@ impl Foo {
 enum Foo { Bar }
          //^^^
 impl Foo {
-    fn baz(self) { Self::Bar<|>; }
+    fn baz(self) { Self::Bar$0; }
 }
 "#,
         );
@@ -929,7 +984,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 +994,7 @@ impl Foo {
     fn goto_def_for_type_alias_generic_parameter() {
         check(
             r#"
-type Alias<T> = T<|>;
+type Alias<T> = T$0;
          //^
 "#,
         )
@@ -950,7 +1005,7 @@ type Alias<T> = T<|>;
         check(
             r#"
 //- /lib.rs
-foo::module<|>::mac!();
+foo::module$0::mac!();
 
 //- /foo/lib.rs
 pub mod module {
@@ -972,7 +1027,7 @@ trait Iterator {
        //^^^^
 }
 
-fn f() -> impl Iterator<Item<|> = u8> {}
+fn f() -> impl Iterator<Item$0 = u8> {}
 "#,
         );
     }
@@ -987,7 +1042,7 @@ trait Iterator {
     type B;
 }
 
-fn f() -> impl Iterator<A<|> = u8, B = ()> {}
+fn f() -> impl Iterator<A$0 = u8, B = ()> {}
 "#,
         );
         check(
@@ -998,7 +1053,7 @@ trait Iterator {
        //^
 }
 
-fn f() -> impl Iterator<A = u8, B<|> = ()> {}
+fn f() -> impl Iterator<A = u8, B$0 = ()> {}
 "#,
         );
     }
@@ -1012,7 +1067,7 @@ trait Iterator {
        //^^^^
 }
 
-fn g() -> <() as Iterator<Item<|> = ()>>::Item {}
+fn g() -> <() as Iterator<Item$0 = ()>>::Item {}
 "#,
         );
     }
@@ -1027,7 +1082,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 +1093,7 @@ trait Iterator {
        //^
 }
 
-fn g() -> <() as Iterator<A = (), B<|> = u8>>::A {}
+fn g() -> <() as Iterator<A = (), B$0 = u8>>::A {}
 "#,
         );
     }
@@ -1052,7 +1107,7 @@ struct Foo {}
 impl Foo {
     fn bar(self: &Foo) {
          //^^^^
-        let foo = sel<|>f;
+        let foo = sel$0f;
     }
 }"#,
         )
@@ -1065,7 +1120,7 @@ impl Foo {
 struct Foo {}
 
 impl Foo {
-    fn bar(&self<|>) {
+    fn bar(&self$0) {
           //^^^^
     }
 }"#,
@@ -1076,7 +1131,7 @@ impl Foo {
     fn goto_lifetime_param_on_decl() {
         check(
             r#"
-fn foo<'foobar<|>>(_: &'foobar ()) {
+fn foo<'foobar$0>(_: &'foobar ()) {
      //^^^^^^^
 }"#,
         )
@@ -1086,7 +1141,7 @@ fn foo<'foobar<|>>(_: &'foobar ()) {
     fn goto_lifetime_param_decl() {
         check(
             r#"
-fn foo<'foobar>(_: &'foobar<|> ()) {
+fn foo<'foobar>(_: &'foobar$0 ()) {
      //^^^^^^^
 }"#,
         )
@@ -1097,7 +1152,7 @@ fn foo<'foobar>(_: &'foobar<|> ()) {
         check(
             r#"
 fn foo<'foobar>(_: &'foobar ()) {
-    fn foo<'foobar>(_: &'foobar<|> ()) {}
+    fn foo<'foobar>(_: &'foobar$0 ()) {}
          //^^^^^^^
 }"#,
         )
@@ -1108,13 +1163,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 +1180,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,10 +1194,40 @@ fn foo<'foo>(_: &'foo ()) {
     'foo: {
   //^^^^
         'bar: loop {
-            break 'foo<|>;
+            break 'foo$0;
         }
     }
 }"#,
         )
     }
+
+    #[test]
+    fn goto_def_for_intra_doc_link_same_file() {
+        check(
+            r#"
+/// Blah, [`bar`](bar) .. [`foo`](foo)$0 has [`bar`](bar)
+pub fn bar() { }
+
+/// You might want to see [`std::fs::read()`] too.
+pub fn foo() { }
+     //^^^
+
+}"#,
+        )
+    }
+
+    #[test]
+    fn goto_def_for_intra_doc_link_inner() {
+        check(
+            r#"
+//- /main.rs
+mod m;
+struct S;
+     //^
+
+//- /m.rs
+//! [`super::S$0`]
+"#,
+        )
+    }
 }
diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs
index 6eac39639..761a98b2c 100644
--- a/crates/ide/src/goto_implementation.rs
+++ b/crates/ide/src/goto_implementation.rs
@@ -2,7 +2,7 @@ use hir::{Crate, Impl, Semantics};
 use ide_db::RootDatabase;
 use syntax::{algo::find_node_at_offset, ast, AstNode};
 
-use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
+use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
 
 // Feature: Go to Implementation
 //
@@ -55,7 +55,7 @@ fn impls_for_def(
         impls
             .into_iter()
             .filter(|impl_def| ty.is_equal_for_find_impls(&impl_def.target_ty(sema.db)))
-            .map(|imp| imp.to_nav(sema.db))
+            .filter_map(|imp| imp.try_to_nav(sema.db))
             .collect(),
     )
 }
@@ -69,7 +69,7 @@ fn impls_for_trait(
 
     let impls = Impl::for_trait(sema.db, krate, tr);
 
-    Some(impls.into_iter().map(|imp| imp.to_nav(sema.db)).collect())
+    Some(impls.into_iter().filter_map(|imp| imp.try_to_nav(sema.db)).collect())
 }
 
 #[cfg(test)]
@@ -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 aba6bf5dc..369a59820 100644
--- a/crates/ide/src/goto_type_definition.rs
+++ b/crates/ide/src/goto_type_definition.rs
@@ -1,7 +1,7 @@
 use ide_db::RootDatabase;
 use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
 
-use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
+use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
 
 // Feature: Go to Type Definition
 //
@@ -37,7 +37,7 @@ pub(crate) fn goto_type_definition(
 
     let adt_def = ty.autoderef(db).filter_map(|ty| ty.as_adt()).last()?;
 
-    let nav = adt_def.to_nav(db);
+    let nav = adt_def.try_to_nav(db)?;
     Some(RangeInfo::new(node.text_range(), vec![nav]))
 }
 
@@ -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 73245fbe7..317b6f011 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -1,6 +1,6 @@
 use hir::{
-    Adt, AsAssocItem, AssocItemContainer, FieldSource, HasAttrs, HasSource, HirDisplay, Module,
-    ModuleDef, ModuleSource, Semantics,
+    Adt, AsAssocItem, AssocItemContainer, FieldSource, GenericParam, HasAttrs, HasSource,
+    HirDisplay, Module, ModuleDef, ModuleSource, Semantics,
 };
 use ide_db::base_db::SourceDatabase;
 use ide_db::{
@@ -13,11 +13,11 @@ use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset,
 use test_utils::mark;
 
 use crate::{
-    display::{macro_label, ShortLabel, ToNav, TryToNav},
+    display::{macro_label, ShortLabel, TryToNav},
     doc_links::{remove_links, rewrite_links},
     markdown_remove::remove_markdown,
     markup::Markup,
-    runnables::runnable,
+    runnables::{runnable_fn, runnable_mod},
     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>),
 }
 
@@ -109,17 +96,20 @@ pub(crate) fn hover(
         match node {
             ast::Name(name) => NameClass::classify(&sema, &name).and_then(|d| d.defined(sema.db)),
             ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced(sema.db)),
+            ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime)
+                .map_or_else(|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced(sema.db)), |d| d.defined(sema.db)),
             _ => None,
         }
     };
     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) {
@@ -173,22 +163,19 @@ 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.to_nav(db))),
-            ModuleDef::Adt(Adt::Union(it)) => Some(to_action(it.to_nav(db))),
-            ModuleDef::Adt(Adt::Enum(it)) => Some(to_action(it.to_nav(db))),
-            ModuleDef::Trait(it) => Some(to_action(it.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,
-    }
+    }?;
+    adt.try_to_nav(db).map(to_action)
 }
 
 fn runnable_action(
@@ -199,21 +186,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_mod(&sema, it).map(|it| HoverAction::Runnable(it))
+                }
                 _ => None,
             },
-            ModuleDef::Function(it) => {
-                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,
         },
@@ -222,45 +208,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::GenericParam(GenericParam::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::GenericParam(GenericParam::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(
@@ -324,17 +311,11 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
     let mod_path = definition_mod_path(db, &def);
     return match def {
         Definition::Macro(it) => {
-            // FIXME: Currently proc-macro do not have ast-node,
-            // such that it does not have source
-            // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
-            if it.is_proc_macro() {
-                return None;
-            }
-            let label = macro_label(&it.source(db).value);
+            let label = macro_label(&it.source(db)?.value);
             from_def_source_labeled(db, it, Some(label), mod_path)
         }
         Definition::Field(def) => {
-            let src = def.source(db).value;
+            let src = def.source(db)?.value;
             if let FieldSource::Named(it) = src {
                 from_def_source_labeled(db, def, it.short_label(), mod_path)
             } else {
@@ -360,9 +341,9 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
             ModuleDef::Static(it) => from_def_source(db, it, mod_path),
             ModuleDef::Trait(it) => from_def_source(db, it, mod_path),
             ModuleDef::TypeAlias(it) => from_def_source(db, it, mod_path),
-            ModuleDef::BuiltinType(it) => return Some(it.to_string().into()),
+            ModuleDef::BuiltinType(it) => Some(Markup::fenced_block(&it)),
         },
-        Definition::Local(it) => return Some(Markup::fenced_block(&it.ty(db).display(db))),
+        Definition::Local(it) => Some(Markup::fenced_block(&it.ty(db).display(db))),
         Definition::SelfType(impl_def) => {
             impl_def.target_ty(db).as_adt().and_then(|adt| match adt {
                 Adt::Struct(it) => from_def_source(db, it, mod_path),
@@ -370,10 +351,12 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
                 Adt::Enum(it) => from_def_source(db, it, mod_path),
             })
         }
-        Definition::TypeParam(_) | Definition::LifetimeParam(_) | Definition::Label(_) => {
-            // FIXME: Hover for generic param
-            None
-        }
+        Definition::Label(it) => Some(Markup::fenced_block(&it.name(db))),
+        Definition::GenericParam(it) => match it {
+            GenericParam::TypeParam(it) => Some(Markup::fenced_block(&it.display(db))),
+            GenericParam::LifetimeParam(it) => Some(Markup::fenced_block(&it.name(db))),
+            GenericParam::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 +364,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
         D: HasSource<Ast = A> + HasAttrs + Copy,
         A: ShortLabel,
     {
-        let short_label = def.source(db).value.short_label();
+        let short_label = def.source(db)?.value.short_label();
         from_def_source_labeled(db, def, short_label, mod_path)
     }
 
@@ -403,7 +386,7 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
     return tokens.max_by_key(priority);
     fn priority(n: &SyntaxToken) -> usize {
         match n.kind() {
-            IDENT | INT_NUMBER => 3,
+            IDENT | INT_NUMBER | LIFETIME_IDENT => 3,
             T!['('] | T![')'] => 2,
             kind if kind.is_trivia() => 0,
             _ => 1,
@@ -471,7 +454,7 @@ mod tests {
 pub fn foo() -> u32 { 1 }
 
 fn main() {
-    let foo_test = foo()<|>;
+    let foo_test = foo()$0;
 }
 "#,
             expect![[r#"
@@ -490,7 +473,7 @@ fn main() {
 pub fn foo() -> u32 { 1 }
 
 fn main() {
-    let foo_test = foo()<|>;
+    let foo_test = foo()$0;
 }
 "#,
             expect![[r#"
@@ -520,7 +503,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#"
@@ -540,7 +523,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*
@@ -572,7 +555,7 @@ mod a;
 mod b;
 mod c;
 
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
         "#,
             expect![[r#"
                 *foo*
@@ -589,7 +572,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*
@@ -609,7 +592,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() { }
 "#,
@@ -637,7 +620,7 @@ fn main() { }
 /// #
 /// foo(Path::new("hello, world!"))
 /// ```
-pub fn foo<|>(_: &Path) {}
+pub fn foo$0(_: &Path) {}
 
 fn main() { }
 "#,
@@ -670,7 +653,7 @@ fn main() { }
         check(
             r##"
 #[doc = r#"Raw string doc attr"#]
-pub fn foo<|>(_: &Path) {}
+pub fn foo$0(_: &Path) {}
 
 fn main() { }
 "##,
@@ -700,7 +683,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#"
@@ -719,7 +702,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 };
@@ -742,7 +725,7 @@ fn main() {
     #[test]
     fn hover_const_static() {
         check(
-            r#"const foo<|>: u32 = 123;"#,
+            r#"const foo$0: u32 = 123;"#,
             expect![[r#"
                 *foo*
 
@@ -756,7 +739,7 @@ fn main() {
             "#]],
         );
         check(
-            r#"static foo<|>: u32 = 456;"#,
+            r#"static foo$0: u32 = 456;"#,
             expect![[r#"
                 *foo*
 
@@ -778,7 +761,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*
@@ -797,7 +780,7 @@ fn main() {
 enum Option<T> { Some(T) }
 use Option::Some;
 
-fn main() { So<|>me(12); }
+fn main() { So$0me(12); }
 "#,
             expect![[r#"
                 *Some*
@@ -817,7 +800,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*
@@ -835,7 +818,7 @@ fn main() { let b<|>ar = Some(12); }
             r#"
 enum Option<T> {
     /// The None variant
-    Non<|>e
+    Non$0e
 }
 "#,
             expect![[r#"
@@ -862,7 +845,7 @@ enum Option<T> {
     Some(T)
 }
 fn main() {
-    let s = Option::Som<|>e(12);
+    let s = Option::Som$0e(12);
 }
 "#,
             expect![[r#"
@@ -886,7 +869,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*
 
@@ -900,7 +883,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*
 
@@ -914,7 +897,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*
 
@@ -928,7 +911,7 @@ fn main() {
     #[test]
     fn hover_for_param_edge() {
         check(
-            r#"fn func(<|>foo: i32) {}"#,
+            r#"fn func($0foo: i32) {}"#,
             expect![[r#"
                 *foo*
 
@@ -948,7 +931,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*
 
@@ -969,7 +952,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*
@@ -993,7 +976,7 @@ mod wrapper {
     }
 }
 
-fn main() { let foo_test = wrapper::Thing::new<|>(); }
+fn main() { let foo_test = wrapper::Thing::new$0(); }
 "#,
             expect![[r#"
                 *new*
@@ -1020,7 +1003,7 @@ impl X {
 
 fn main() {
     match 1 {
-        X::C<|> => {},
+        X::C$0 => {},
         2 => {},
         _ => {}
     };
@@ -1046,7 +1029,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#"
@@ -1065,7 +1048,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#"
@@ -1084,7 +1067,7 @@ impl Thing {
             r#"
 enum Thing { A }
 impl Thing {
-    pub fn new() -> Self<|> { Thing::A }
+    pub fn new() -> Self$0 { Thing::A }
 }
 "#,
             expect![[r#"
@@ -1103,7 +1086,7 @@ impl Thing {
             r#"
         enum Thing { A }
         impl Thing {
-            pub fn thing(a: Self<|>) {}
+            pub fn thing(a: Self$0) {}
         }
         "#,
             expect![[r#"
@@ -1128,7 +1111,7 @@ fn x() {}
 
 fn y() {
     let x = 0i32;
-    x<|>;
+    x$0;
 }
 "#,
             expect![[r#"
@@ -1147,7 +1130,7 @@ fn y() {
             r#"
 macro_rules! foo { () => {} }
 
-fn f() { fo<|>o!(); }
+fn f() { fo$0o!(); }
 "#,
             expect![[r#"
                 *foo*
@@ -1166,10 +1149,13 @@ 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*
+
+                ```rust
                 i32
+                ```
             "#]],
         )
     }
@@ -1181,7 +1167,7 @@ fn f() { fo<|>o!(); }
 macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
 fn foo() {}
 id! {
-    fn bar() { fo<|>o(); }
+    fn bar() { fo$0o(); }
 }
 "#,
             expect![[r#"
@@ -1203,7 +1189,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*
@@ -1221,7 +1207,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*
@@ -1240,7 +1226,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()*
@@ -1258,7 +1244,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#"
@@ -1279,7 +1265,7 @@ macro_rules! assert {}
 
 fn bar() -> bool { true }
 fn foo() {
-    assert!(ba<|>r());
+    assert!(ba$0r());
 }
 "#,
             expect![[r#"
@@ -1304,7 +1290,7 @@ fn foo() {
             macro_rules! format {}
 
             fn foo() {
-                format!("hel<|>lo {}", 0);
+                format!("hel$0lo {}", 0);
             }
             "#,
         );
@@ -1317,7 +1303,7 @@ fn foo() {
 ///　<- `\u{3000}` here
 fn foo() { }
 
-fn bar() { fo<|>o(); }
+fn bar() { fo$0o(); }
 ",
             expect![[r#"
                 *foo*
@@ -1340,7 +1326,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*
 
@@ -1354,7 +1340,7 @@ fn bar() { fo<|>o(); }
             "#]],
         );
         check(
-            r#"pub const unsafe fn foo<|>() {}"#,
+            r#"pub const unsafe fn foo$0() {}"#,
             expect![[r#"
                 *foo*
 
@@ -1368,7 +1354,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*
 
@@ -1386,10 +1372,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,
@@ -1407,7 +1393,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
 //!
@@ -1425,7 +1411,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
 //!
@@ -1446,7 +1432,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() {}
@@ -1472,7 +1458,7 @@ fn my() {}
 /// bar docs
 struct Bar;
 
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
             expect![[r#"
                 *Bar*
@@ -1499,7 +1485,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*
@@ -1528,7 +1514,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*
@@ -1556,7 +1542,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*
@@ -1582,7 +1568,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*
@@ -1610,7 +1596,7 @@ pub struct B<|>ar
 pub struct Foo;
 pub struct Bar {
     /// [Foo](struct.Foo.html)
-    fie<|>ld: ()
+    fie$0ld: ()
 }
 "#,
             expect![[r#"
@@ -1639,7 +1625,7 @@ pub mod foo {
     pub struct Foo;
 }
 /// [Foo](foo::Foo)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1669,7 +1655,7 @@ pub mod foo {
     pub struct Foo;
 }
 /// [Foo](foo::Foo)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1695,7 +1681,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [Foo]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1721,7 +1707,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [`Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1748,7 +1734,7 @@ pub struct B<|>ar
 pub struct Foo;
 fn Foo() {}
 /// [Foo()]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1774,7 +1760,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [`struct Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1800,7 +1786,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [`struct@Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1828,7 +1814,7 @@ pub struct Foo;
 /// [my Foo][foo]
 ///
 /// [foo]: Foo
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1854,7 +1840,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*
@@ -1881,7 +1867,7 @@ pub struct B<|>ar
             r#"
 pub struct Foo;
 /// [baz](Baz)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
             expect![[r#"
                 *Bar*
@@ -1907,7 +1893,7 @@ pub struct B<|>ar
             r#"
 enum E {
     /// [E]
-    V<|> { field: i32 }
+    V$0 { field: i32 }
 }
 "#,
             expect![[r#"
@@ -1934,7 +1920,7 @@ enum E {
             r#"
 struct S {
     /// [`S`]
-    field<|>: i32
+    field$0: i32
 }
 "#,
             expect![[r#"
@@ -1962,16 +1948,16 @@ struct S {
 /// Test cases:
 /// case 1.  bare URL: https://www.example.com/
 /// case 2.  inline URL with title: [example](https://www.example.com/)
-/// case 3.  code refrence: [`Result`]
-/// case 4.  code refrence but miss footnote: [`String`]
+/// case 3.  code reference: [`Result`]
+/// case 4.  code reference but miss footnote: [`String`]
 /// case 5.  autolink: <http://www.example.com/>
 /// case 6.  email address: <[email protected]>
-/// case 7.  refrence: [example][example]
+/// case 7.  reference: [example][example]
 /// case 8.  collapsed link: [example][]
 /// case 9.  shortcut link: [example]
 /// case 10. inline without URL: [example]()
-/// case 11. refrence: [foo][foo]
-/// case 12. refrence: [foo][bar]
+/// case 11. reference: [foo][foo]
+/// case 12. reference: [foo][bar]
 /// case 13. collapsed link: [foo][]
 /// case 14. shortcut link: [foo]
 /// case 15. inline without URL: [foo]()
@@ -1980,7 +1966,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*
@@ -1998,16 +1984,16 @@ pub fn fo<|>o() {}
                 Test cases:
                 case 1.  bare URL: https://www.example.com/
                 case 2.  inline URL with title: [example](https://www.example.com/)
-                case 3.  code refrence: `Result`
-                case 4.  code refrence but miss footnote: `String`
+                case 3.  code reference: `Result`
+                case 4.  code reference but miss footnote: `String`
                 case 5.  autolink: http://www.example.com/
                 case 6.  email address: [email protected]
-                case 7.  refrence: example
+                case 7.  reference: example
                 case 8.  collapsed link: example
                 case 9.  shortcut link: example
                 case 10. inline without URL: example
-                case 11. refrence: foo
-                case 12. refrence: foo
+                case 11. reference: foo
+                case 12. reference: foo
                 case 13. collapsed link: foo
                 case 14. shortcut link: foo
                 case 15. inline without URL: foo
@@ -2037,7 +2023,7 @@ macro_rules! bar {
 
 bar!();
 
-fn foo() { let bar = Bar; bar.fo<|>o(); }
+fn foo() { let bar = Bar; bar.fo$0o(); }
 "#,
             expect![[r#"
                 *foo*
@@ -2075,7 +2061,7 @@ macro_rules! bar {
 
 bar!();
 
-fn foo() { let bar = Bar; bar.fo<|>o(); }
+fn foo() { let bar = Bar; bar.fo$0o(); }
 "#,
             expect![[r#"
                 *foo*
@@ -2098,10 +2084,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,
@@ -2117,10 +2103,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,
@@ -2136,10 +2122,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,
@@ -2155,10 +2141,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,
@@ -2172,11 +2158,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#"
                 [
@@ -2211,7 +2216,7 @@ fn foo_<|>test() {}
     fn test_hover_test_mod_has_action() {
         check_actions(
             r#"
-mod tests<|> {
+mod tests$0 {
     #[test]
     fn foo_test() {}
 }
@@ -2246,7 +2251,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#"
                 [
@@ -2279,7 +2284,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#"
                 [
@@ -2325,7 +2330,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#"
                 [
@@ -2374,7 +2379,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#"
                 [
@@ -2433,7 +2438,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#"
                 [
@@ -2467,7 +2472,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#"
                 [
@@ -2514,7 +2519,7 @@ trait Foo {}
 trait Bar {}
 fn foo() -> impl Foo + Bar {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
             "#,
             expect![[r#"
                 [
@@ -2564,7 +2569,7 @@ struct S2 {}
 
 fn foo() -> impl Foo<S1> + Bar<S2> {}
 
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
             expect![[r#"
                 [
@@ -2634,7 +2639,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#"
                 [
@@ -2668,7 +2673,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#"
                 [
@@ -2726,7 +2731,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::*;
@@ -2778,7 +2783,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#"
                 [
@@ -2828,7 +2833,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#"
                 [
@@ -2872,7 +2877,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#"
                 [
@@ -2904,7 +2909,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#"
                 [
@@ -2952,7 +2957,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#"
                 [
@@ -3033,7 +3038,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#"
                 [
@@ -3060,6 +3065,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#"
@@ -3073,7 +3143,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*
@@ -3099,7 +3169,7 @@ struct S {
 
 fn main() {
     let s = S { f: 0 };
-    let S { f<|> } = &s;
+    let S { f$0 } = &s;
 }
 "#,
             expect![[r#"
@@ -3118,7 +3188,7 @@ fn main() {
             r#"
 struct Foo {}
 impl Foo {
-    fn bar(&sel<|>f) {}
+    fn bar(&sel$0f) {}
 }
 "#,
             expect![[r#"
@@ -3137,7 +3207,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#"
@@ -3154,7 +3224,7 @@ impl Foo {
         check(
             r#"
 /// Be quick;
-mod Foo<|> {
+mod Foo$0 {
     //! time is mana
 
     /// This comment belongs to the function
@@ -3185,7 +3255,7 @@ mod Foo<|> {
         check(
             r#"
 #[doc = "Be quick;"]
-mod Foo<|> {
+mod Foo$0 {
     #![doc = "time is mana"]
 
     #[doc = "This comment belongs to the function"]
@@ -3216,9 +3286,105 @@ mod Foo<|> {
         check_hover_no_result(
             r#"
 fn no_hover() {
-    // no<|>hover
+    // no$0hover
 }
 "#,
         );
     }
+
+    #[test]
+    fn hover_label() {
+        check(
+            r#"
+fn foo() {
+    'label$0: loop {}
+}
+"#,
+            expect![[r#"
+            *'label*
+
+            ```rust
+            'label
+            ```
+            "#]],
+        );
+    }
+
+    #[test]
+    fn hover_lifetime() {
+        check(
+            r#"fn foo<'lifetime>(_: &'lifetime$0 ()) {}"#,
+            expect![[r#"
+            *'lifetime*
+
+            ```rust
+            'lifetime
+            ```
+            "#]],
+        );
+    }
+
+    #[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..a2039fcc7 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,
@@ -359,9 +353,25 @@ fn is_argument_similar_to_param_name(
     }
     match get_string_representation(argument) {
         None => false,
-        Some(repr) => {
-            let argument_string = repr.trim_start_matches('_');
-            argument_string.starts_with(param_name) || argument_string.ends_with(param_name)
+        Some(argument_string) => {
+            let num_leading_underscores =
+                argument_string.bytes().take_while(|&c| c == b'_').count();
+
+            // Does the argument name begin with the parameter name? Ignore leading underscores.
+            let mut arg_bytes = argument_string.bytes().skip(num_leading_underscores);
+            let starts_with_pattern = param_name.bytes().all(
+                |expected| matches!(arg_bytes.next(), Some(actual) if expected.eq_ignore_ascii_case(&actual)),
+            );
+
+            if starts_with_pattern {
+                return true;
+            }
+
+            // Does the argument name end with the parameter name?
+            let mut arg_bytes = argument_string.bytes().skip(num_leading_underscores);
+            param_name.bytes().rev().all(
+                |expected| matches!(arg_bytes.next_back(), Some(actual) if expected.eq_ignore_ascii_case(&actual)),
+            )
         }
     }
 }
@@ -433,8 +443,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 +765,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 +848,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) {}
@@ -900,6 +917,9 @@ fn main() {
     twiddle(true);
     doo(true);
 
+    const TWIDDLE_UPPERCASE: bool = true;
+    twiddle(TWIDDLE_UPPERCASE);
+
     let mut param_begin: Param = Param {};
     different_order(&param_begin);
     different_order(&mut param_begin);
@@ -924,7 +944,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::*;
@@ -1381,4 +1401,41 @@ fn main() {
 "#,
         )
     }
+
+    #[test]
+    fn fn_hints() {
+        check(
+            r#"
+trait Sized {}
+
+fn foo() -> impl Fn() { loop {} }
+fn foo1() -> impl Fn(f64) { loop {} }
+fn foo2() -> impl Fn(f64, f64) { loop {} }
+fn foo3() -> impl Fn(f64, f64) -> u32 { loop {} }
+fn foo4() -> &'static dyn Fn(f64, f64) -> u32 { loop {} }
+fn foo5() -> &'static dyn Fn(&'static dyn Fn(f64, f64) -> u32, f64) -> u32 { loop {} }
+fn foo6() -> impl Fn(f64, f64) -> u32 + Sized { loop {} }
+fn foo7() -> *const (impl Fn(f64, f64) -> u32 + Sized) { loop {} }
+
+fn main() {
+    let foo = foo();
+     // ^^^ impl Fn()
+    let foo = foo1();
+     // ^^^ impl Fn(f64)
+    let foo = foo2();
+     // ^^^ impl Fn(f64, f64)
+    let foo = foo3();
+     // ^^^ impl Fn(f64, f64) -> u32
+    let foo = foo4();
+     // ^^^ &dyn Fn(f64, f64) -> u32
+    let foo = foo5();
+     // ^^^ &dyn Fn(&dyn Fn(f64, f64) -> u32, f64) -> u32
+    let foo = foo6();
+     // ^^^ impl Fn(f64, f64) -> u32 + Sized
+    let foo = foo7();
+     // ^^^ *const (impl Fn(f64, f64) -> u32 + Sized)
+}
+"#,
+        )
+    }
 }
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 b3331f03f..1e03832ec 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -31,6 +31,7 @@ mod folding_ranges;
 mod goto_definition;
 mod goto_implementation;
 mod goto_type_definition;
+mod view_hir;
 mod hover;
 mod inlay_hints;
 mod join_lines;
@@ -75,14 +76,14 @@ pub use crate::{
     references::{rename::RenameError, Declaration, ReferenceSearchResult},
     runnables::{Runnable, RunnableKind, TestId},
     syntax_highlighting::{
-        tags::{Highlight, HighlightModifier, HighlightModifiers, HighlightTag},
-        HighlightedRange,
+        tags::{Highlight, HlMod, HlMods, HlPunct, HlTag},
+        HlRange,
     },
 };
-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::{
@@ -91,7 +92,7 @@ pub use ide_db::base_db::{
 };
 pub use ide_db::{
     call_info::CallInfo,
-    search::{Reference, ReferenceAccess, ReferenceKind},
+    search::{FileReference, ReferenceAccess, ReferenceKind},
 };
 pub use ide_db::{
     label::Label,
@@ -271,6 +272,10 @@ impl Analysis {
         self.with_db(|db| syntax_tree::syntax_tree(&db, file_id, text_range))
     }
 
+    pub fn view_hir(&self, position: FilePosition) -> Cancelable<String> {
+        self.with_db(|db| view_hir::view_hir(&db, position))
+    }
+
     pub fn expand_macro(&self, position: FilePosition) -> Cancelable<Option<ExpandedMacro>> {
         self.with_db(|db| expand_macro::expand_macro(db, position))
     }
@@ -444,12 +449,12 @@ impl Analysis {
     }
 
     /// Computes syntax highlighting for the given file
-    pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> {
+    pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HlRange>> {
         self.with_db(|db| syntax_highlighting::highlight(db, file_id, None, false))
     }
 
     /// Computes syntax highlighting for the given file range.
-    pub fn highlight_range(&self, frange: FileRange) -> Cancelable<Vec<HighlightedRange>> {
+    pub fn highlight_range(&self, frange: FileRange) -> Cancelable<Vec<HlRange>> {
         self.with_db(|db| {
             syntax_highlighting::highlight(db, frange.file_id, Some(frange.range), false)
         })
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 21b2d7ca1..7d4757e02 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -3,7 +3,7 @@
 //! or `ast::NameRef`. If it's a `ast::NameRef`, at the classification step we
 //! try to resolve the direct tree parent of this element, otherwise we
 //! already have a definition and just need to get its HIR together with
-//! some information that is needed for futher steps of searching.
+//! some information that is needed for further steps of searching.
 //! After that, we collect files that might contain references and look
 //! for text occurrences of the identifier. If there's an `ast::NameRef`
 //! at the index that the match starts at and its tree parent is
@@ -13,15 +13,15 @@ pub(crate) mod rename;
 
 use hir::Semantics;
 use ide_db::{
+    base_db::FileId,
     defs::{Definition, NameClass, NameRefClass},
-    search::Reference,
-    search::{ReferenceAccess, ReferenceKind, SearchScope},
+    search::{FileReference, ReferenceAccess, ReferenceKind, SearchScope, UsageSearchResult},
     RootDatabase,
 };
 use syntax::{
     algo::find_node_at_offset,
     ast::{self, NameOwner},
-    match_ast, AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset,
+    match_ast, AstNode, SyntaxNode, TextRange, TokenAtOffset, T,
 };
 
 use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo, SymbolKind};
@@ -29,7 +29,7 @@ use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeI
 #[derive(Debug, Clone)]
 pub struct ReferenceSearchResult {
     declaration: Declaration,
-    references: Vec<Reference>,
+    references: UsageSearchResult,
 }
 
 #[derive(Debug, Clone)]
@@ -48,10 +48,21 @@ impl ReferenceSearchResult {
         &self.declaration.nav
     }
 
-    pub fn references(&self) -> &[Reference] {
+    pub fn references(&self) -> &UsageSearchResult {
         &self.references
     }
 
+    pub fn references_with_declaration(mut self) -> UsageSearchResult {
+        let decl_ref = FileReference {
+            range: self.declaration.nav.focus_or_full_range(),
+            kind: self.declaration.kind,
+            access: self.declaration.access,
+        };
+        let file_id = self.declaration.nav.file_id;
+        self.references.references.entry(file_id).or_default().push(decl_ref);
+        self.references
+    }
+
     /// Total number of references
     /// At least 1 since all valid references should
     /// Have a declaration
@@ -63,21 +74,11 @@ impl ReferenceSearchResult {
 // allow turning ReferenceSearchResult into an iterator
 // over References
 impl IntoIterator for ReferenceSearchResult {
-    type Item = Reference;
-    type IntoIter = std::vec::IntoIter<Reference>;
-
-    fn into_iter(mut self) -> Self::IntoIter {
-        let mut v = Vec::with_capacity(self.len());
-        v.push(Reference {
-            file_range: FileRange {
-                file_id: self.declaration.nav.file_id,
-                range: self.declaration.nav.focus_or_full_range(),
-            },
-            kind: self.declaration.kind,
-            access: self.declaration.access,
-        });
-        v.append(&mut self.references);
-        v.into_iter()
+    type Item = (FileId, Vec<FileReference>);
+    type IntoIter = std::collections::hash_map::IntoIter<FileId, Vec<FileReference>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.references_with_declaration().into_iter()
     }
 }
 
@@ -109,13 +110,12 @@ pub(crate) fn find_all_refs(
 
     let RangeInfo { range, info: def } = find_name(&sema, &syntax, position, opt_name)?;
 
-    let references = def
-        .usages(sema)
-        .set_scope(search_scope)
-        .all()
-        .into_iter()
-        .filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind)
-        .collect();
+    let mut usages = def.usages(sema).set_scope(search_scope).all();
+    usages
+        .references
+        .values_mut()
+        .for_each(|it| it.retain(|r| search_kind == ReferenceKind::Other || search_kind == r.kind));
+    usages.references.retain(|_, it| !it.is_empty());
 
     let nav = def.try_to_nav(sema.db)?;
     let decl_range = nav.focus_or_full_range();
@@ -130,13 +130,16 @@ pub(crate) fn find_all_refs(
                 kind = ReferenceKind::FieldShorthandForLocal;
             }
         }
-    } else if matches!(def, Definition::LifetimeParam(_) | Definition::Label(_)) {
+    } else if matches!(
+        def,
+        Definition::GenericParam(hir::GenericParam::LifetimeParam(_)) | Definition::Label(_)
+    ) {
         kind = ReferenceKind::Lifetime;
     };
 
     let declaration = Declaration { nav, kind, access: decl_access(&def, &syntax, decl_range) };
 
-    Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }))
+    Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references: usages }))
 }
 
 fn find_name(
@@ -200,7 +203,7 @@ fn get_struct_def_name_for_struct_literal_search(
     position: FilePosition,
 ) -> Option<ast::Name> {
     if let TokenAtOffset::Between(ref left, ref right) = syntax.token_at_offset(position.offset) {
-        if right.kind() != SyntaxKind::L_CURLY && right.kind() != SyntaxKind::L_PAREN {
+        if right.kind() != T!['{'] && right.kind() != T!['('] {
             return None;
         }
         if let Some(name) =
@@ -227,7 +230,7 @@ fn get_enum_def_name_for_struct_literal_search(
     position: FilePosition,
 ) -> Option<ast::Name> {
     if let TokenAtOffset::Between(ref left, ref right) = syntax.token_at_offset(position.offset) {
-        if right.kind() != SyntaxKind::L_CURLY && right.kind() != SyntaxKind::L_PAREN {
+        if right.kind() != T!['{'] && right.kind() != T!['('] {
             return None;
         }
         if let Some(name) =
@@ -252,8 +255,8 @@ fn try_find_self_references(
     syntax: &SyntaxNode,
     position: FilePosition,
 ) -> Option<RangeInfo<ReferenceSearchResult>> {
-    let self_token =
-        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)?;
+    let FilePosition { file_id, offset } = position;
+    let self_token = syntax.token_at_offset(offset).find(|t| t.kind() == T![self])?;
     let parent = self_token.parent();
     match_ast! {
         match parent {
@@ -274,7 +277,7 @@ fn try_find_self_references(
 
     let declaration = Declaration {
         nav: NavigationTarget {
-            file_id: position.file_id,
+            file_id,
             full_range: self_param.syntax().text_range(),
             focus_range: Some(param_self_token.text_range()),
             name: param_self_token.text().clone(),
@@ -290,7 +293,7 @@ fn try_find_self_references(
             ReferenceAccess::Read
         }),
     };
-    let references = function
+    let refs = function
         .body()
         .map(|body| {
             body.syntax()
@@ -304,14 +307,16 @@ fn try_find_self_references(
                         None
                     }
                 })
-                .map(|token| Reference {
-                    file_range: FileRange { file_id: position.file_id, range: token.text_range() },
+                .map(|token| FileReference {
+                    range: token.text_range(),
                     kind: ReferenceKind::SelfKw,
                     access: declaration.access, // FIXME: properly check access kind here instead of copying it from the declaration
                 })
                 .collect()
         })
         .unwrap_or_default();
+    let mut references = UsageSearchResult::default();
+    references.references.insert(file_id, refs);
 
     Some(RangeInfo::new(
         param_self_token.text_range(),
@@ -331,7 +336,7 @@ mod tests {
     fn test_struct_literal_after_space() {
         check(
             r#"
-struct Foo <|>{
+struct Foo $0{
     a: i32,
 }
 impl Foo {
@@ -354,7 +359,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 +378,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 +396,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 +415,7 @@ fn main() {
     fn test_enum_after_space() {
         check(
             r#"
-enum Foo <|>{
+enum Foo $0{
     A,
     B,
 }
@@ -431,7 +436,7 @@ fn main() {
     fn test_enum_before_space() {
         check(
             r#"
-enum Foo<|> {
+enum Foo$0 {
     A,
     B,
 }
@@ -453,7 +458,7 @@ fn main() {
     fn test_enum_with_generic_type() {
         check(
             r#"
-enum Foo<T> <|>{
+enum Foo<T> $0{
     A(T),
     B,
 }
@@ -474,7 +479,7 @@ fn main() {
     fn test_enum_for_tuple() {
         check(
             r#"
-enum Foo<|>{
+enum Foo$0{
     A(i8),
     B(i8),
 }
@@ -498,7 +503,7 @@ fn main() {
 fn main() {
     let mut i = 1;
     let j = 1;
-    i = i<|> + j;
+    i = i$0 + j;
 
     {
         i = 0;
@@ -522,7 +527,7 @@ fn main() {
         check(
             r#"
 fn foo() {
-    let spam<|> = 92;
+    let spam$0 = 92;
     spam + spam
 }
 fn bar() {
@@ -543,7 +548,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 +562,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 +578,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 +599,7 @@ fn main(s: Foo) {
             r#"
 struct Foo;
 impl Foo {
-    fn f<|>(&self) {  }
+    fn f$0(&self) {  }
 }
 "#,
             expect![[r#"
@@ -610,7 +615,7 @@ impl Foo {
             r#"
 enum Foo {
     A,
-    B<|>,
+    B$0,
     C,
 }
 "#,
@@ -627,7 +632,7 @@ enum Foo {
             r#"
 enum Foo {
     A,
-    B { field<|>: u8 },
+    B { field$0: u8 },
     C,
 }
 "#,
@@ -669,7 +674,7 @@ pub struct Bar {
 }
 
 fn f() {
-    let i = foo::Foo<|> { n: 5 };
+    let i = foo::Foo$0 { n: 5 };
 }
 "#,
             expect![[r#"
@@ -689,7 +694,7 @@ fn f() {
         check(
             r#"
 //- /lib.rs
-mod foo<|>;
+mod foo$0;
 
 use foo::Foo;
 
@@ -726,7 +731,7 @@ fn f() {
 }
 
 //- /foo/some.rs
-pub(super) struct Foo<|> {
+pub(super) struct Foo$0 {
     pub n: u32,
 }
 "#,
@@ -746,7 +751,7 @@ pub(super) struct Foo<|> {
             mod foo;
             mod bar;
 
-            pub fn quux<|>() {}
+            pub fn quux$0() {}
 
             //- /foo.rs
             fn f() { super::quux(); }
@@ -782,7 +787,7 @@ pub(super) struct Foo<|> {
         check(
             r#"
 #[macro_export]
-macro_rules! m1<|> { () => (()) }
+macro_rules! m1$0 { () => (()) }
 
 fn foo() {
     m1();
@@ -803,7 +808,7 @@ fn foo() {
         check(
             r#"
 fn foo() {
-    let mut i<|> = 0;
+    let mut i$0 = 0;
     i = i + 1;
 }
 "#,
@@ -826,7 +831,7 @@ struct S {
 
 fn foo() {
     let mut s = S{f: 0};
-    s.f<|> = 0;
+    s.f$0 = 0;
 }
 "#,
             expect![[r#"
@@ -843,7 +848,7 @@ fn foo() {
         check(
             r#"
 fn foo() {
-    let i<|>;
+    let i$0;
     i = 1;
 }
 "#,
@@ -863,7 +868,7 @@ mod foo {
     pub struct Foo;
 
     impl Foo {
-        pub fn new<|>() -> Foo { Foo }
+        pub fn new$0() -> Foo { Foo }
     }
 }
 
@@ -886,7 +891,7 @@ fn main() {
 //- /lib.rs
 mod foo { mod bar; }
 
-fn f<|>() {}
+fn f$0() {}
 
 //- /foo/bar.rs
 use crate::f;
@@ -907,7 +912,7 @@ fn g() { f(); }
         check(
             r#"
 struct S {
-    field<|>: u8,
+    field$0: u8,
 }
 
 fn f(s: S) {
@@ -930,7 +935,7 @@ fn f(s: S) {
             r#"
 enum En {
     Variant {
-        field<|>: u8,
+        field$0: u8,
     }
 }
 
@@ -955,7 +960,7 @@ fn f(e: En) {
 mod m {
     pub enum En {
         Variant {
-            field<|>: u8,
+            field$0: u8,
         }
     }
 }
@@ -980,7 +985,7 @@ struct Foo { bar: i32 }
 
 impl Foo {
     fn foo(self) {
-        let x = self<|>.bar;
+        let x = self$0.bar;
         if true {
             let _ = match () {
                 () => self,
@@ -1016,12 +1021,14 @@ impl Foo {
             actual += "\n\n";
         }
 
-        for r in &refs.references {
-            format_to!(actual, "{:?} {:?} {:?}", r.file_range.file_id, r.file_range.range, r.kind);
-            if let Some(access) = r.access {
-                format_to!(actual, " {:?}", access);
+        for (file_id, references) in refs.references {
+            for r in references {
+                format_to!(actual, "{:?} {:?} {:?}", file_id, r.range, r.kind);
+                if let Some(access) = r.access {
+                    format_to!(actual, " {:?}", access);
+                }
+                actual += "\n";
             }
-            actual += "\n";
         }
         expect.assert_eq(&actual)
     }
@@ -1032,7 +1039,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 +1060,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 +1079,7 @@ trait Foo<'a> {
     fn foo() -> &'a ();
 }
 impl<'a> Foo<'a> for &'a () {
-    fn foo() -> &'a<|> () {
+    fn foo() -> &'a$0 () {
         unimplemented!()
     }
 }
@@ -1093,7 +1100,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 +1119,7 @@ fn main() {
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
     let a = "test";
-    foo!(a<|>);
+    foo!(a$0);
 }
 "#,
             expect![[r#"
@@ -1130,7 +1137,7 @@ fn main() {
 fn foo<'a>() -> &'a () {
     'a: loop {
         'b: loop {
-            continue 'a<|>;
+            continue 'a$0;
         }
         break 'a;
     }
@@ -1144,4 +1151,20 @@ fn foo<'a>() -> &'a () {
             "#]],
         );
     }
+
+    #[test]
+    fn test_find_const_param() {
+        check(
+            r#"
+fn foo<const FOO$0: usize>() -> usize {
+    FOO
+}
+"#,
+            expect![[r#"
+                FOO ConstParam FileId(0) 7..23 13..16 Other
+
+                FileId(0) 42..45 Other
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 854bf194e..c3ae568c2 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -1,29 +1,30 @@
 //! FIXME: write short doc here
 use std::{
     convert::TryInto,
-    error::Error,
     fmt::{self, Display},
 };
 
 use hir::{Module, ModuleDef, ModuleSource, Semantics};
-use ide_db::base_db::{AnchoredPathBuf, FileId, FileRange, SourceDatabaseExt};
 use ide_db::{
+    base_db::{AnchoredPathBuf, FileId, FileRange, SourceDatabaseExt},
     defs::{Definition, NameClass, NameRefClass},
+    search::FileReference,
     RootDatabase,
 };
 use syntax::{
     algo::find_node_at_offset,
     ast::{self, NameOwner},
-    lex_single_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken,
+    lex_single_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken, T,
 };
 use test_utils::mark;
 use text_edit::TextEdit;
 
 use crate::{
-    references::find_all_refs, FilePosition, FileSystemEdit, RangeInfo, Reference, ReferenceKind,
-    SourceChange, SourceFileEdit, TextRange, TextSize,
+    FilePosition, FileSystemEdit, RangeInfo, ReferenceKind, ReferenceSearchResult, SourceChange,
+    SourceFileEdit, TextRange, TextSize,
 };
 
+type RenameResult<T> = Result<T, RenameError>;
 #[derive(Debug)]
 pub struct RenameError(pub(crate) String);
 
@@ -33,26 +34,30 @@ impl fmt::Display for RenameError {
     }
 }
 
-impl Error for RenameError {}
+macro_rules! format_err {
+    ($fmt:expr) => {RenameError(format!($fmt))};
+    ($fmt:expr, $($arg:tt)+) => {RenameError(format!($fmt, $($arg)+))}
+}
+
+macro_rules! bail {
+    ($($tokens:tt)*) => {return Err(format_err!($($tokens)*))}
+}
 
 pub(crate) fn prepare_rename(
     db: &RootDatabase,
     position: FilePosition,
-) -> Result<RangeInfo<()>, RenameError> {
+) -> RenameResult<RangeInfo<()>> {
     let sema = Semantics::new(db);
     let source_file = sema.parse(position.file_id);
     let syntax = source_file.syntax();
     if let Some(module) = find_module_at_offset(&sema, position, syntax) {
         rename_mod(&sema, position, module, "dummy")
     } else if let Some(self_token) =
-        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
+        syntax.token_at_offset(position.offset).find(|t| t.kind() == T![self])
     {
         rename_self_to_param(&sema, position, self_token, "dummy")
     } else {
-        let range = match find_all_refs(&sema, position, None) {
-            Some(RangeInfo { range, .. }) => range,
-            None => return Err(RenameError("No references found at position".to_string())),
-        };
+        let RangeInfo { range, .. } = find_all_refs(&sema, position)?;
         Ok(RangeInfo::new(range, SourceChange::from(vec![])))
     }
     .map(|info| RangeInfo::new(info.range, ()))
@@ -62,7 +67,7 @@ pub(crate) fn rename(
     db: &RootDatabase,
     position: FilePosition,
     new_name: &str,
-) -> Result<RangeInfo<SourceChange>, RenameError> {
+) -> RenameResult<RangeInfo<SourceChange>> {
     let sema = Semantics::new(db);
     rename_with_semantics(&sema, position, new_name)
 }
@@ -71,42 +76,18 @@ pub(crate) fn rename_with_semantics(
     sema: &Semantics<RootDatabase>,
     position: FilePosition,
     new_name: &str,
-) -> Result<RangeInfo<SourceChange>, RenameError> {
-    let is_lifetime_name = match lex_single_syntax_kind(new_name) {
-        Some(res) => match res {
-            (SyntaxKind::IDENT, _) => false,
-            (SyntaxKind::UNDERSCORE, _) => false,
-            (SyntaxKind::SELF_KW, _) => return rename_to_self(&sema, position),
-            (SyntaxKind::LIFETIME_IDENT, _) if new_name != "'static" && new_name != "'_" => true,
-            (SyntaxKind::LIFETIME_IDENT, _) => {
-                return Err(RenameError(format!(
-                    "Invalid name `{0}`: Cannot rename lifetime to {0}",
-                    new_name
-                )))
-            }
-            (_, Some(syntax_error)) => {
-                return Err(RenameError(format!("Invalid name `{}`: {}", new_name, syntax_error)))
-            }
-            (_, None) => {
-                return Err(RenameError(format!("Invalid name `{}`: not an identifier", new_name)))
-            }
-        },
-        None => return Err(RenameError(format!("Invalid name `{}`: not an identifier", new_name))),
-    };
-
+) -> RenameResult<RangeInfo<SourceChange>> {
     let source_file = sema.parse(position.file_id);
     let syntax = source_file.syntax();
-    // this is here to prevent lifetime renames from happening on modules and self
-    if is_lifetime_name {
-        rename_reference(&sema, position, new_name, is_lifetime_name)
-    } else if let Some(module) = find_module_at_offset(&sema, position, syntax) {
+
+    if let Some(module) = find_module_at_offset(&sema, position, syntax) {
         rename_mod(&sema, position, module, new_name)
     } else if let Some(self_token) =
-        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
+        syntax.token_at_offset(position.offset).find(|t| t.kind() == T![self])
     {
         rename_self_to_param(&sema, position, self_token, new_name)
     } else {
-        rename_reference(&sema, position, new_name, is_lifetime_name)
+        rename_reference(&sema, position, new_name)
     }
 }
 
@@ -127,6 +108,33 @@ pub(crate) fn will_rename_file(
     Some(change)
 }
 
+#[derive(Debug, PartialEq)]
+enum IdentifierKind {
+    Ident,
+    Lifetime,
+    ToSelf,
+    Underscore,
+}
+
+fn check_identifier(new_name: &str) -> RenameResult<IdentifierKind> {
+    match lex_single_syntax_kind(new_name) {
+        Some(res) => match res {
+            (SyntaxKind::IDENT, _) => Ok(IdentifierKind::Ident),
+            (T![_], _) => Ok(IdentifierKind::Underscore),
+            (T![self], _) => Ok(IdentifierKind::ToSelf),
+            (SyntaxKind::LIFETIME_IDENT, _) if new_name != "'static" && new_name != "'_" => {
+                Ok(IdentifierKind::Lifetime)
+            }
+            (SyntaxKind::LIFETIME_IDENT, _) => {
+                bail!("Invalid name `{0}`: Cannot rename lifetime to {0}", new_name)
+            }
+            (_, Some(syntax_error)) => bail!("Invalid name `{}`: {}", new_name, syntax_error),
+            (_, None) => bail!("Invalid name `{}`: not an identifier", new_name),
+        },
+        None => bail!("Invalid name `{}`: not an identifier", new_name),
+    }
+}
+
 fn find_module_at_offset(
     sema: &Semantics<RootDatabase>,
     position: FilePosition,
@@ -155,39 +163,54 @@ fn find_module_at_offset(
     Some(module)
 }
 
-fn source_edit_from_reference(
+fn find_all_refs(
+    sema: &Semantics<RootDatabase>,
+    position: FilePosition,
+) -> RenameResult<RangeInfo<ReferenceSearchResult>> {
+    crate::references::find_all_refs(sema, position, None)
+        .ok_or_else(|| format_err!("No references found at position"))
+}
+
+fn source_edit_from_references(
     sema: &Semantics<RootDatabase>,
-    reference: Reference,
+    file_id: FileId,
+    references: &[FileReference],
     new_name: &str,
 ) -> SourceFileEdit {
-    let mut replacement_text = String::new();
-    let range = match reference.kind {
-        ReferenceKind::FieldShorthandForField => {
-            mark::hit!(test_rename_struct_field_for_shorthand);
-            replacement_text.push_str(new_name);
-            replacement_text.push_str(": ");
-            TextRange::new(reference.file_range.range.start(), reference.file_range.range.start())
-        }
-        ReferenceKind::FieldShorthandForLocal => {
-            mark::hit!(test_rename_local_for_field_shorthand);
-            replacement_text.push_str(": ");
-            replacement_text.push_str(new_name);
-            TextRange::new(reference.file_range.range.end(), reference.file_range.range.end())
-        }
-        ReferenceKind::RecordFieldExprOrPat => {
-            mark::hit!(test_rename_field_expr_pat);
-            replacement_text.push_str(new_name);
-            edit_text_range_for_record_field_expr_or_pat(sema, reference.file_range, new_name)
-        }
-        _ => {
-            replacement_text.push_str(new_name);
-            reference.file_range.range
-        }
-    };
-    SourceFileEdit {
-        file_id: reference.file_range.file_id,
-        edit: TextEdit::replace(range, replacement_text),
+    let mut edit = TextEdit::builder();
+    for reference in references {
+        let mut replacement_text = String::new();
+        let range = match reference.kind {
+            ReferenceKind::FieldShorthandForField => {
+                mark::hit!(test_rename_struct_field_for_shorthand);
+                replacement_text.push_str(new_name);
+                replacement_text.push_str(": ");
+                TextRange::new(reference.range.start(), reference.range.start())
+            }
+            ReferenceKind::FieldShorthandForLocal => {
+                mark::hit!(test_rename_local_for_field_shorthand);
+                replacement_text.push_str(": ");
+                replacement_text.push_str(new_name);
+                TextRange::new(reference.range.end(), reference.range.end())
+            }
+            ReferenceKind::RecordFieldExprOrPat => {
+                mark::hit!(test_rename_field_expr_pat);
+                replacement_text.push_str(new_name);
+                edit_text_range_for_record_field_expr_or_pat(
+                    sema,
+                    FileRange { file_id, range: reference.range },
+                    new_name,
+                )
+            }
+            _ => {
+                replacement_text.push_str(new_name);
+                reference.range
+            }
+        };
+        edit.replace(range, replacement_text);
     }
+
+    SourceFileEdit { file_id, edit: edit.finish() }
 }
 
 fn edit_text_range_for_record_field_expr_or_pat(
@@ -223,7 +246,10 @@ fn rename_mod(
     position: FilePosition,
     module: Module,
     new_name: &str,
-) -> Result<RangeInfo<SourceChange>, RenameError> {
+) -> RenameResult<RangeInfo<SourceChange>> {
+    if IdentifierKind::Ident != check_identifier(new_name)? {
+        bail!("Invalid name `{0}`: cannot rename module to {0}", new_name);
+    }
     let mut source_file_edits = Vec::new();
     let mut file_system_edits = Vec::new();
 
@@ -254,12 +280,10 @@ fn rename_mod(
         source_file_edits.push(edit);
     }
 
-    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)
-        .ok_or_else(|| RenameError("No references found at position".to_string()))?;
-    let ref_edits = refs
-        .references
-        .into_iter()
-        .map(|reference| source_edit_from_reference(sema, reference, new_name));
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
+    let ref_edits = refs.references().iter().map(|(&file_id, references)| {
+        source_edit_from_references(sema, file_id, references, new_name)
+    });
     source_file_edits.extend(ref_edits);
 
     Ok(RangeInfo::new(range, SourceChange::from_edits(source_file_edits, file_system_edits)))
@@ -274,27 +298,26 @@ fn rename_to_self(
 
     let (fn_def, fn_ast) = find_node_at_offset::<ast::Fn>(syn, position.offset)
         .and_then(|fn_ast| sema.to_def(&fn_ast).zip(Some(fn_ast)))
-        .ok_or_else(|| RenameError("No surrounding method declaration found".to_string()))?;
+        .ok_or_else(|| format_err!("No surrounding method declaration found"))?;
     let param_range = fn_ast
         .param_list()
         .and_then(|p| p.params().next())
-        .ok_or_else(|| RenameError("Method has no parameters".to_string()))?
+        .ok_or_else(|| format_err!("Method has no parameters"))?
         .syntax()
         .text_range();
     if !param_range.contains(position.offset) {
-        return Err(RenameError("Only the first parameter can be self".to_string()));
+        bail!("Only the first parameter can be self");
     }
 
     let impl_block = find_node_at_offset::<ast::Impl>(syn, position.offset)
         .and_then(|def| sema.to_def(&def))
-        .ok_or_else(|| RenameError("No impl block found for function".to_string()))?;
+        .ok_or_else(|| format_err!("No impl block found for function"))?;
     if fn_def.self_param(sema.db).is_some() {
-        return Err(RenameError("Method already has a self parameter".to_string()));
+        bail!("Method already has a self parameter");
     }
 
     let params = fn_def.assoc_fn_params(sema.db);
-    let first_param =
-        params.first().ok_or_else(|| RenameError("Method has no parameters".into()))?;
+    let first_param = params.first().ok_or_else(|| format_err!("Method has no parameters"))?;
     let first_param_ty = first_param.ty();
     let impl_ty = impl_block.target_ty(sema.db);
     let (ty, self_param) = if impl_ty.remove_ref().is_some() {
@@ -307,23 +330,17 @@ fn rename_to_self(
     };
 
     if ty != impl_ty {
-        return Err(RenameError("Parameter type differs from impl block type".to_string()));
+        bail!("Parameter type differs from impl block type");
     }
 
-    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)
-        .ok_or_else(|| RenameError("No reference found at position".to_string()))?;
-
-    let (param_ref, usages): (Vec<Reference>, Vec<Reference>) = refs
-        .into_iter()
-        .partition(|reference| param_range.intersect(reference.file_range.range).is_some());
-
-    if param_ref.is_empty() {
-        return Err(RenameError("Parameter to rename not found".to_string()));
-    }
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
 
-    let mut edits = usages
-        .into_iter()
-        .map(|reference| source_edit_from_reference(sema, reference, "self"))
+    let mut edits = refs
+        .references()
+        .iter()
+        .map(|(&file_id, references)| {
+            source_edit_from_references(sema, file_id, references, "self")
+        })
         .collect::<Vec<_>>();
 
     edits.push(SourceFileEdit {
@@ -367,12 +384,22 @@ fn rename_self_to_param(
     self_token: SyntaxToken,
     new_name: &str,
 ) -> Result<RangeInfo<SourceChange>, RenameError> {
+    let ident_kind = check_identifier(new_name)?;
+    match ident_kind {
+        IdentifierKind::Lifetime => bail!("Invalid name `{}`: not an identifier", new_name),
+        IdentifierKind::ToSelf => {
+            // no-op
+            mark::hit!(rename_self_to_self);
+            return Ok(RangeInfo::new(self_token.text_range(), SourceChange::default()));
+        }
+        _ => (),
+    }
     let source_file = sema.parse(position.file_id);
     let syn = source_file.syntax();
 
     let text = sema.db.file_text(position.file_id);
     let fn_def = find_node_at_offset::<ast::Fn>(syn, position.offset)
-        .ok_or_else(|| RenameError("No surrounding method declaration found".to_string()))?;
+        .ok_or_else(|| format_err!("No surrounding method declaration found"))?;
     let search_range = fn_def.syntax().text_range();
 
     let mut edits: Vec<SourceFileEdit> = vec![];
@@ -382,12 +409,10 @@ fn rename_self_to_param(
         if !search_range.contains_inclusive(offset) {
             continue;
         }
-        if let Some(ref usage) =
-            syn.token_at_offset(offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
-        {
+        if let Some(ref usage) = syn.token_at_offset(offset).find(|t| t.kind() == T![self]) {
             let edit = if let Some(ref self_param) = ast::SelfParam::cast(usage.parent()) {
                 text_edit_from_self_param(syn, self_param, new_name)
-                    .ok_or_else(|| RenameError("No target type found".to_string()))?
+                    .ok_or_else(|| format_err!("No target type found"))?
             } else {
                 TextEdit::replace(usage.text_range(), String::from(new_name))
             };
@@ -395,6 +420,10 @@ fn rename_self_to_param(
         }
     }
 
+    if edits.len() > 1 && ident_kind == IdentifierKind::Underscore {
+        bail!("Cannot rename reference to `_` as it is being referenced multiple times");
+    }
+
     let range = ast::SelfParam::cast(self_token.parent())
         .map_or(self_token.text_range(), |p| p.syntax().text_range());
 
@@ -405,35 +434,43 @@ fn rename_reference(
     sema: &Semantics<RootDatabase>,
     position: FilePosition,
     new_name: &str,
-    is_lifetime_name: bool,
 ) -> Result<RangeInfo<SourceChange>, RenameError> {
-    let RangeInfo { range, info: refs } = match find_all_refs(sema, position, None) {
-        Some(range_info) => range_info,
-        None => return Err(RenameError("No references found at position".to_string())),
-    };
-
-    match (refs.declaration.kind == ReferenceKind::Lifetime, is_lifetime_name) {
-        (true, false) => {
-            return Err(RenameError(format!(
-                "Invalid name `{}`: not a lifetime identifier",
-                new_name
-            )))
+    let ident_kind = check_identifier(new_name)?;
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
+
+    match (ident_kind, &refs.declaration.kind) {
+        (IdentifierKind::ToSelf, ReferenceKind::Lifetime)
+        | (IdentifierKind::Underscore, ReferenceKind::Lifetime)
+        | (IdentifierKind::Ident, ReferenceKind::Lifetime) => {
+            mark::hit!(rename_not_a_lifetime_ident_ref);
+            bail!("Invalid name `{}`: not a lifetime identifier", new_name)
         }
-        (false, true) => {
-            return Err(RenameError(format!("Invalid name `{}`: not an identifier", new_name)))
+        (IdentifierKind::Lifetime, ReferenceKind::Lifetime) => mark::hit!(rename_lifetime),
+        (IdentifierKind::Lifetime, _) => {
+            mark::hit!(rename_not_an_ident_ref);
+            bail!("Invalid name `{}`: not an identifier", new_name)
         }
-        _ => (),
+        (IdentifierKind::ToSelf, ReferenceKind::SelfKw) => {
+            unreachable!("rename_self_to_param should've been called instead")
+        }
+        (IdentifierKind::ToSelf, _) => {
+            mark::hit!(rename_to_self);
+            return rename_to_self(sema, position);
+        }
+        (IdentifierKind::Underscore, _) if !refs.references.is_empty() => {
+            mark::hit!(rename_underscore_multiple);
+            bail!("Cannot rename reference to `_` as it is being referenced multiple times")
+        }
+        (IdentifierKind::Ident, _) | (IdentifierKind::Underscore, _) => mark::hit!(rename_ident),
     }
 
     let edit = refs
         .into_iter()
-        .map(|reference| source_edit_from_reference(sema, reference, new_name))
+        .map(|(file_id, references)| {
+            source_edit_from_references(sema, file_id, &references, new_name)
+        })
         .collect::<Vec<_>>();
 
-    if edit.is_empty() {
-        return Err(RenameError("No references found at position".to_string()));
-    }
-
     Ok(RangeInfo::new(range, SourceChange::from(edit)))
 }
 
@@ -462,9 +499,11 @@ mod tests {
                         text_edit_builder.replace(indel.delete, indel.insert);
                     }
                 }
-                let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
-                text_edit_builder.finish().apply(&mut result);
-                assert_eq_text!(ra_fixture_after, &*result);
+                if let Some(file_id) = file_id {
+                    let mut result = analysis.file_text(file_id).unwrap().to_string();
+                    text_edit_builder.finish().apply(&mut result);
+                    assert_eq_text!(ra_fixture_after, &*result);
+                }
             }
             Err(err) => {
                 if ra_fixture_after.starts_with("error:") {
@@ -493,19 +532,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 +553,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,38 +562,60 @@ 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",
         );
     }
 
     #[test]
     fn test_rename_to_invalid_identifier_lifetime() {
+        mark::check!(rename_not_an_ident_ref);
         check(
             "'foo",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
             "error: Invalid name `'foo`: not an identifier",
         );
     }
 
     #[test]
     fn test_rename_to_invalid_identifier_lifetime2() {
+        mark::check!(rename_not_a_lifetime_ident_ref);
         check(
             "foo",
-            r#"fn main<'a>(_: &'a<|> ()) {}"#,
+            r#"fn main<'a>(_: &'a$0 ()) {}"#,
             "error: Invalid name `foo`: not a lifetime identifier",
         );
     }
 
     #[test]
+    fn test_rename_to_underscore_invalid() {
+        mark::check!(rename_underscore_multiple);
+        check(
+            "_",
+            r#"fn main(foo$0: ()) {foo;}"#,
+            "error: Cannot rename reference to `_` as it is being referenced multiple times",
+        );
+    }
+
+    #[test]
+    fn test_rename_mod_invalid() {
+        check(
+            "'foo",
+            r#"mod foo$0 {}"#,
+            "error: Invalid name `'foo`: cannot rename module to 'foo",
+        );
+    }
+
+    #[test]
     fn test_rename_for_local() {
+        mark::check!(rename_ident);
         check(
             "k",
             r#"
 fn main() {
     let mut i = 1;
     let j = 1;
-    i = i<|> + j;
+    i = i$0 + j;
 
     { i = 0; }
 
@@ -579,7 +640,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 +652,7 @@ fn main() {
             r#"
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
-    let a<|> = "test";
+    let a$0 = "test";
     foo!(a);
 }
 "#,
@@ -613,7 +674,7 @@ fn main() {
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
     let a = "test";
-    foo!(a<|>);
+    foo!(a$0);
 }
 "#,
             r#"
@@ -634,7 +695,7 @@ fn main() {
 macro_rules! define_fn {($id:ident) => { fn $id{} }}
 define_fn!(foo);
 fn main() {
-    fo<|>o();
+    fo$0o();
 }
 "#,
             r#"
@@ -653,7 +714,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 +731,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 +749,7 @@ fn main() {
         check(
             "j",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 
 impl Foo {
     fn new(i: i32) -> Self {
@@ -714,7 +775,7 @@ impl Foo {
         check(
             "j",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 
 impl Foo {
     fn new(i: i32) -> Self {
@@ -743,7 +804,7 @@ impl Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn new(i<|>: i32) -> Self {
+    fn new(i$0: i32) -> Self {
         Self { i }
     }
 }
@@ -765,7 +826,7 @@ impl Foo {
         check(
             "j",
             r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 struct Bar { i: i32 }
 
 impl Bar {
@@ -794,7 +855,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 +886,7 @@ fn baz(j: i32) -> Self {
 mod bar;
 
 //- /bar.rs
-mod foo<|>;
+mod foo$0;
 
 //- /bar/foo.rs
 // empty
@@ -883,7 +944,7 @@ fn main() {}
 pub struct FooContent;
 
 //- /bar.rs
-use crate::foo<|>::FooContent;
+use crate::foo$0::FooContent;
 "#,
             expect![[r#"
                 RangeInfo {
@@ -943,9 +1004,9 @@ use crate::foo<|>::FooContent;
             "foo2",
             r#"
 //- /lib.rs
-mod fo<|>o;
+mod fo$0o;
 //- /foo/mod.rs
-// emtpy
+// empty
 "#,
             expect![[r#"
                 RangeInfo {
@@ -992,10 +1053,10 @@ mod fo<|>o;
             "bar",
             r#"
 //- /lib.rs
-mod outer { mod fo<|>o; }
+mod outer { mod fo$0o; }
 
 //- /outer/foo.rs
-// emtpy
+// empty
 "#,
             expect![[r#"
                 RangeInfo {
@@ -1041,7 +1102,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 +1126,7 @@ fn f() {
 }
 
 //- /bar.rs
-pub mod foo<|>;
+pub mod foo$0;
 
 //- /bar/foo.rs
 // pub fn fun() {}
@@ -1128,7 +1189,7 @@ pub mod foo<|>;
             "Baz",
             r#"
 mod foo {
-    pub enum Foo { Bar<|> }
+    pub enum Foo { Bar$0 }
 }
 
 fn func(f: foo::Foo) {
@@ -1157,7 +1218,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) {
@@ -1178,13 +1239,14 @@ fn foo(f: foo::Foo) {
 
     #[test]
     fn test_parameter_to_self() {
+        mark::check!(rename_to_self);
         check(
             "self",
             r#"
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(foo<|>: &mut Foo) -> i32 {
+    fn f(foo$0: &mut Foo) -> i32 {
         foo.i
     }
 }
@@ -1205,7 +1267,7 @@ impl Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(foo<|>: Foo) -> i32 {
+    fn f(foo$0: Foo) -> i32 {
         foo.i
     }
 }
@@ -1229,7 +1291,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 +1304,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 +1320,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 +1336,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 +1360,7 @@ impl &Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(&mut <|>self) -> i32 {
+    fn f(&mut $0self) -> i32 {
         self.i
     }
 }
@@ -1323,7 +1385,7 @@ impl Foo {
 struct Foo { i: i32 }
 
 impl Foo {
-    fn f(<|>self) -> i32 {
+    fn f($0self) -> i32 {
         self.i
     }
 }
@@ -1350,7 +1412,7 @@ struct Foo { i: i32 }
 impl Foo {
     fn f(&self) -> i32 {
         let self_var = 1;
-        self<|>.i
+        self$0.i
     }
 }
 "#,
@@ -1373,7 +1435,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 +1456,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 +1495,7 @@ struct Foo {
 
 fn foo(foo: Foo) {
     let Foo { i: b } = foo;
-    let _ = b<|>;
+    let _ = b$0;
 }
 "#,
             expected_fixture,
@@ -1447,7 +1509,7 @@ struct Foo {
 
 fn foo(foo: Foo) {
     let Foo { i } = foo;
-    let _ = i<|>;
+    let _ = i$0;
 }
 "#,
             expected_fixture,
@@ -1464,7 +1526,7 @@ struct Foo {
 }
 
 fn foo(Foo { i }: foo) -> i32 {
-    i<|>
+    i$0
 }
 "#,
             r#"
@@ -1481,6 +1543,7 @@ fn foo(Foo { i: bar }: foo) -> i32 {
 
     #[test]
     fn test_rename_lifetimes() {
+        mark::check!(rename_lifetime);
         check(
             "'yeeee",
             r#"
@@ -1488,7 +1551,7 @@ trait Foo<'a> {
     fn foo() -> &'a ();
 }
 impl<'a> Foo<'a> for &'a () {
-    fn foo() -> &'a<|> () {
+    fn foo() -> &'a$0 () {
         unimplemented!()
     }
 }
@@ -1520,7 +1583,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 +1612,7 @@ fn main() {
 fn foo<'a>() -> &'a () {
     'a: {
         'b: loop {
-            break 'a<|>;
+            break 'a$0;
         }
     }
 }
@@ -1565,4 +1628,24 @@ fn foo<'a>() -> &'a () {
 "#,
         )
     }
+
+    #[test]
+    fn test_self_to_self() {
+        mark::check!(rename_self_to_self);
+        check(
+            "self",
+            r#"
+struct Foo;
+impl Foo {
+    fn foo(self$0) {}
+}
+"#,
+            r#"
+struct Foo;
+impl Foo {
+    fn foo(self) {}
+}
+"#,
+        )
+    }
 }
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 891183266..f5ee7de86 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 ide_db::RootDatabase;
+use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
+use ide_db::{defs::Definition, RootDatabase};
 use itertools::Itertools;
 use syntax::{
-    ast::{self, AstNode, AttrsOwner, ModuleItemOwner, NameOwner},
+    ast::{self, AstNode, AttrsOwner, ModuleItemOwner},
     match_ast, SyntaxNode,
 };
 
@@ -96,41 +96,45 @@ 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()
-}
-
-pub(crate) fn runnable(
-    sema: &Semantics<RootDatabase>,
-    item: SyntaxNode,
-    file_id: FileId,
-) -> Option<Runnable> {
-    let runnable_item = match_ast! {
-        match (item.clone()) {
-            ast::Fn(it) => runnable_fn(sema, it, file_id),
-            ast::Module(it) => runnable_mod(sema, it),
-            _ => None,
-        }
-    };
-    runnable_item.or_else(|| runnable_doctest(sema, item))
+    source_file
+        .syntax()
+        .descendants()
+        .filter_map(|item| {
+            let runnable = match_ast! {
+                match item {
+                    ast::Fn(func) => {
+                        let def = sema.to_def(&func)?;
+                        runnable_fn(&sema, def)
+                    },
+                    ast::Module(it) => runnable_mod(&sema, it),
+                    _ => None,
+                }
+            };
+            runnable.or_else(|| match doc_owner_to_def(&sema, item)? {
+                Definition::ModuleDef(def) => module_def_doctest(&sema, def),
+                _ => None,
+            })
+        })
+        .collect()
 }
 
-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,27 +143,56 @@ 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();
     Some(Runnable { nav, kind, cfg })
 }
 
-fn runnable_doctest(sema: &Semantics<RootDatabase>, item: SyntaxNode) -> Option<Runnable> {
-    match_ast! {
+pub(crate) fn runnable_mod(
+    sema: &Semantics<RootDatabase>,
+    module: ast::Module,
+) -> Option<Runnable> {
+    if !has_test_function_or_multiple_test_submodules(&module) {
+        return None;
+    }
+    let module_def = sema.to_def(&module)?;
+
+    let path = module_def
+        .path_to_root(sema.db)
+        .into_iter()
+        .rev()
+        .filter_map(|it| it.name(sema.db))
+        .join("::");
+
+    let def = sema.to_def(&module)?;
+    let attrs = def.attrs(sema.db);
+    let cfg = attrs.cfg();
+    let nav = module_def.to_nav(sema.db);
+    Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg })
+}
+
+// FIXME: figure out a proper API here.
+pub(crate) fn doc_owner_to_def(
+    sema: &Semantics<RootDatabase>,
+    item: SyntaxNode,
+) -> Option<Definition> {
+    let res: hir::ModuleDef = match_ast! {
         match item {
-            ast::Fn(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::Struct(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::Enum(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::Union(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::Trait(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::Const(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::Static(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            ast::TypeAlias(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
-            _ => None,
+            ast::SourceFile(it) => sema.scope(&item).module()?.into(),
+            ast::Fn(it) => sema.to_def(&it)?.into(),
+            ast::Struct(it) => sema.to_def(&it)?.into(),
+            ast::Enum(it) => sema.to_def(&it)?.into(),
+            ast::Union(it) => sema.to_def(&it)?.into(),
+            ast::Trait(it) => sema.to_def(&it)?.into(),
+            ast::Const(it) => sema.to_def(&it)?.into(),
+            ast::Static(it) => sema.to_def(&it)?.into(),
+            ast::TypeAlias(it) => sema.to_def(&it)?.into(),
+            _ => return None,
         }
-    }
+    };
+    Some(Definition::ModuleDef(res))
 }
 
 fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Option<Runnable> {
@@ -230,7 +263,7 @@ impl TestAttr {
 
 const RUSTDOC_FENCE: &str = "```";
 const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUNNABLE: &[&str] =
-    &["", "rust", "should_panic", "edition2015", "edition2018"];
+    &["", "rust", "should_panic", "edition2015", "edition2018", "edition2021"];
 
 fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool {
     attrs.docs().map_or(false, |doc| {
@@ -254,26 +287,6 @@ fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool {
     })
 }
 
-fn runnable_mod(sema: &Semantics<RootDatabase>, module: ast::Module) -> Option<Runnable> {
-    if !has_test_function_or_multiple_test_submodules(&module) {
-        return None;
-    }
-    let module_def = sema.to_def(&module)?;
-
-    let path = module_def
-        .path_to_root(sema.db)
-        .into_iter()
-        .rev()
-        .filter_map(|it| it.name(sema.db))
-        .join("::");
-
-    let def = sema.to_def(&module)?;
-    let attrs = def.attrs(sema.db);
-    let cfg = attrs.cfg();
-    let nav = module_def.to_nav(sema.db);
-    Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg })
-}
-
 // We could create runnables for modules with number_of_test_submodules > 0,
 // but that bloats the runnables for no real benefit, since all tests can be run by the submodule already
 fn has_test_function_or_multiple_test_submodules(module: &ast::Module) -> bool {
@@ -330,7 +343,7 @@ mod tests {
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 
 #[test]
@@ -426,7 +439,7 @@ fn bench() {}
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 
 /// ```
@@ -574,7 +587,7 @@ struct StructWithRunnable(String);
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 
 struct Data;
@@ -626,7 +639,7 @@ impl Data {
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 mod test_mod {
     #[test]
     fn test_foo1() {}
@@ -680,7 +693,7 @@ mod test_mod {
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 mod root_tests {
     mod nested_tests_0 {
         mod nested_tests_1 {
@@ -820,7 +833,7 @@ mod root_tests {
         check(
             r#"
 //- /lib.rs crate:foo cfg:feature=foo
-<|>
+$0
 #[test]
 #[cfg(feature = "foo")]
 fn test_foo1() {}
@@ -865,7 +878,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 +933,7 @@ fn test_foo1() {}
         check(
             r#"
 //- /lib.rs
-<|>
+$0
 mod test_mod {
     fn foo1() {}
 }
@@ -939,7 +952,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.rs b/crates/ide/src/syntax_highlighting.rs
index 5ad96581b..f2d4da78d 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -1,35 +1,39 @@
+pub(crate) mod tags;
+
+mod highlights;
+mod injector;
+
+mod highlight;
 mod format;
-mod html;
-mod injection;
 mod macro_rules;
-pub(crate) mod tags;
+mod inject;
+
+mod html;
 #[cfg(test)]
 mod tests;
 
-use hir::{AsAssocItem, Local, Name, Semantics, VariantDef};
-use ide_db::{
-    defs::{Definition, NameClass, NameRefClass},
-    RootDatabase,
-};
+use hir::{Name, Semantics};
+use ide_db::RootDatabase;
 use rustc_hash::FxHashMap;
 use syntax::{
     ast::{self, HasFormatSpecifier},
-    AstNode, AstToken, Direction, NodeOrToken, SyntaxElement,
-    SyntaxKind::{self, *},
-    SyntaxNode, SyntaxToken, TextRange, WalkEvent, T,
+    AstNode, AstToken, Direction, NodeOrToken,
+    SyntaxKind::*,
+    SyntaxNode, TextRange, WalkEvent, T,
 };
 
 use crate::{
     syntax_highlighting::{
-        format::FormatStringHighlighter, macro_rules::MacroRulesHighlighter, tags::Highlight,
+        format::highlight_format_string, highlights::Highlights,
+        macro_rules::MacroRulesHighlighter, tags::Highlight,
     },
-    FileId, HighlightModifier, HighlightTag, SymbolKind,
+    FileId, HlMod, HlTag, SymbolKind,
 };
 
 pub(crate) use html::highlight_as_html;
 
-#[derive(Debug, Clone)]
-pub struct HighlightedRange {
+#[derive(Debug, Clone, Copy)]
+pub struct HlRange {
     pub range: TextRange,
     pub highlight: Highlight,
     pub binding_hash: Option<u64>,
@@ -49,7 +53,7 @@ pub(crate) fn highlight(
     file_id: FileId,
     range_to_highlight: Option<TextRange>,
     syntactic_name_ref_highlighting: bool,
-) -> Vec<HighlightedRange> {
+) -> Vec<HlRange> {
     let _p = profile::span("highlight");
     let sema = Semantics::new(db);
 
@@ -68,28 +72,30 @@ pub(crate) fn highlight(
         }
     };
 
+    let mut hl = highlights::Highlights::new(range_to_highlight);
+    traverse(&mut hl, &sema, &root, range_to_highlight, syntactic_name_ref_highlighting);
+    hl.to_vec()
+}
+
+fn traverse(
+    hl: &mut Highlights,
+    sema: &Semantics<RootDatabase>,
+    root: &SyntaxNode,
+    range_to_highlight: TextRange,
+    syntactic_name_ref_highlighting: bool,
+) {
     let mut bindings_shadow_count: FxHashMap<Name, u32> = FxHashMap::default();
-    // We use a stack for the DFS traversal below.
-    // When we leave a node, the we use it to flatten the highlighted ranges.
-    let mut stack = HighlightedRangeStack::new();
 
     let mut current_macro_call: Option<ast::MacroCall> = None;
     let mut current_macro_rules: Option<ast::MacroRules> = None;
-    let mut format_string_highlighter = FormatStringHighlighter::default();
     let mut macro_rules_highlighter = MacroRulesHighlighter::default();
     let mut inside_attribute = false;
 
     // Walk all nodes, keeping track of whether we are inside a macro or not.
     // If in macro, expand it first and highlight the expanded code.
     for event in root.preorder_with_tokens() {
-        match &event {
-            WalkEvent::Enter(_) => stack.push(),
-            WalkEvent::Leave(_) => stack.pop(),
-        };
-
         let event_range = match &event {
-            WalkEvent::Enter(it) => it.text_range(),
-            WalkEvent::Leave(it) => it.text_range(),
+            WalkEvent::Enter(it) | WalkEvent::Leave(it) => it.text_range(),
         };
 
         // Element outside of the viewport, no need to highlight
@@ -101,9 +107,9 @@ pub(crate) fn highlight(
         match event.clone().map(|it| it.into_node().and_then(ast::MacroCall::cast)) {
             WalkEvent::Enter(Some(mc)) => {
                 if let Some(range) = macro_call_range(&mc) {
-                    stack.add(HighlightedRange {
+                    hl.add(HlRange {
                         range,
-                        highlight: HighlightTag::Symbol(SymbolKind::Macro).into(),
+                        highlight: HlTag::Symbol(SymbolKind::Macro).into(),
                         binding_hash: None,
                     });
                 }
@@ -113,7 +119,6 @@ pub(crate) fn highlight(
             WalkEvent::Leave(Some(mc)) => {
                 assert_eq!(current_macro_call, Some(mc));
                 current_macro_call = None;
-                format_string_highlighter = FormatStringHighlighter::default();
             }
             _ => (),
         }
@@ -131,33 +136,24 @@ pub(crate) fn highlight(
             }
             _ => (),
         }
-
         match &event {
-            // Check for Rust code in documentation
-            WalkEvent::Leave(NodeOrToken::Node(node)) => {
-                if ast::Attr::can_cast(node.kind()) {
-                    inside_attribute = false
-                }
-                if let Some((doctest, range_mapping, new_comments)) =
-                    injection::extract_doc_comments(node)
-                {
-                    injection::highlight_doc_comment(
-                        doctest,
-                        range_mapping,
-                        new_comments,
-                        &mut stack,
-                    );
-                }
-            }
             WalkEvent::Enter(NodeOrToken::Node(node)) if ast::Attr::can_cast(node.kind()) => {
                 inside_attribute = true
             }
+            WalkEvent::Leave(NodeOrToken::Node(node)) if ast::Attr::can_cast(node.kind()) => {
+                inside_attribute = false
+            }
             _ => (),
         }
 
         let element = match event {
             WalkEvent::Enter(it) => it,
-            WalkEvent::Leave(_) => continue,
+            WalkEvent::Leave(it) => {
+                if let Some(node) = it.as_node() {
+                    inject::doc_comment(hl, node);
+                }
+                continue;
+            }
         };
 
         let range = element.text_range();
@@ -177,8 +173,6 @@ pub(crate) fn highlight(
             let token = sema.descend_into_macros(token.clone());
             let parent = token.parent();
 
-            format_string_highlighter.check_for_format_string(&parent);
-
             // We only care Name and Name_ref
             match (token.kind(), parent.kind()) {
                 (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(),
@@ -191,213 +185,45 @@ pub(crate) fn highlight(
         if let Some(token) = element.as_token().cloned().and_then(ast::String::cast) {
             if token.is_raw() {
                 let expanded = element_to_highlight.as_token().unwrap().clone();
-                if injection::highlight_injection(&mut stack, &sema, token, expanded).is_some() {
+                if inject::ra_fixture(hl, &sema, token, expanded).is_some() {
                     continue;
                 }
             }
         }
 
-        if let Some((mut highlight, binding_hash)) = highlight_element(
+        if let Some(_) = macro_rules_highlighter.highlight(element_to_highlight.clone()) {
+            continue;
+        }
+
+        if let Some((mut highlight, binding_hash)) = highlight::element(
             &sema,
             &mut bindings_shadow_count,
             syntactic_name_ref_highlighting,
             element_to_highlight.clone(),
         ) {
             if inside_attribute {
-                highlight = highlight | HighlightModifier::Attribute;
-            }
-
-            if macro_rules_highlighter.highlight(element_to_highlight.clone()).is_none() {
-                stack.add(HighlightedRange { range, highlight, binding_hash });
+                highlight = highlight | HlMod::Attribute;
             }
 
-            if let Some(string) =
-                element_to_highlight.as_token().cloned().and_then(ast::String::cast)
-            {
-                format_string_highlighter.highlight_format_string(&mut stack, &string, range);
-                // Highlight escape sequences
-                if let Some(char_ranges) = string.char_ranges() {
-                    stack.push();
-                    for (piece_range, _) in char_ranges.iter().filter(|(_, char)| char.is_ok()) {
-                        if string.text()[piece_range.start().into()..].starts_with('\\') {
-                            stack.add(HighlightedRange {
-                                range: piece_range + range.start(),
-                                highlight: HighlightTag::EscapeSequence.into(),
-                                binding_hash: None,
-                            });
-                        }
-                    }
-                    stack.pop_and_inject(None);
-                }
-            }
+            hl.add(HlRange { range, highlight, binding_hash });
         }
-    }
-
-    stack.flattened()
-}
-
-#[derive(Debug)]
-struct HighlightedRangeStack {
-    stack: Vec<Vec<HighlightedRange>>,
-}
-
-/// We use a stack to implement the flattening logic for the highlighted
-/// syntax ranges.
-impl HighlightedRangeStack {
-    fn new() -> Self {
-        Self { stack: vec![Vec::new()] }
-    }
-
-    fn push(&mut self) {
-        self.stack.push(Vec::new());
-    }
-
-    /// Flattens the highlighted ranges.
-    ///
-    /// For example `#[cfg(feature = "foo")]` contains the nested ranges:
-    /// 1) parent-range: Attribute [0, 23)
-    /// 2) child-range: String [16, 21)
-    ///
-    /// The following code implements the flattening, for our example this results to:
-    /// `[Attribute [0, 16), String [16, 21), Attribute [21, 23)]`
-    fn pop(&mut self) {
-        let children = self.stack.pop().unwrap();
-        let prev = self.stack.last_mut().unwrap();
-        let needs_flattening = !children.is_empty()
-            && !prev.is_empty()
-            && prev.last().unwrap().range.contains_range(children.first().unwrap().range);
-        if !needs_flattening {
-            prev.extend(children);
-        } else {
-            let mut parent = prev.pop().unwrap();
-            for ele in children {
-                assert!(parent.range.contains_range(ele.range));
-
-                let cloned = Self::intersect(&mut parent, &ele);
-                if !parent.range.is_empty() {
-                    prev.push(parent);
-                }
-                prev.push(ele);
-                parent = cloned;
-            }
-            if !parent.range.is_empty() {
-                prev.push(parent);
-            }
-        }
-    }
-
-    /// Intersects the `HighlightedRange` `parent` with `child`.
-    /// `parent` is mutated in place, becoming the range before `child`.
-    /// Returns the range (of the same type as `parent`) *after* `child`.
-    fn intersect(parent: &mut HighlightedRange, child: &HighlightedRange) -> HighlightedRange {
-        assert!(parent.range.contains_range(child.range));
-
-        let mut cloned = parent.clone();
-        parent.range = TextRange::new(parent.range.start(), child.range.start());
-        cloned.range = TextRange::new(child.range.end(), cloned.range.end());
 
-        cloned
-    }
-
-    /// Remove the `HighlightRange` of `parent` that's currently covered by `child`.
-    fn intersect_partial(parent: &mut HighlightedRange, child: &HighlightedRange) {
-        assert!(
-            parent.range.start() <= child.range.start()
-                && parent.range.end() >= child.range.start()
-                && child.range.end() > parent.range.end()
-        );
-
-        parent.range = TextRange::new(parent.range.start(), child.range.start());
-    }
-
-    /// Similar to `pop`, but can modify arbitrary prior ranges (where `pop`)
-    /// can only modify the last range currently on the stack.
-    /// Can be used to do injections that span multiple ranges, like the
-    /// doctest injection below.
-    /// If `overwrite_parent` is non-optional, the highlighting of the parent range
-    /// is overwritten with the argument.
-    ///
-    /// Note that `pop` can be simulated by `pop_and_inject(false)` but the
-    /// latter is computationally more expensive.
-    fn pop_and_inject(&mut self, overwrite_parent: Option<Highlight>) {
-        let mut children = self.stack.pop().unwrap();
-        let prev = self.stack.last_mut().unwrap();
-        children.sort_by_key(|range| range.range.start());
-        prev.sort_by_key(|range| range.range.start());
-
-        for child in children {
-            if let Some(idx) =
-                prev.iter().position(|parent| parent.range.contains_range(child.range))
-            {
-                if let Some(tag) = overwrite_parent {
-                    prev[idx].highlight = tag;
-                }
-
-                let cloned = Self::intersect(&mut prev[idx], &child);
-                let insert_idx = if prev[idx].range.is_empty() {
-                    prev.remove(idx);
-                    idx
-                } else {
-                    idx + 1
-                };
-                prev.insert(insert_idx, child);
-                if !cloned.range.is_empty() {
-                    prev.insert(insert_idx + 1, cloned);
-                }
-            } else {
-                let maybe_idx =
-                    prev.iter().position(|parent| parent.range.contains(child.range.start()));
-                match (overwrite_parent, maybe_idx) {
-                    (Some(_), Some(idx)) => {
-                        Self::intersect_partial(&mut prev[idx], &child);
-                        let insert_idx = if prev[idx].range.is_empty() {
-                            prev.remove(idx);
-                            idx
-                        } else {
-                            idx + 1
-                        };
-                        prev.insert(insert_idx, child);
-                    }
-                    (_, None) => {
-                        let idx = prev
-                            .binary_search_by_key(&child.range.start(), |range| range.range.start())
-                            .unwrap_or_else(|x| x);
-                        prev.insert(idx, child);
-                    }
-                    _ => {
-                        unreachable!("child range should be completely contained in parent range");
+        if let Some(string) = element_to_highlight.as_token().cloned().and_then(ast::String::cast) {
+            highlight_format_string(hl, &string, range);
+            // Highlight escape sequences
+            if let Some(char_ranges) = string.char_ranges() {
+                for (piece_range, _) in char_ranges.iter().filter(|(_, char)| char.is_ok()) {
+                    if string.text()[piece_range.start().into()..].starts_with('\\') {
+                        hl.add(HlRange {
+                            range: piece_range + range.start(),
+                            highlight: HlTag::EscapeSequence.into(),
+                            binding_hash: None,
+                        });
                     }
                 }
             }
         }
     }
-
-    fn add(&mut self, range: HighlightedRange) {
-        self.stack
-            .last_mut()
-            .expect("during DFS traversal, the stack must not be empty")
-            .push(range)
-    }
-
-    fn flattened(mut self) -> Vec<HighlightedRange> {
-        assert_eq!(
-            self.stack.len(),
-            1,
-            "after DFS traversal, the stack should only contain a single element"
-        );
-        let mut res = self.stack.pop().unwrap();
-        res.sort_by_key(|range| range.range.start());
-        // Check that ranges are sorted and disjoint
-        for (left, right) in res.iter().zip(res.iter().skip(1)) {
-            assert!(
-                left.range.end() <= right.range.start(),
-                "left: {:#?}, right: {:#?}",
-                left,
-                right
-            );
-        }
-        res
-    }
 }
 
 fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
@@ -415,523 +241,3 @@ fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
 
     Some(TextRange::new(range_start, range_end))
 }
-
-/// Returns true if the parent nodes of `node` all match the `SyntaxKind`s in `kinds` exactly.
-fn parents_match(mut node: NodeOrToken<SyntaxNode, SyntaxToken>, mut kinds: &[SyntaxKind]) -> bool {
-    while let (Some(parent), [kind, rest @ ..]) = (&node.parent(), kinds) {
-        if parent.kind() != *kind {
-            return false;
-        }
-
-        // FIXME: Would be nice to get parent out of the match, but binding by-move and by-value
-        // in the same pattern is unstable: rust-lang/rust#68354.
-        node = node.parent().unwrap().into();
-        kinds = rest;
-    }
-
-    // Only true if we matched all expected kinds
-    kinds.len() == 0
-}
-
-fn is_consumed_lvalue(
-    node: NodeOrToken<SyntaxNode, SyntaxToken>,
-    local: &Local,
-    db: &RootDatabase,
-) -> bool {
-    // When lvalues are passed as arguments and they're not Copy, then mark them as Consuming.
-    parents_match(node, &[PATH_SEGMENT, PATH, PATH_EXPR, ARG_LIST]) && !local.ty(db).is_copy(db)
-}
-
-fn highlight_element(
-    sema: &Semantics<RootDatabase>,
-    bindings_shadow_count: &mut FxHashMap<Name, u32>,
-    syntactic_name_ref_highlighting: bool,
-    element: SyntaxElement,
-) -> Option<(Highlight, Option<u64>)> {
-    let db = sema.db;
-    let mut binding_hash = None;
-    let highlight: Highlight = match element.kind() {
-        FN => {
-            bindings_shadow_count.clear();
-            return None;
-        }
-
-        // Highlight definitions depending on the "type" of the definition.
-        NAME => {
-            let name = element.into_node().and_then(ast::Name::cast).unwrap();
-            let name_kind = NameClass::classify(sema, &name);
-
-            if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind {
-                if let Some(name) = local.name(db) {
-                    let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
-                    *shadow_count += 1;
-                    binding_hash = Some(calc_binding_hash(&name, *shadow_count))
-                }
-            };
-
-            match name_kind {
-                Some(NameClass::ExternCrate(_)) => HighlightTag::Symbol(SymbolKind::Module).into(),
-                Some(NameClass::Definition(def)) => {
-                    highlight_def(db, def) | HighlightModifier::Definition
-                }
-                Some(NameClass::ConstReference(def)) => highlight_def(db, def),
-                Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
-                    let mut h = HighlightTag::Symbol(SymbolKind::Field).into();
-                    if let Definition::Field(field) = field_ref {
-                        if let VariantDef::Union(_) = field.parent_def(db) {
-                            h |= HighlightModifier::Unsafe;
-                        }
-                    }
-
-                    h
-                }
-                None => highlight_name_by_syntax(name) | HighlightModifier::Definition,
-            }
-        }
-
-        // Highlight references like the definitions they resolve to
-        NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => {
-            // even though we track whether we are in an attribute or not we still need this special case
-            // as otherwise we would emit unresolved references for name refs inside attributes
-            Highlight::from(HighlightTag::Symbol(SymbolKind::Function))
-        }
-        NAME_REF => {
-            let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
-            highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| {
-                match NameRefClass::classify(sema, &name_ref) {
-                    Some(name_kind) => match name_kind {
-                        NameRefClass::ExternCrate(_) => {
-                            HighlightTag::Symbol(SymbolKind::Module).into()
-                        }
-                        NameRefClass::Definition(def) => {
-                            if let Definition::Local(local) = &def {
-                                if let Some(name) = local.name(db) {
-                                    let shadow_count =
-                                        bindings_shadow_count.entry(name.clone()).or_default();
-                                    binding_hash = Some(calc_binding_hash(&name, *shadow_count))
-                                }
-                            };
-
-                            let mut h = highlight_def(db, def);
-
-                            if let Definition::Local(local) = &def {
-                                if is_consumed_lvalue(name_ref.syntax().clone().into(), local, db) {
-                                    h |= HighlightModifier::Consuming;
-                                }
-                            }
-
-                            if let Some(parent) = name_ref.syntax().parent() {
-                                if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
-                                    if let Definition::Field(field) = def {
-                                        if let VariantDef::Union(_) = field.parent_def(db) {
-                                            h |= HighlightModifier::Unsafe;
-                                        }
-                                    }
-                                }
-                            }
-
-                            h
-                        }
-                        NameRefClass::FieldShorthand { .. } => {
-                            HighlightTag::Symbol(SymbolKind::Field).into()
-                        }
-                    },
-                    None if syntactic_name_ref_highlighting => {
-                        highlight_name_ref_by_syntax(name_ref, sema)
-                    }
-                    None => HighlightTag::UnresolvedReference.into(),
-                }
-            })
-        }
-
-        // Simple token-based highlighting
-        COMMENT => {
-            let comment = element.into_token().and_then(ast::Comment::cast)?;
-            let h = HighlightTag::Comment;
-            match comment.kind().doc {
-                Some(_) => h | HighlightModifier::Documentation,
-                None => h.into(),
-            }
-        }
-        STRING | BYTE_STRING => HighlightTag::StringLiteral.into(),
-        ATTR => HighlightTag::Attribute.into(),
-        INT_NUMBER | FLOAT_NUMBER => HighlightTag::NumericLiteral.into(),
-        BYTE => HighlightTag::ByteLiteral.into(),
-        CHAR => HighlightTag::CharLiteral.into(),
-        QUESTION => Highlight::new(HighlightTag::Operator) | HighlightModifier::ControlFlow,
-        LIFETIME => {
-            let lifetime = element.into_node().and_then(ast::Lifetime::cast).unwrap();
-
-            match NameClass::classify_lifetime(sema, &lifetime) {
-                Some(NameClass::Definition(def)) => {
-                    highlight_def(db, def) | HighlightModifier::Definition
-                }
-                None => match NameRefClass::classify_lifetime(sema, &lifetime) {
-                    Some(NameRefClass::Definition(def)) => highlight_def(db, def),
-                    _ => Highlight::new(HighlightTag::Symbol(SymbolKind::LifetimeParam)),
-                },
-                _ => {
-                    Highlight::new(HighlightTag::Symbol(SymbolKind::LifetimeParam))
-                        | HighlightModifier::Definition
-                }
-            }
-        }
-        p if p.is_punct() => match p {
-            T![&] => {
-                let h = HighlightTag::Operator.into();
-                let is_unsafe = element
-                    .parent()
-                    .and_then(ast::RefExpr::cast)
-                    .map(|ref_expr| sema.is_unsafe_ref_expr(&ref_expr))
-                    .unwrap_or(false);
-                if is_unsafe {
-                    h | HighlightModifier::Unsafe
-                } else {
-                    h
-                }
-            }
-            T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => {
-                HighlightTag::Operator.into()
-            }
-            T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
-                HighlightTag::Symbol(SymbolKind::Macro).into()
-            }
-            T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => {
-                HighlightTag::BuiltinType.into()
-            }
-            T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
-                HighlightTag::Keyword.into()
-            }
-            T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
-                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
-
-                let expr = prefix_expr.expr()?;
-                let ty = sema.type_of_expr(&expr)?;
-                if ty.is_raw_ptr() {
-                    HighlightTag::Operator | HighlightModifier::Unsafe
-                } else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
-                    HighlightTag::Operator.into()
-                } else {
-                    HighlightTag::Punctuation.into()
-                }
-            }
-            T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
-                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
-
-                let expr = prefix_expr.expr()?;
-                match expr {
-                    ast::Expr::Literal(_) => HighlightTag::NumericLiteral,
-                    _ => HighlightTag::Operator,
-                }
-                .into()
-            }
-            _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::RangePat::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::RestPat::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::Attr::cast).is_some() => {
-                HighlightTag::Attribute.into()
-            }
-            _ => HighlightTag::Punctuation.into(),
-        },
-
-        k if k.is_keyword() => {
-            let h = Highlight::new(HighlightTag::Keyword);
-            match k {
-                T![break]
-                | T![continue]
-                | T![else]
-                | T![if]
-                | T![loop]
-                | T![match]
-                | T![return]
-                | T![while]
-                | T![in] => h | HighlightModifier::ControlFlow,
-                T![for] if !is_child_of_impl(&element) => h | HighlightModifier::ControlFlow,
-                T![unsafe] => h | HighlightModifier::Unsafe,
-                T![true] | T![false] => HighlightTag::BoolLiteral.into(),
-                T![self] => {
-                    let self_param_is_mut = element
-                        .parent()
-                        .and_then(ast::SelfParam::cast)
-                        .and_then(|p| p.mut_token())
-                        .is_some();
-                    let self_path = &element
-                        .parent()
-                        .as_ref()
-                        .and_then(SyntaxNode::parent)
-                        .and_then(ast::Path::cast)
-                        .and_then(|p| sema.resolve_path(&p));
-                    let mut h = HighlightTag::Symbol(SymbolKind::SelfParam).into();
-                    if self_param_is_mut
-                        || matches!(self_path,
-                            Some(hir::PathResolution::Local(local))
-                                if local.is_self(db)
-                                    && (local.is_mut(db) || local.ty(db).is_mutable_reference())
-                        )
-                    {
-                        h |= HighlightModifier::Mutable
-                    }
-
-                    if let Some(hir::PathResolution::Local(local)) = self_path {
-                        if is_consumed_lvalue(element, &local, db) {
-                            h |= HighlightModifier::Consuming;
-                        }
-                    }
-
-                    h
-                }
-                T![ref] => element
-                    .parent()
-                    .and_then(ast::IdentPat::cast)
-                    .and_then(|ident_pat| {
-                        if sema.is_unsafe_ident_pat(&ident_pat) {
-                            Some(HighlightModifier::Unsafe)
-                        } else {
-                            None
-                        }
-                    })
-                    .map(|modifier| h | modifier)
-                    .unwrap_or(h),
-                _ => h,
-            }
-        }
-
-        _ => return None,
-    };
-
-    return Some((highlight, binding_hash));
-
-    fn calc_binding_hash(name: &Name, shadow_count: u32) -> u64 {
-        fn hash<T: std::hash::Hash + std::fmt::Debug>(x: T) -> u64 {
-            use std::{collections::hash_map::DefaultHasher, hash::Hasher};
-
-            let mut hasher = DefaultHasher::new();
-            x.hash(&mut hasher);
-            hasher.finish()
-        }
-
-        hash((name, shadow_count))
-    }
-}
-
-fn is_child_of_impl(element: &SyntaxElement) -> bool {
-    match element.parent() {
-        Some(e) => e.kind() == IMPL,
-        _ => false,
-    }
-}
-
-fn highlight_func_by_name_ref(
-    sema: &Semantics<RootDatabase>,
-    name_ref: &ast::NameRef,
-) -> Option<Highlight> {
-    let method_call = name_ref.syntax().parent().and_then(ast::MethodCallExpr::cast)?;
-    highlight_method_call(sema, &method_call)
-}
-
-fn highlight_method_call(
-    sema: &Semantics<RootDatabase>,
-    method_call: &ast::MethodCallExpr,
-) -> Option<Highlight> {
-    let func = sema.resolve_method_call(&method_call)?;
-    let mut h = HighlightTag::Symbol(SymbolKind::Function).into();
-    h |= HighlightModifier::Associated;
-    if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) {
-        h |= HighlightModifier::Unsafe;
-    }
-    if let Some(self_param) = func.self_param(sema.db) {
-        match self_param.access(sema.db) {
-            hir::Access::Shared => (),
-            hir::Access::Exclusive => h |= HighlightModifier::Mutable,
-            hir::Access::Owned => {
-                if let Some(receiver_ty) =
-                    method_call.receiver().and_then(|it| sema.type_of_expr(&it))
-                {
-                    if !receiver_ty.is_copy(sema.db) {
-                        h |= HighlightModifier::Consuming
-                    }
-                }
-            }
-        }
-    }
-    Some(h)
-}
-
-fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
-    match def {
-        Definition::Macro(_) => HighlightTag::Symbol(SymbolKind::Macro),
-        Definition::Field(_) => HighlightTag::Symbol(SymbolKind::Field),
-        Definition::ModuleDef(def) => match def {
-            hir::ModuleDef::Module(_) => HighlightTag::Symbol(SymbolKind::Module),
-            hir::ModuleDef::Function(func) => {
-                let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::Function));
-                if func.as_assoc_item(db).is_some() {
-                    h |= HighlightModifier::Associated;
-                    if func.self_param(db).is_none() {
-                        h |= HighlightModifier::Static
-                    }
-                }
-                if func.is_unsafe(db) {
-                    h |= HighlightModifier::Unsafe;
-                }
-                return h;
-            }
-            hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Symbol(SymbolKind::Struct),
-            hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HighlightTag::Symbol(SymbolKind::Enum),
-            hir::ModuleDef::Adt(hir::Adt::Union(_)) => HighlightTag::Symbol(SymbolKind::Union),
-            hir::ModuleDef::Variant(_) => HighlightTag::Symbol(SymbolKind::Variant),
-            hir::ModuleDef::Const(konst) => {
-                let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::Const));
-                if konst.as_assoc_item(db).is_some() {
-                    h |= HighlightModifier::Associated
-                }
-                return h;
-            }
-            hir::ModuleDef::Trait(_) => HighlightTag::Symbol(SymbolKind::Trait),
-            hir::ModuleDef::TypeAlias(type_) => {
-                let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::TypeAlias));
-                if type_.as_assoc_item(db).is_some() {
-                    h |= HighlightModifier::Associated
-                }
-                return h;
-            }
-            hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType,
-            hir::ModuleDef::Static(s) => {
-                let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::Static));
-                if s.is_mut(db) {
-                    h |= HighlightModifier::Mutable;
-                    h |= HighlightModifier::Unsafe;
-                }
-                return h;
-            }
-        },
-        Definition::SelfType(_) => HighlightTag::Symbol(SymbolKind::Impl),
-        Definition::TypeParam(_) => HighlightTag::Symbol(SymbolKind::TypeParam),
-        Definition::Local(local) => {
-            let tag = if local.is_param(db) {
-                HighlightTag::Symbol(SymbolKind::ValueParam)
-            } else {
-                HighlightTag::Symbol(SymbolKind::Local)
-            };
-            let mut h = Highlight::new(tag);
-            if local.is_mut(db) || local.ty(db).is_mutable_reference() {
-                h |= HighlightModifier::Mutable;
-            }
-            if local.ty(db).as_callable(db).is_some() || local.ty(db).impls_fnonce(db) {
-                h |= HighlightModifier::Callable;
-            }
-            return h;
-        }
-        Definition::LifetimeParam(_) => HighlightTag::Symbol(SymbolKind::LifetimeParam),
-        Definition::Label(_) => HighlightTag::Symbol(SymbolKind::Label),
-    }
-    .into()
-}
-
-fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
-    let default = HighlightTag::UnresolvedReference;
-
-    let parent = match name.syntax().parent() {
-        Some(it) => it,
-        _ => return default.into(),
-    };
-
-    let tag = match parent.kind() {
-        STRUCT => HighlightTag::Symbol(SymbolKind::Struct),
-        ENUM => HighlightTag::Symbol(SymbolKind::Enum),
-        VARIANT => HighlightTag::Symbol(SymbolKind::Variant),
-        UNION => HighlightTag::Symbol(SymbolKind::Union),
-        TRAIT => HighlightTag::Symbol(SymbolKind::Trait),
-        TYPE_ALIAS => HighlightTag::Symbol(SymbolKind::TypeAlias),
-        TYPE_PARAM => HighlightTag::Symbol(SymbolKind::TypeParam),
-        RECORD_FIELD => HighlightTag::Symbol(SymbolKind::Field),
-        MODULE => HighlightTag::Symbol(SymbolKind::Module),
-        FN => HighlightTag::Symbol(SymbolKind::Function),
-        CONST => HighlightTag::Symbol(SymbolKind::Const),
-        STATIC => HighlightTag::Symbol(SymbolKind::Static),
-        IDENT_PAT => HighlightTag::Symbol(SymbolKind::Local),
-        _ => default,
-    };
-
-    tag.into()
-}
-
-fn highlight_name_ref_by_syntax(name: ast::NameRef, sema: &Semantics<RootDatabase>) -> Highlight {
-    let default = HighlightTag::UnresolvedReference;
-
-    let parent = match name.syntax().parent() {
-        Some(it) => it,
-        _ => return default.into(),
-    };
-
-    match parent.kind() {
-        METHOD_CALL_EXPR => {
-            return ast::MethodCallExpr::cast(parent)
-                .and_then(|method_call| highlight_method_call(sema, &method_call))
-                .unwrap_or_else(|| HighlightTag::Symbol(SymbolKind::Function).into());
-        }
-        FIELD_EXPR => {
-            let h = HighlightTag::Symbol(SymbolKind::Field);
-            let is_union = ast::FieldExpr::cast(parent)
-                .and_then(|field_expr| {
-                    let field = sema.resolve_field(&field_expr)?;
-                    Some(if let VariantDef::Union(_) = field.parent_def(sema.db) {
-                        true
-                    } else {
-                        false
-                    })
-                })
-                .unwrap_or(false);
-            if is_union {
-                h | HighlightModifier::Unsafe
-            } else {
-                h.into()
-            }
-        }
-        PATH_SEGMENT => {
-            let path = match parent.parent().and_then(ast::Path::cast) {
-                Some(it) => it,
-                _ => return default.into(),
-            };
-            let expr = match path.syntax().parent().and_then(ast::PathExpr::cast) {
-                Some(it) => it,
-                _ => {
-                    // within path, decide whether it is module or adt by checking for uppercase name
-                    return if name.text().chars().next().unwrap_or_default().is_uppercase() {
-                        HighlightTag::Symbol(SymbolKind::Struct)
-                    } else {
-                        HighlightTag::Symbol(SymbolKind::Module)
-                    }
-                    .into();
-                }
-            };
-            let parent = match expr.syntax().parent() {
-                Some(it) => it,
-                None => return default.into(),
-            };
-
-            match parent.kind() {
-                CALL_EXPR => HighlightTag::Symbol(SymbolKind::Function).into(),
-                _ => if name.text().chars().next().unwrap_or_default().is_uppercase() {
-                    HighlightTag::Symbol(SymbolKind::Struct)
-                } else {
-                    HighlightTag::Symbol(SymbolKind::Const)
-                }
-                .into(),
-            }
-        }
-        _ => default.into(),
-    }
-}
diff --git a/crates/ide/src/syntax_highlighting/format.rs b/crates/ide/src/syntax_highlighting/format.rs
index 26416022b..a74ca844b 100644
--- a/crates/ide/src/syntax_highlighting/format.rs
+++ b/crates/ide/src/syntax_highlighting/format.rs
@@ -1,65 +1,51 @@
 //! Syntax highlighting for format macro strings.
 use syntax::{
     ast::{self, FormatSpecifier, HasFormatSpecifier},
-    AstNode, AstToken, SyntaxElement, SyntaxKind, SyntaxNode, TextRange,
+    AstNode, AstToken, TextRange,
 };
 
-use crate::{
-    syntax_highlighting::HighlightedRangeStack, HighlightTag, HighlightedRange, SymbolKind,
-};
-
-#[derive(Default)]
-pub(super) struct FormatStringHighlighter {
-    format_string: Option<SyntaxElement>,
-}
+use crate::{syntax_highlighting::highlights::Highlights, HlRange, HlTag, SymbolKind};
 
-impl FormatStringHighlighter {
-    pub(super) fn check_for_format_string(&mut self, parent: &SyntaxNode) {
-        // Check if macro takes a format string and remember it for highlighting later.
-        // The macros that accept a format string expand to a compiler builtin macros
-        // `format_args` and `format_args_nl`.
-        if let Some(name) = parent
-            .parent()
-            .and_then(ast::MacroCall::cast)
-            .and_then(|mc| mc.path())
-            .and_then(|p| p.segment())
-            .and_then(|s| s.name_ref())
-        {
-            match name.text().as_str() {
-                "format_args" | "format_args_nl" => {
-                    self.format_string = parent
-                        .children_with_tokens()
-                        .filter(|t| t.kind() != SyntaxKind::WHITESPACE)
-                        .nth(1)
-                        .filter(|e| ast::String::can_cast(e.kind()))
-                }
-                _ => {}
-            }
-        }
+pub(super) fn highlight_format_string(
+    stack: &mut Highlights,
+    string: &ast::String,
+    range: TextRange,
+) {
+    if is_format_string(string).is_none() {
+        return;
     }
-    pub(super) fn highlight_format_string(
-        &self,
-        range_stack: &mut HighlightedRangeStack,
-        string: &impl HasFormatSpecifier,
-        range: TextRange,
-    ) {
-        if self.format_string.as_ref() == Some(&SyntaxElement::from(string.syntax().clone())) {
-            range_stack.push();
-            string.lex_format_specifier(|piece_range, kind| {
-                if let Some(highlight) = highlight_format_specifier(kind) {
-                    range_stack.add(HighlightedRange {
-                        range: piece_range + range.start(),
-                        highlight: highlight.into(),
-                        binding_hash: None,
-                    });
-                }
+
+    string.lex_format_specifier(|piece_range, kind| {
+        if let Some(highlight) = highlight_format_specifier(kind) {
+            stack.add(HlRange {
+                range: piece_range + range.start(),
+                highlight: highlight.into(),
+                binding_hash: None,
             });
-            range_stack.pop();
         }
+    });
+}
+
+fn is_format_string(string: &ast::String) -> Option<()> {
+    let parent = string.syntax().parent();
+
+    let name = parent.parent().and_then(ast::MacroCall::cast)?.path()?.segment()?.name_ref()?;
+    if !matches!(name.text().as_str(), "format_args" | "format_args_nl") {
+        return None;
+    }
+
+    let first_literal = parent
+        .children_with_tokens()
+        .filter_map(|it| it.as_token().cloned().and_then(ast::String::cast))
+        .next()?;
+    if &first_literal != string {
+        return None;
     }
+
+    Some(())
 }
 
-fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HighlightTag> {
+fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HlTag> {
     Some(match kind {
         FormatSpecifier::Open
         | FormatSpecifier::Close
@@ -71,8 +57,10 @@ fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HighlightTag> {
         | FormatSpecifier::DollarSign
         | FormatSpecifier::Dot
         | FormatSpecifier::Asterisk
-        | FormatSpecifier::QuestionMark => HighlightTag::FormatSpecifier,
-        FormatSpecifier::Integer | FormatSpecifier::Zero => HighlightTag::NumericLiteral,
-        FormatSpecifier::Identifier => HighlightTag::Symbol(SymbolKind::Local),
+        | FormatSpecifier::QuestionMark => HlTag::FormatSpecifier,
+
+        FormatSpecifier::Integer | FormatSpecifier::Zero => HlTag::NumericLiteral,
+
+        FormatSpecifier::Identifier => HlTag::Symbol(SymbolKind::Local),
     })
 }
diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
new file mode 100644
index 000000000..34bae49a8
--- /dev/null
+++ b/crates/ide/src/syntax_highlighting/highlight.rs
@@ -0,0 +1,530 @@
+//! Computes color for a single element.
+
+use hir::{AsAssocItem, Semantics, VariantDef};
+use ide_db::{
+    defs::{Definition, NameClass, NameRefClass},
+    RootDatabase,
+};
+use rustc_hash::FxHashMap;
+use syntax::{
+    ast, AstNode, AstToken, NodeOrToken, SyntaxElement,
+    SyntaxKind::{self, *},
+    SyntaxNode, SyntaxToken, T,
+};
+
+use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag, SymbolKind};
+
+pub(super) fn element(
+    sema: &Semantics<RootDatabase>,
+    bindings_shadow_count: &mut FxHashMap<hir::Name, u32>,
+    syntactic_name_ref_highlighting: bool,
+    element: SyntaxElement,
+) -> Option<(Highlight, Option<u64>)> {
+    let db = sema.db;
+    let mut binding_hash = None;
+    let highlight: Highlight = match element.kind() {
+        FN => {
+            bindings_shadow_count.clear();
+            return None;
+        }
+
+        // Highlight definitions depending on the "type" of the definition.
+        NAME => {
+            let name = element.into_node().and_then(ast::Name::cast).unwrap();
+            let name_kind = NameClass::classify(sema, &name);
+
+            if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind {
+                if let Some(name) = local.name(db) {
+                    let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
+                    *shadow_count += 1;
+                    binding_hash = Some(calc_binding_hash(&name, *shadow_count))
+                }
+            };
+
+            match name_kind {
+                Some(NameClass::ExternCrate(_)) => HlTag::Symbol(SymbolKind::Module).into(),
+                Some(NameClass::Definition(def)) => highlight_def(db, def) | HlMod::Definition,
+                Some(NameClass::ConstReference(def)) => highlight_def(db, def),
+                Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
+                    let mut h = HlTag::Symbol(SymbolKind::Field).into();
+                    if let Definition::Field(field) = field_ref {
+                        if let VariantDef::Union(_) = field.parent_def(db) {
+                            h |= HlMod::Unsafe;
+                        }
+                    }
+
+                    h
+                }
+                None => highlight_name_by_syntax(name) | HlMod::Definition,
+            }
+        }
+
+        // Highlight references like the definitions they resolve to
+        NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => {
+            // even though we track whether we are in an attribute or not we still need this special case
+            // as otherwise we would emit unresolved references for name refs inside attributes
+            Highlight::from(HlTag::Symbol(SymbolKind::Function))
+        }
+        NAME_REF => {
+            let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
+            highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| {
+                match NameRefClass::classify(sema, &name_ref) {
+                    Some(name_kind) => match name_kind {
+                        NameRefClass::ExternCrate(_) => HlTag::Symbol(SymbolKind::Module).into(),
+                        NameRefClass::Definition(def) => {
+                            if let Definition::Local(local) = &def {
+                                if let Some(name) = local.name(db) {
+                                    let shadow_count =
+                                        bindings_shadow_count.entry(name.clone()).or_default();
+                                    binding_hash = Some(calc_binding_hash(&name, *shadow_count))
+                                }
+                            };
+
+                            let mut h = highlight_def(db, def);
+
+                            if let Definition::Local(local) = &def {
+                                if is_consumed_lvalue(name_ref.syntax().clone().into(), local, db) {
+                                    h |= HlMod::Consuming;
+                                }
+                            }
+
+                            if let Some(parent) = name_ref.syntax().parent() {
+                                if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
+                                    if let Definition::Field(field) = def {
+                                        if let VariantDef::Union(_) = field.parent_def(db) {
+                                            h |= HlMod::Unsafe;
+                                        }
+                                    }
+                                }
+                            }
+
+                            h
+                        }
+                        NameRefClass::FieldShorthand { .. } => {
+                            HlTag::Symbol(SymbolKind::Field).into()
+                        }
+                    },
+                    None if syntactic_name_ref_highlighting => {
+                        highlight_name_ref_by_syntax(name_ref, sema)
+                    }
+                    None => HlTag::UnresolvedReference.into(),
+                }
+            })
+        }
+
+        // Simple token-based highlighting
+        COMMENT => {
+            let comment = element.into_token().and_then(ast::Comment::cast)?;
+            let h = HlTag::Comment;
+            match comment.kind().doc {
+                Some(_) => h | HlMod::Documentation,
+                None => h.into(),
+            }
+        }
+        STRING | BYTE_STRING => HlTag::StringLiteral.into(),
+        ATTR => HlTag::Attribute.into(),
+        INT_NUMBER | FLOAT_NUMBER => HlTag::NumericLiteral.into(),
+        BYTE => HlTag::ByteLiteral.into(),
+        CHAR => HlTag::CharLiteral.into(),
+        QUESTION => Highlight::new(HlTag::Operator) | HlMod::ControlFlow,
+        LIFETIME => {
+            let lifetime = element.into_node().and_then(ast::Lifetime::cast).unwrap();
+
+            match NameClass::classify_lifetime(sema, &lifetime) {
+                Some(NameClass::Definition(def)) => highlight_def(db, def) | HlMod::Definition,
+                None => match NameRefClass::classify_lifetime(sema, &lifetime) {
+                    Some(NameRefClass::Definition(def)) => highlight_def(db, def),
+                    _ => Highlight::new(HlTag::Symbol(SymbolKind::LifetimeParam)),
+                },
+                _ => Highlight::new(HlTag::Symbol(SymbolKind::LifetimeParam)) | HlMod::Definition,
+            }
+        }
+        p if p.is_punct() => match p {
+            T![&] => {
+                let h = HlTag::Operator.into();
+                let is_unsafe = element
+                    .parent()
+                    .and_then(ast::RefExpr::cast)
+                    .map(|ref_expr| sema.is_unsafe_ref_expr(&ref_expr))
+                    .unwrap_or(false);
+                if is_unsafe {
+                    h | HlMod::Unsafe
+                } else {
+                    h
+                }
+            }
+            T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => HlTag::Operator.into(),
+            T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
+                HlTag::Symbol(SymbolKind::Macro).into()
+            }
+            T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => {
+                HlTag::BuiltinType.into()
+            }
+            T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
+                HlTag::Keyword.into()
+            }
+            T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
+
+                let expr = prefix_expr.expr()?;
+                let ty = sema.type_of_expr(&expr)?;
+                if ty.is_raw_ptr() {
+                    HlTag::Operator | HlMod::Unsafe
+                } else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
+                    HlTag::Operator.into()
+                } else {
+                    HlTag::Punctuation(HlPunct::Other).into()
+                }
+            }
+            T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
+
+                let expr = prefix_expr.expr()?;
+                match expr {
+                    ast::Expr::Literal(_) => HlTag::NumericLiteral,
+                    _ => HlTag::Operator,
+                }
+                .into()
+            }
+            _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+                HlTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::BinExpr::cast).is_some() => HlTag::Operator.into(),
+            _ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
+                HlTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::RangePat::cast).is_some() => HlTag::Operator.into(),
+            _ if element.parent().and_then(ast::RestPat::cast).is_some() => HlTag::Operator.into(),
+            _ if element.parent().and_then(ast::Attr::cast).is_some() => HlTag::Attribute.into(),
+            kind => HlTag::Punctuation(match kind {
+                T!['['] | T![']'] => HlPunct::Bracket,
+                T!['{'] | T!['}'] => HlPunct::Brace,
+                T!['('] | T![')'] => HlPunct::Parenthesis,
+                T![<] | T![>] => HlPunct::Angle,
+                T![,] => HlPunct::Comma,
+                T![:] => HlPunct::Colon,
+                T![;] => HlPunct::Semi,
+                T![.] => HlPunct::Dot,
+                _ => HlPunct::Other,
+            })
+            .into(),
+        },
+
+        k if k.is_keyword() => {
+            let h = Highlight::new(HlTag::Keyword);
+            match k {
+                T![break]
+                | T![continue]
+                | T![else]
+                | T![if]
+                | T![loop]
+                | T![match]
+                | T![return]
+                | T![while]
+                | T![in] => h | HlMod::ControlFlow,
+                T![for] if !is_child_of_impl(&element) => h | HlMod::ControlFlow,
+                T![unsafe] => h | HlMod::Unsafe,
+                T![true] | T![false] => HlTag::BoolLiteral.into(),
+                T![self] => {
+                    let self_param_is_mut = element
+                        .parent()
+                        .and_then(ast::SelfParam::cast)
+                        .and_then(|p| p.mut_token())
+                        .is_some();
+                    let self_path = &element
+                        .parent()
+                        .as_ref()
+                        .and_then(SyntaxNode::parent)
+                        .and_then(ast::Path::cast)
+                        .and_then(|p| sema.resolve_path(&p));
+                    let mut h = HlTag::Symbol(SymbolKind::SelfParam).into();
+                    if self_param_is_mut
+                        || matches!(self_path,
+                            Some(hir::PathResolution::Local(local))
+                                if local.is_self(db)
+                                    && (local.is_mut(db) || local.ty(db).is_mutable_reference())
+                        )
+                    {
+                        h |= HlMod::Mutable
+                    }
+
+                    if let Some(hir::PathResolution::Local(local)) = self_path {
+                        if is_consumed_lvalue(element, &local, db) {
+                            h |= HlMod::Consuming;
+                        }
+                    }
+
+                    h
+                }
+                T![ref] => element
+                    .parent()
+                    .and_then(ast::IdentPat::cast)
+                    .and_then(|ident_pat| {
+                        if sema.is_unsafe_ident_pat(&ident_pat) {
+                            Some(HlMod::Unsafe)
+                        } else {
+                            None
+                        }
+                    })
+                    .map(|modifier| h | modifier)
+                    .unwrap_or(h),
+                _ => h,
+            }
+        }
+
+        _ => return None,
+    };
+
+    return Some((highlight, binding_hash));
+
+    fn calc_binding_hash(name: &hir::Name, shadow_count: u32) -> u64 {
+        fn hash<T: std::hash::Hash + std::fmt::Debug>(x: T) -> u64 {
+            use std::{collections::hash_map::DefaultHasher, hash::Hasher};
+
+            let mut hasher = DefaultHasher::new();
+            x.hash(&mut hasher);
+            hasher.finish()
+        }
+
+        hash((name, shadow_count))
+    }
+}
+
+fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
+    match def {
+        Definition::Macro(_) => HlTag::Symbol(SymbolKind::Macro),
+        Definition::Field(_) => HlTag::Symbol(SymbolKind::Field),
+        Definition::ModuleDef(def) => match def {
+            hir::ModuleDef::Module(_) => HlTag::Symbol(SymbolKind::Module),
+            hir::ModuleDef::Function(func) => {
+                let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Function));
+                if func.as_assoc_item(db).is_some() {
+                    h |= HlMod::Associated;
+                    if func.self_param(db).is_none() {
+                        h |= HlMod::Static
+                    }
+                }
+                if func.is_unsafe(db) {
+                    h |= HlMod::Unsafe;
+                }
+                return h;
+            }
+            hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HlTag::Symbol(SymbolKind::Struct),
+            hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HlTag::Symbol(SymbolKind::Enum),
+            hir::ModuleDef::Adt(hir::Adt::Union(_)) => HlTag::Symbol(SymbolKind::Union),
+            hir::ModuleDef::Variant(_) => HlTag::Symbol(SymbolKind::Variant),
+            hir::ModuleDef::Const(konst) => {
+                let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Const));
+                if konst.as_assoc_item(db).is_some() {
+                    h |= HlMod::Associated
+                }
+                return h;
+            }
+            hir::ModuleDef::Trait(_) => HlTag::Symbol(SymbolKind::Trait),
+            hir::ModuleDef::TypeAlias(type_) => {
+                let mut h = Highlight::new(HlTag::Symbol(SymbolKind::TypeAlias));
+                if type_.as_assoc_item(db).is_some() {
+                    h |= HlMod::Associated
+                }
+                return h;
+            }
+            hir::ModuleDef::BuiltinType(_) => HlTag::BuiltinType,
+            hir::ModuleDef::Static(s) => {
+                let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Static));
+                if s.is_mut(db) {
+                    h |= HlMod::Mutable;
+                    h |= HlMod::Unsafe;
+                }
+                return h;
+            }
+        },
+        Definition::SelfType(_) => HlTag::Symbol(SymbolKind::Impl),
+        Definition::GenericParam(it) => match it {
+            hir::GenericParam::TypeParam(_) => HlTag::Symbol(SymbolKind::TypeParam),
+            hir::GenericParam::ConstParam(_) => HlTag::Symbol(SymbolKind::ConstParam),
+            hir::GenericParam::LifetimeParam(_) => HlTag::Symbol(SymbolKind::LifetimeParam),
+        },
+        Definition::Local(local) => {
+            let tag = if local.is_param(db) {
+                HlTag::Symbol(SymbolKind::ValueParam)
+            } else {
+                HlTag::Symbol(SymbolKind::Local)
+            };
+            let mut h = Highlight::new(tag);
+            if local.is_mut(db) || local.ty(db).is_mutable_reference() {
+                h |= HlMod::Mutable;
+            }
+            if local.ty(db).as_callable(db).is_some() || local.ty(db).impls_fnonce(db) {
+                h |= HlMod::Callable;
+            }
+            return h;
+        }
+        Definition::Label(_) => HlTag::Symbol(SymbolKind::Label),
+    }
+    .into()
+}
+
+fn highlight_func_by_name_ref(
+    sema: &Semantics<RootDatabase>,
+    name_ref: &ast::NameRef,
+) -> Option<Highlight> {
+    let mc = name_ref.syntax().parent().and_then(ast::MethodCallExpr::cast)?;
+    highlight_method_call(sema, &mc)
+}
+
+fn highlight_method_call(
+    sema: &Semantics<RootDatabase>,
+    method_call: &ast::MethodCallExpr,
+) -> Option<Highlight> {
+    let func = sema.resolve_method_call(&method_call)?;
+    let mut h = HlTag::Symbol(SymbolKind::Function).into();
+    h |= HlMod::Associated;
+    if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) {
+        h |= HlMod::Unsafe;
+    }
+    if let Some(self_param) = func.self_param(sema.db) {
+        match self_param.access(sema.db) {
+            hir::Access::Shared => (),
+            hir::Access::Exclusive => h |= HlMod::Mutable,
+            hir::Access::Owned => {
+                if let Some(receiver_ty) =
+                    method_call.receiver().and_then(|it| sema.type_of_expr(&it))
+                {
+                    if !receiver_ty.is_copy(sema.db) {
+                        h |= HlMod::Consuming
+                    }
+                }
+            }
+        }
+    }
+    Some(h)
+}
+
+fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
+    let default = HlTag::UnresolvedReference;
+
+    let parent = match name.syntax().parent() {
+        Some(it) => it,
+        _ => return default.into(),
+    };
+
+    let tag = match parent.kind() {
+        STRUCT => HlTag::Symbol(SymbolKind::Struct),
+        ENUM => HlTag::Symbol(SymbolKind::Enum),
+        VARIANT => HlTag::Symbol(SymbolKind::Variant),
+        UNION => HlTag::Symbol(SymbolKind::Union),
+        TRAIT => HlTag::Symbol(SymbolKind::Trait),
+        TYPE_ALIAS => HlTag::Symbol(SymbolKind::TypeAlias),
+        TYPE_PARAM => HlTag::Symbol(SymbolKind::TypeParam),
+        RECORD_FIELD => HlTag::Symbol(SymbolKind::Field),
+        MODULE => HlTag::Symbol(SymbolKind::Module),
+        FN => HlTag::Symbol(SymbolKind::Function),
+        CONST => HlTag::Symbol(SymbolKind::Const),
+        STATIC => HlTag::Symbol(SymbolKind::Static),
+        IDENT_PAT => HlTag::Symbol(SymbolKind::Local),
+        _ => default,
+    };
+
+    tag.into()
+}
+
+fn highlight_name_ref_by_syntax(name: ast::NameRef, sema: &Semantics<RootDatabase>) -> Highlight {
+    let default = HlTag::UnresolvedReference;
+
+    let parent = match name.syntax().parent() {
+        Some(it) => it,
+        _ => return default.into(),
+    };
+
+    match parent.kind() {
+        METHOD_CALL_EXPR => {
+            return ast::MethodCallExpr::cast(parent)
+                .and_then(|it| highlight_method_call(sema, &it))
+                .unwrap_or_else(|| HlTag::Symbol(SymbolKind::Function).into());
+        }
+        FIELD_EXPR => {
+            let h = HlTag::Symbol(SymbolKind::Field);
+            let is_union = ast::FieldExpr::cast(parent)
+                .and_then(|field_expr| {
+                    let field = sema.resolve_field(&field_expr)?;
+                    Some(if let VariantDef::Union(_) = field.parent_def(sema.db) {
+                        true
+                    } else {
+                        false
+                    })
+                })
+                .unwrap_or(false);
+            if is_union {
+                h | HlMod::Unsafe
+            } else {
+                h.into()
+            }
+        }
+        PATH_SEGMENT => {
+            let path = match parent.parent().and_then(ast::Path::cast) {
+                Some(it) => it,
+                _ => return default.into(),
+            };
+            let expr = match path.syntax().parent().and_then(ast::PathExpr::cast) {
+                Some(it) => it,
+                _ => {
+                    // within path, decide whether it is module or adt by checking for uppercase name
+                    return if name.text().chars().next().unwrap_or_default().is_uppercase() {
+                        HlTag::Symbol(SymbolKind::Struct)
+                    } else {
+                        HlTag::Symbol(SymbolKind::Module)
+                    }
+                    .into();
+                }
+            };
+            let parent = match expr.syntax().parent() {
+                Some(it) => it,
+                None => return default.into(),
+            };
+
+            match parent.kind() {
+                CALL_EXPR => HlTag::Symbol(SymbolKind::Function).into(),
+                _ => if name.text().chars().next().unwrap_or_default().is_uppercase() {
+                    HlTag::Symbol(SymbolKind::Struct)
+                } else {
+                    HlTag::Symbol(SymbolKind::Const)
+                }
+                .into(),
+            }
+        }
+        _ => default.into(),
+    }
+}
+
+fn is_consumed_lvalue(
+    node: NodeOrToken<SyntaxNode, SyntaxToken>,
+    local: &hir::Local,
+    db: &RootDatabase,
+) -> bool {
+    // When lvalues are passed as arguments and they're not Copy, then mark them as Consuming.
+    parents_match(node, &[PATH_SEGMENT, PATH, PATH_EXPR, ARG_LIST]) && !local.ty(db).is_copy(db)
+}
+
+/// Returns true if the parent nodes of `node` all match the `SyntaxKind`s in `kinds` exactly.
+fn parents_match(mut node: NodeOrToken<SyntaxNode, SyntaxToken>, mut kinds: &[SyntaxKind]) -> bool {
+    while let (Some(parent), [kind, rest @ ..]) = (&node.parent(), kinds) {
+        if parent.kind() != *kind {
+            return false;
+        }
+
+        // FIXME: Would be nice to get parent out of the match, but binding by-move and by-value
+        // in the same pattern is unstable: rust-lang/rust#68354.
+        node = node.parent().unwrap().into();
+        kinds = rest;
+    }
+
+    // Only true if we matched all expected kinds
+    kinds.len() == 0
+}
+
+fn is_child_of_impl(element: &SyntaxElement) -> bool {
+    match element.parent() {
+        Some(e) => e.kind() == IMPL,
+        _ => false,
+    }
+}
diff --git a/crates/ide/src/syntax_highlighting/highlights.rs b/crates/ide/src/syntax_highlighting/highlights.rs
new file mode 100644
index 000000000..882a685a5
--- /dev/null
+++ b/crates/ide/src/syntax_highlighting/highlights.rs
@@ -0,0 +1,92 @@
+//! Collects a tree of highlighted ranges and flattens it.
+use std::iter;
+
+use stdx::equal_range_by;
+use syntax::TextRange;
+
+use crate::{HlRange, HlTag};
+
+pub(super) struct Highlights {
+    root: Node,
+}
+
+struct Node {
+    hl_range: HlRange,
+    nested: Vec<Node>,
+}
+
+impl Highlights {
+    pub(super) fn new(range: TextRange) -> Highlights {
+        Highlights {
+            root: Node::new(HlRange { range, highlight: HlTag::None.into(), binding_hash: None }),
+        }
+    }
+
+    pub(super) fn add(&mut self, hl_range: HlRange) {
+        self.root.add(hl_range);
+    }
+
+    pub(super) fn to_vec(self) -> Vec<HlRange> {
+        let mut res = Vec::new();
+        self.root.flatten(&mut res);
+        res
+    }
+}
+
+impl Node {
+    fn new(hl_range: HlRange) -> Node {
+        Node { hl_range, nested: Vec::new() }
+    }
+
+    fn add(&mut self, hl_range: HlRange) {
+        assert!(self.hl_range.range.contains_range(hl_range.range));
+
+        // Fast path
+        if let Some(last) = self.nested.last_mut() {
+            if last.hl_range.range.contains_range(hl_range.range) {
+                return last.add(hl_range);
+            }
+            if last.hl_range.range.end() <= hl_range.range.start() {
+                return self.nested.push(Node::new(hl_range));
+            }
+        }
+
+        let overlapping =
+            equal_range_by(&self.nested, |n| TextRange::ordering(n.hl_range.range, hl_range.range));
+
+        if overlapping.len() == 1
+            && self.nested[overlapping.start].hl_range.range.contains_range(hl_range.range)
+        {
+            return self.nested[overlapping.start].add(hl_range);
+        }
+
+        let nested = self
+            .nested
+            .splice(overlapping.clone(), iter::once(Node::new(hl_range)))
+            .collect::<Vec<_>>();
+        self.nested[overlapping.start].nested = nested;
+    }
+
+    fn flatten(&self, acc: &mut Vec<HlRange>) {
+        let mut start = self.hl_range.range.start();
+        let mut nested = self.nested.iter();
+        loop {
+            let next = nested.next();
+            let end = next.map_or(self.hl_range.range.end(), |it| it.hl_range.range.start());
+            if start < end {
+                acc.push(HlRange {
+                    range: TextRange::new(start, end),
+                    highlight: self.hl_range.highlight,
+                    binding_hash: self.hl_range.binding_hash,
+                });
+            }
+            start = match next {
+                Some(child) => {
+                    child.flatten(acc);
+                    child.hl_range.range.end()
+                }
+                None => break,
+            }
+        }
+    }
+}
diff --git a/crates/ide/src/syntax_highlighting/html.rs b/crates/ide/src/syntax_highlighting/html.rs
index 99ba3a59d..0ee7bc96e 100644
--- a/crates/ide/src/syntax_highlighting/html.rs
+++ b/crates/ide/src/syntax_highlighting/html.rs
@@ -3,7 +3,7 @@
 use ide_db::base_db::SourceDatabase;
 use oorandom::Rand32;
 use stdx::format_to;
-use syntax::{AstNode, TextRange, TextSize};
+use syntax::AstNode;
 
 use crate::{syntax_highlighting::highlight, FileId, RootDatabase};
 
@@ -20,35 +20,27 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: boo
         )
     }
 
-    let ranges = highlight(db, file_id, None, false);
+    let hl_ranges = highlight(db, file_id, None, false);
     let text = parse.tree().syntax().to_string();
-    let mut prev_pos = TextSize::from(0);
     let mut buf = String::new();
     buf.push_str(&STYLE);
     buf.push_str("<pre><code>");
-    for range in &ranges {
-        if range.range.start() > prev_pos {
-            let curr = &text[TextRange::new(prev_pos, range.range.start())];
-            let text = html_escape(curr);
-            buf.push_str(&text);
+    for r in &hl_ranges {
+        let chunk = html_escape(&text[r.range]);
+        if r.highlight.is_empty() {
+            format_to!(buf, "{}", chunk);
+            continue;
         }
-        let curr = &text[TextRange::new(range.range.start(), range.range.end())];
 
-        let class = range.highlight.to_string().replace('.', " ");
-        let color = match (rainbow, range.binding_hash) {
+        let class = r.highlight.to_string().replace('.', " ");
+        let color = match (rainbow, r.binding_hash) {
             (true, Some(hash)) => {
                 format!(" data-binding-hash=\"{}\" style=\"color: {};\"", hash, rainbowify(hash))
             }
             _ => "".into(),
         };
-        format_to!(buf, "<span class=\"{}\"{}>{}</span>", class, color, html_escape(curr));
-
-        prev_pos = range.range.end();
+        format_to!(buf, "<span class=\"{}\"{}>{}</span>", class, color, chunk);
     }
-    // Add the remaining (non-highlighted) text
-    let curr = &text[TextRange::new(prev_pos, TextSize::of(&text))];
-    let text = html_escape(curr);
-    buf.push_str(&text);
     buf.push_str("</code></pre>");
     buf
 }
diff --git a/crates/ide/src/syntax_highlighting/inject.rs b/crates/ide/src/syntax_highlighting/inject.rs
new file mode 100644
index 000000000..281461493
--- /dev/null
+++ b/crates/ide/src/syntax_highlighting/inject.rs
@@ -0,0 +1,158 @@
+//! "Recursive" Syntax highlighting for code in doctests and fixtures.
+
+use hir::Semantics;
+use ide_db::call_info::ActiveParameter;
+use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
+
+use crate::{Analysis, HlMod, HlRange, HlTag, RootDatabase};
+
+use super::{highlights::Highlights, injector::Injector};
+
+pub(super) fn ra_fixture(
+    hl: &mut Highlights,
+    sema: &Semantics<RootDatabase>,
+    literal: ast::String,
+    expanded: SyntaxToken,
+) -> Option<()> {
+    let active_parameter = ActiveParameter::at_token(&sema, expanded)?;
+    if !active_parameter.name.starts_with("ra_fixture") {
+        return None;
+    }
+    let value = literal.value()?;
+
+    if let Some(range) = literal.open_quote_text_range() {
+        hl.add(HlRange { range, highlight: HlTag::StringLiteral.into(), binding_hash: None })
+    }
+
+    let mut inj = Injector::default();
+
+    let mut text = &*value;
+    let mut offset: TextSize = 0.into();
+
+    while !text.is_empty() {
+        let marker = "$0";
+        let idx = text.find(marker).unwrap_or(text.len());
+        let (chunk, next) = text.split_at(idx);
+        inj.add(chunk, TextRange::at(offset, TextSize::of(chunk)));
+
+        text = next;
+        offset += TextSize::of(chunk);
+
+        if let Some(next) = text.strip_prefix(marker) {
+            if let Some(range) = literal.map_range_up(TextRange::at(offset, TextSize::of(marker))) {
+                hl.add(HlRange { range, highlight: HlTag::Keyword.into(), binding_hash: None });
+            }
+
+            text = next;
+
+            let marker_len = TextSize::of(marker);
+            offset += marker_len;
+        }
+    }
+
+    let (analysis, tmp_file_id) = Analysis::from_single_file(inj.text().to_string());
+
+    for mut hl_range in analysis.highlight(tmp_file_id).unwrap() {
+        for range in inj.map_range_up(hl_range.range) {
+            if let Some(range) = literal.map_range_up(range) {
+                hl_range.range = range;
+                hl.add(hl_range.clone());
+            }
+        }
+    }
+
+    if let Some(range) = literal.close_quote_text_range() {
+        hl.add(HlRange { range, highlight: HlTag::StringLiteral.into(), binding_hash: None })
+    }
+
+    Some(())
+}
+
+const RUSTDOC_FENCE: &'static str = "```";
+const RUSTDOC_FENCE_TOKENS: &[&'static str] = &[
+    "",
+    "rust",
+    "should_panic",
+    "ignore",
+    "no_run",
+    "compile_fail",
+    "edition2015",
+    "edition2018",
+    "edition2021",
+];
+
+/// Injection of syntax highlighting of doctests.
+pub(super) fn doc_comment(hl: &mut Highlights, node: &SyntaxNode) {
+    let doc_comments = node
+        .children_with_tokens()
+        .filter_map(|it| it.into_token().and_then(ast::Comment::cast))
+        .filter(|it| it.kind().doc.is_some());
+
+    if !doc_comments.clone().any(|it| it.text().contains(RUSTDOC_FENCE)) {
+        return;
+    }
+
+    let mut inj = Injector::default();
+    inj.add_unmapped("fn doctest() {\n");
+
+    let mut is_codeblock = false;
+    let mut is_doctest = false;
+
+    // Replace the original, line-spanning comment ranges by new, only comment-prefix
+    // spanning comment ranges.
+    let mut new_comments = Vec::new();
+    for comment in doc_comments {
+        match comment.text().find(RUSTDOC_FENCE) {
+            Some(idx) => {
+                is_codeblock = !is_codeblock;
+                // Check whether code is rust by inspecting fence guards
+                let guards = &comment.text()[idx + RUSTDOC_FENCE.len()..];
+                let is_rust =
+                    guards.split(',').all(|sub| RUSTDOC_FENCE_TOKENS.contains(&sub.trim()));
+                is_doctest = is_codeblock && is_rust;
+                continue;
+            }
+            None if !is_doctest => continue,
+            None => (),
+        }
+
+        let line: &str = comment.text().as_str();
+        let range = comment.syntax().text_range();
+
+        let mut pos = TextSize::of(comment.prefix());
+        // whitespace after comment is ignored
+        if let Some(ws) = line[pos.into()..].chars().next().filter(|c| c.is_whitespace()) {
+            pos += TextSize::of(ws);
+        }
+        // lines marked with `#` should be ignored in output, we skip the `#` char
+        if let Some(ws) = line[pos.into()..].chars().next().filter(|&c| c == '#') {
+            pos += TextSize::of(ws);
+        }
+
+        new_comments.push(TextRange::at(range.start(), pos));
+
+        inj.add(&line[pos.into()..], TextRange::new(range.start() + pos, range.end()));
+        inj.add_unmapped("\n");
+    }
+    inj.add_unmapped("\n}");
+
+    let (analysis, tmp_file_id) = Analysis::from_single_file(inj.text().to_string());
+
+    for h in analysis.with_db(|db| super::highlight(db, tmp_file_id, None, true)).unwrap() {
+        for r in inj.map_range_up(h.range) {
+            hl.add(HlRange {
+                range: r,
+                highlight: h.highlight | HlMod::Injected,
+                binding_hash: h.binding_hash,
+            });
+        }
+    }
+
+    for range in new_comments {
+        hl.add(HlRange {
+            range,
+            highlight: HlTag::Comment | HlMod::Documentation,
+            binding_hash: None,
+        });
+    }
+}
diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs
deleted file mode 100644
index 9eb184c74..000000000
--- a/crates/ide/src/syntax_highlighting/injection.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-//! Syntax highlighting injections such as highlighting of documentation tests.
-
-use std::{collections::BTreeMap, convert::TryFrom};
-
-use hir::Semantics;
-use ide_db::call_info::ActiveParameter;
-use itertools::Itertools;
-use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
-
-use crate::{Analysis, Highlight, HighlightModifier, HighlightTag, HighlightedRange, RootDatabase};
-
-use super::HighlightedRangeStack;
-
-pub(super) fn highlight_injection(
-    acc: &mut HighlightedRangeStack,
-    sema: &Semantics<RootDatabase>,
-    literal: ast::String,
-    expanded: SyntaxToken,
-) -> Option<()> {
-    let active_parameter = ActiveParameter::at_token(&sema, expanded)?;
-    if !active_parameter.name.starts_with("ra_fixture") {
-        return None;
-    }
-    let value = literal.value()?;
-    let (analysis, tmp_file_id) = Analysis::from_single_file(value.into_owned());
-
-    if let Some(range) = literal.open_quote_text_range() {
-        acc.add(HighlightedRange {
-            range,
-            highlight: HighlightTag::StringLiteral.into(),
-            binding_hash: None,
-        })
-    }
-
-    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)
-        }
-    }
-
-    if let Some(range) = literal.close_quote_text_range() {
-        acc.add(HighlightedRange {
-            range,
-            highlight: HighlightTag::StringLiteral.into(),
-            binding_hash: None,
-        })
-    }
-
-    Some(())
-}
-
-/// Mapping from extracted documentation code to original code
-type RangesMap = BTreeMap<TextSize, TextSize>;
-
-const RUSTDOC_FENCE: &'static str = "```";
-const RUSTDOC_FENCE_TOKENS: &[&'static str] =
-    &["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018"];
-
-/// Extracts Rust code from documentation comments as well as a mapping from
-/// the extracted source code back to the original source ranges.
-/// Lastly, a vector of new comment highlight ranges (spanning only the
-/// comment prefix) is returned which is used in the syntax highlighting
-/// injection to replace the previous (line-spanning) comment ranges.
-pub(super) fn extract_doc_comments(
-    node: &SyntaxNode,
-) -> Option<(String, RangesMap, Vec<HighlightedRange>)> {
-    // wrap the doctest into function body to get correct syntax highlighting
-    let prefix = "fn doctest() {\n";
-    let suffix = "}\n";
-    // Mapping from extracted documentation code to original code
-    let mut range_mapping: RangesMap = BTreeMap::new();
-    let mut line_start = TextSize::try_from(prefix.len()).unwrap();
-    let mut is_codeblock = false;
-    let mut is_doctest = false;
-    // Replace the original, line-spanning comment ranges by new, only comment-prefix
-    // spanning comment ranges.
-    let mut new_comments = Vec::new();
-    let doctest = node
-        .children_with_tokens()
-        .filter_map(|el| el.into_token().and_then(ast::Comment::cast))
-        .filter(|comment| comment.kind().doc.is_some())
-        .filter(|comment| {
-            if let Some(idx) = comment.text().find(RUSTDOC_FENCE) {
-                is_codeblock = !is_codeblock;
-                // Check whether code is rust by inspecting fence guards
-                let guards = &comment.text()[idx + RUSTDOC_FENCE.len()..];
-                let is_rust =
-                    guards.split(',').all(|sub| RUSTDOC_FENCE_TOKENS.contains(&sub.trim()));
-                is_doctest = is_codeblock && is_rust;
-                false
-            } else {
-                is_doctest
-            }
-        })
-        .map(|comment| {
-            let prefix_len = comment.prefix().len();
-            let line: &str = comment.text().as_str();
-            let range = comment.syntax().text_range();
-
-            // whitespace after comment is ignored
-            let pos = if let Some(ws) = line.chars().nth(prefix_len).filter(|c| c.is_whitespace()) {
-                prefix_len + ws.len_utf8()
-            } else {
-                prefix_len
-            };
-
-            // lines marked with `#` should be ignored in output, we skip the `#` char
-            let pos = if let Some(ws) = line.chars().nth(pos).filter(|&c| c == '#') {
-                pos + ws.len_utf8()
-            } else {
-                pos
-            };
-
-            range_mapping.insert(line_start, range.start() + TextSize::try_from(pos).unwrap());
-            new_comments.push(HighlightedRange {
-                range: TextRange::new(
-                    range.start(),
-                    range.start() + TextSize::try_from(pos).unwrap(),
-                ),
-                highlight: HighlightTag::Comment | HighlightModifier::Documentation,
-                binding_hash: None,
-            });
-            line_start += range.len() - TextSize::try_from(pos).unwrap();
-            line_start += TextSize::try_from('\n'.len_utf8()).unwrap();
-
-            line[pos..].to_owned()
-        })
-        .join("\n");
-
-    if doctest.is_empty() {
-        return None;
-    }
-
-    let doctest = format!("{}{}{}", prefix, doctest, suffix);
-    Some((doctest, range_mapping, new_comments))
-}
-
-/// Injection of syntax highlighting of doctests.
-pub(super) fn highlight_doc_comment(
-    text: String,
-    range_mapping: RangesMap,
-    new_comments: Vec<HighlightedRange>,
-    stack: &mut HighlightedRangeStack,
-) {
-    let (analysis, tmp_file_id) = Analysis::from_single_file(text);
-
-    stack.push();
-    for mut h in analysis.with_db(|db| super::highlight(db, tmp_file_id, None, true)).unwrap() {
-        // Determine start offset and end offset in case of multi-line ranges
-        let mut start_offset = None;
-        let mut end_offset = None;
-        for (line_start, orig_line_start) in range_mapping.range(..h.range.end()).rev() {
-            // It's possible for orig_line_start - line_start to be negative. Add h.range.start()
-            // here and remove it from the end range after the loop below so that the values are
-            // always non-negative.
-            let offset = h.range.start() + orig_line_start - line_start;
-            if line_start <= &h.range.start() {
-                start_offset.get_or_insert(offset);
-                break;
-            } else {
-                end_offset.get_or_insert(offset);
-            }
-        }
-        if let Some(start_offset) = start_offset {
-            h.range = TextRange::new(
-                start_offset,
-                h.range.end() + end_offset.unwrap_or(start_offset) - h.range.start(),
-            );
-
-            h.highlight |= HighlightModifier::Injected;
-            stack.add(h);
-        }
-    }
-
-    // Inject the comment prefix highlight ranges
-    stack.push();
-    for comment in new_comments {
-        stack.add(comment);
-    }
-    stack.pop_and_inject(None);
-    stack.pop_and_inject(Some(Highlight::from(HighlightTag::Dummy) | HighlightModifier::Injected));
-}
diff --git a/crates/ide/src/syntax_highlighting/injector.rs b/crates/ide/src/syntax_highlighting/injector.rs
new file mode 100644
index 000000000..24ff473ec
--- /dev/null
+++ b/crates/ide/src/syntax_highlighting/injector.rs
@@ -0,0 +1,78 @@
+//! Extracts a subsequence of a text document, remembering the mapping of ranges
+//! between original and extracted texts.
+use std::ops::{self, Sub};
+
+use stdx::equal_range_by;
+use syntax::{TextRange, TextSize};
+
+#[derive(Default)]
+pub(super) struct Injector {
+    buf: String,
+    ranges: Vec<(TextRange, Option<Delta<TextSize>>)>,
+}
+
+impl Injector {
+    pub(super) fn add(&mut self, text: &str, source_range: TextRange) {
+        let len = TextSize::of(text);
+        assert_eq!(len, source_range.len());
+        self.add_impl(text, Some(source_range.start()));
+    }
+    pub(super) fn add_unmapped(&mut self, text: &str) {
+        self.add_impl(text, None);
+    }
+    fn add_impl(&mut self, text: &str, source: Option<TextSize>) {
+        let len = TextSize::of(text);
+        let target_range = TextRange::at(TextSize::of(&self.buf), len);
+        self.ranges.push((target_range, source.map(|it| Delta::new(target_range.start(), it))));
+        self.buf.push_str(text);
+    }
+
+    pub(super) fn text(&self) -> &str {
+        &self.buf
+    }
+    pub(super) fn map_range_up(&self, range: TextRange) -> impl Iterator<Item = TextRange> + '_ {
+        equal_range_by(&self.ranges, |&(r, _)| TextRange::ordering(r, range)).filter_map(move |i| {
+            let (target_range, delta) = self.ranges[i];
+            let intersection = target_range.intersect(range).unwrap();
+            Some(intersection + delta?)
+        })
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Delta<T> {
+    Add(T),
+    Sub(T),
+}
+
+impl<T> Delta<T> {
+    fn new(from: T, to: T) -> Delta<T>
+    where
+        T: Ord + Sub<Output = T>,
+    {
+        if to >= from {
+            Delta::Add(to - from)
+        } else {
+            Delta::Sub(from - to)
+        }
+    }
+}
+
+impl ops::Add<Delta<TextSize>> for TextSize {
+    type Output = TextSize;
+
+    fn add(self, rhs: Delta<TextSize>) -> TextSize {
+        match rhs {
+            Delta::Add(it) => self + it,
+            Delta::Sub(it) => self - it,
+        }
+    }
+}
+
+impl ops::Add<Delta<TextSize>> for TextRange {
+    type Output = TextRange;
+
+    fn add(self, rhs: Delta<TextSize>) -> TextRange {
+        TextRange::at(self.start() + rhs, self.len())
+    }
+}
diff --git a/crates/ide/src/syntax_highlighting/macro_rules.rs b/crates/ide/src/syntax_highlighting/macro_rules.rs
index 4462af47e..44620e912 100644
--- a/crates/ide/src/syntax_highlighting/macro_rules.rs
+++ b/crates/ide/src/syntax_highlighting/macro_rules.rs
@@ -1,7 +1,7 @@
 //! Syntax highlighting for macro_rules!.
 use syntax::{SyntaxElement, SyntaxKind, SyntaxToken, TextRange, T};
 
-use crate::{HighlightTag, HighlightedRange};
+use crate::{HlRange, HlTag};
 
 #[derive(Default)]
 pub(super) struct MacroRulesHighlighter {
@@ -19,13 +19,13 @@ impl MacroRulesHighlighter {
         }
     }
 
-    pub(super) fn highlight(&self, element: SyntaxElement) -> Option<HighlightedRange> {
+    pub(super) fn highlight(&self, element: SyntaxElement) -> Option<HlRange> {
         if let Some(state) = self.state.as_ref() {
             if matches!(state.rule_state, RuleState::Matcher | RuleState::Expander) {
                 if let Some(range) = is_metavariable(element) {
-                    return Some(HighlightedRange {
+                    return Some(HlRange {
                         range,
-                        highlight: HighlightTag::UnresolvedReference.into(),
+                        highlight: HlTag::UnresolvedReference.into(),
                         binding_hash: None,
                     });
                 }
@@ -119,7 +119,7 @@ fn is_metavariable(element: SyntaxElement) -> Option<TextRange> {
     let tok = element.as_token()?;
     match tok.kind() {
         kind if kind == SyntaxKind::IDENT || kind.is_keyword() => {
-            if let Some(_dollar) = tok.prev_token().filter(|t| t.kind() == SyntaxKind::DOLLAR) {
+            if let Some(_dollar) = tok.prev_token().filter(|t| t.kind() == T![$]) {
                 return Some(tok.text_range());
             }
         }
diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs
index 2a6cc0cab..8dd05ac52 100644
--- a/crates/ide/src/syntax_highlighting/tags.rs
+++ b/crates/ide/src/syntax_highlighting/tags.rs
@@ -7,15 +7,15 @@ use crate::SymbolKind;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct Highlight {
-    pub tag: HighlightTag,
-    pub modifiers: HighlightModifiers,
+    pub tag: HlTag,
+    pub mods: HlMods,
 }
 
 #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct HighlightModifiers(u32);
+pub struct HlMods(u32);
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub enum HighlightTag {
+pub enum HlTag {
     Symbol(SymbolKind),
 
     BoolLiteral,
@@ -29,17 +29,17 @@ pub enum HighlightTag {
     EscapeSequence,
     FormatSpecifier,
     Keyword,
-    Punctuation,
+    Punctuation(HlPunct),
     Operator,
     UnresolvedReference,
 
-    // For things which don't have proper Tag, but want to use modifiers.
-    Dummy,
+    // For things which don't have a specific highlight.
+    None,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 #[repr(u8)]
-pub enum HighlightModifier {
+pub enum HlMod {
     /// Used to differentiate individual elements within attributes.
     Attribute = 0,
     /// Used with keywords like `if` and `break`.
@@ -61,10 +61,32 @@ pub enum HighlightModifier {
     Unsafe,
 }
 
-impl HighlightTag {
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub enum HlPunct {
+    /// []
+    Bracket,
+    /// {}
+    Brace,
+    /// ()
+    Parenthesis,
+    /// <>
+    Angle,
+    /// ,
+    Comma,
+    /// .
+    Dot,
+    /// :
+    Colon,
+    /// ;
+    Semi,
+    ///
+    Other,
+}
+
+impl HlTag {
     fn as_str(self) -> &'static str {
         match self {
-            HighlightTag::Symbol(symbol) => match symbol {
+            HlTag::Symbol(symbol) => match symbol {
                 SymbolKind::Const => "constant",
                 SymbolKind::Static => "static",
                 SymbolKind::Enum => "enum",
@@ -77,6 +99,7 @@ impl HighlightTag {
                 SymbolKind::Function => "function",
                 SymbolKind::TypeAlias => "type_alias",
                 SymbolKind::TypeParam => "type_param",
+                SymbolKind::ConstParam => "const_param",
                 SymbolKind::LifetimeParam => "lifetime",
                 SymbolKind::Macro => "macro",
                 SymbolKind::Local => "variable",
@@ -85,59 +108,69 @@ impl HighlightTag {
                 SymbolKind::SelfParam => "self_keyword",
                 SymbolKind::Impl => "self_type",
             },
-            HighlightTag::Attribute => "attribute",
-            HighlightTag::BoolLiteral => "bool_literal",
-            HighlightTag::BuiltinType => "builtin_type",
-            HighlightTag::ByteLiteral => "byte_literal",
-            HighlightTag::CharLiteral => "char_literal",
-            HighlightTag::Comment => "comment",
-            HighlightTag::EscapeSequence => "escape_sequence",
-            HighlightTag::FormatSpecifier => "format_specifier",
-            HighlightTag::Dummy => "dummy",
-            HighlightTag::Keyword => "keyword",
-            HighlightTag::Punctuation => "punctuation",
-            HighlightTag::NumericLiteral => "numeric_literal",
-            HighlightTag::Operator => "operator",
-            HighlightTag::StringLiteral => "string_literal",
-            HighlightTag::UnresolvedReference => "unresolved_reference",
+            HlTag::Attribute => "attribute",
+            HlTag::BoolLiteral => "bool_literal",
+            HlTag::BuiltinType => "builtin_type",
+            HlTag::ByteLiteral => "byte_literal",
+            HlTag::CharLiteral => "char_literal",
+            HlTag::Comment => "comment",
+            HlTag::EscapeSequence => "escape_sequence",
+            HlTag::FormatSpecifier => "format_specifier",
+            HlTag::Keyword => "keyword",
+            HlTag::Punctuation(punct) => match punct {
+                HlPunct::Bracket => "bracket",
+                HlPunct::Brace => "brace",
+                HlPunct::Parenthesis => "parenthesis",
+                HlPunct::Angle => "angle",
+                HlPunct::Comma => "comma",
+                HlPunct::Dot => "dot",
+                HlPunct::Colon => "colon",
+                HlPunct::Semi => "semicolon",
+                HlPunct::Other => "punctuation",
+            },
+            HlTag::NumericLiteral => "numeric_literal",
+            HlTag::Operator => "operator",
+            HlTag::StringLiteral => "string_literal",
+            HlTag::UnresolvedReference => "unresolved_reference",
+            HlTag::None => "none",
         }
     }
 }
 
-impl fmt::Display for HighlightTag {
+impl fmt::Display for HlTag {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(self.as_str(), f)
     }
 }
 
-impl HighlightModifier {
-    const ALL: &'static [HighlightModifier; HighlightModifier::Unsafe as u8 as usize + 1] = &[
-        HighlightModifier::Attribute,
-        HighlightModifier::ControlFlow,
-        HighlightModifier::Definition,
-        HighlightModifier::Documentation,
-        HighlightModifier::Injected,
-        HighlightModifier::Mutable,
-        HighlightModifier::Consuming,
-        HighlightModifier::Callable,
-        HighlightModifier::Static,
-        HighlightModifier::Associated,
-        HighlightModifier::Unsafe,
+impl HlMod {
+    const ALL: &'static [HlMod; HlMod::Unsafe as u8 as usize + 1] = &[
+        HlMod::Attribute,
+        HlMod::ControlFlow,
+        HlMod::Definition,
+        HlMod::Documentation,
+        HlMod::Injected,
+        HlMod::Mutable,
+        HlMod::Consuming,
+        HlMod::Callable,
+        HlMod::Static,
+        HlMod::Associated,
+        HlMod::Unsafe,
     ];
 
     fn as_str(self) -> &'static str {
         match self {
-            HighlightModifier::Attribute => "attribute",
-            HighlightModifier::ControlFlow => "control",
-            HighlightModifier::Definition => "declaration",
-            HighlightModifier::Documentation => "documentation",
-            HighlightModifier::Injected => "injected",
-            HighlightModifier::Mutable => "mutable",
-            HighlightModifier::Consuming => "consuming",
-            HighlightModifier::Unsafe => "unsafe",
-            HighlightModifier::Callable => "callable",
-            HighlightModifier::Static => "static",
-            HighlightModifier::Associated => "associated",
+            HlMod::Attribute => "attribute",
+            HlMod::ControlFlow => "control",
+            HlMod::Definition => "declaration",
+            HlMod::Documentation => "documentation",
+            HlMod::Injected => "injected",
+            HlMod::Mutable => "mutable",
+            HlMod::Consuming => "consuming",
+            HlMod::Unsafe => "unsafe",
+            HlMod::Callable => "callable",
+            HlMod::Static => "static",
+            HlMod::Associated => "associated",
         }
     }
 
@@ -146,7 +179,7 @@ impl HighlightModifier {
     }
 }
 
-impl fmt::Display for HighlightModifier {
+impl fmt::Display for HlMod {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(self.as_str(), f)
     }
@@ -155,60 +188,63 @@ impl fmt::Display for HighlightModifier {
 impl fmt::Display for Highlight {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.tag)?;
-        for modifier in self.modifiers.iter() {
+        for modifier in self.mods.iter() {
             write!(f, ".{}", modifier)?
         }
         Ok(())
     }
 }
 
-impl From<HighlightTag> for Highlight {
-    fn from(tag: HighlightTag) -> Highlight {
+impl From<HlTag> for Highlight {
+    fn from(tag: HlTag) -> Highlight {
         Highlight::new(tag)
     }
 }
 
 impl Highlight {
-    pub(crate) fn new(tag: HighlightTag) -> Highlight {
-        Highlight { tag, modifiers: HighlightModifiers::default() }
+    pub(crate) fn new(tag: HlTag) -> Highlight {
+        Highlight { tag, mods: HlMods::default() }
+    }
+    pub fn is_empty(&self) -> bool {
+        self.tag == HlTag::None && self.mods == HlMods::default()
     }
 }
 
-impl ops::BitOr<HighlightModifier> for HighlightTag {
+impl ops::BitOr<HlMod> for HlTag {
     type Output = Highlight;
 
-    fn bitor(self, rhs: HighlightModifier) -> Highlight {
+    fn bitor(self, rhs: HlMod) -> Highlight {
         Highlight::new(self) | rhs
     }
 }
 
-impl ops::BitOrAssign<HighlightModifier> for HighlightModifiers {
-    fn bitor_assign(&mut self, rhs: HighlightModifier) {
+impl ops::BitOrAssign<HlMod> for HlMods {
+    fn bitor_assign(&mut self, rhs: HlMod) {
         self.0 |= rhs.mask();
     }
 }
 
-impl ops::BitOrAssign<HighlightModifier> for Highlight {
-    fn bitor_assign(&mut self, rhs: HighlightModifier) {
-        self.modifiers |= rhs;
+impl ops::BitOrAssign<HlMod> for Highlight {
+    fn bitor_assign(&mut self, rhs: HlMod) {
+        self.mods |= rhs;
     }
 }
 
-impl ops::BitOr<HighlightModifier> for Highlight {
+impl ops::BitOr<HlMod> for Highlight {
     type Output = Highlight;
 
-    fn bitor(mut self, rhs: HighlightModifier) -> Highlight {
+    fn bitor(mut self, rhs: HlMod) -> Highlight {
         self |= rhs;
         self
     }
 }
 
-impl HighlightModifiers {
-    pub fn contains(self, m: HighlightModifier) -> bool {
+impl HlMods {
+    pub fn contains(self, m: HlMod) -> bool {
         self.0 & m.mask() == m.mask()
     }
 
-    pub fn iter(self) -> impl Iterator<Item = HighlightModifier> {
-        HighlightModifier::ALL.iter().copied().filter(move |it| self.0 & it.mask() == it.mask())
+    pub fn iter(self) -> impl Iterator<Item = HlMod> {
+        HlMod::ALL.iter().copied().filter(move |it| self.0 & it.mask() == it.mask())
     }
 }
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
index 506ebe60e..e36e6fc3f 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
@@ -36,22 +36,22 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">not_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">not_static</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
 
-<span class="keyword">struct</span> <span class="struct declaration">foo</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<span class="keyword">struct</span> <span class="struct declaration">foo</span> <span class="brace">{</span><span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="struct">foo</span> <span class="punctuation">{</span>
-    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration static associated">is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="struct">foo</span> <span class="brace">{</span>
+    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration static associated">is_static</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">is_not_static</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">trait</span> <span class="trait declaration">t</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration static associated">t_is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">t_is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">trait</span> <span class="trait declaration">t</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration static associated">t_is_static</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">t_is_not_static</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="trait">t</span> <span class="keyword">for</span> <span class="struct">foo</span> <span class="punctuation">{</span>
-    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration static associated">is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="trait">t</span> <span class="keyword">for</span> <span class="struct">foo</span> <span class="brace">{</span>
+    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration static associated">is_static</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">is_not_static</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
         </code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
index 4dd7413ba..6dadda1c1 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
@@ -37,67 +37,72 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
 <pre><code><span class="comment documentation">/// ```</span>
-<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="punctuation injected">_</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="punctuation injected">;</span><span class="punctuation injected">
-</span><span class="comment documentation">/// ```</span>
-<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span>
-    <span class="field declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span><span class="punctuation">,</span>
-<span class="punctuation">}</span>
+<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="punctuation injected">_</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="semicolon injected">;</span>
+<span class="comment documentation">/// ```</span>
+<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="brace">{</span>
+    <span class="field declaration">bar</span><span class="colon">:</span> <span class="builtin_type">bool</span><span class="comma">,</span>
+<span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
-    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration associated">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="bool_literal">true</span><span class="punctuation">;</span>
+<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="brace">{</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="punctuation injected">_</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"Call me</span>
+    <span class="comment">//    KILLER WHALE</span>
+    <span class="comment documentation">/// </span><span class="string_literal injected">    Ishmael."</span><span class="semicolon injected">;</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration associated">bar</span><span class="colon">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="bool_literal">true</span><span class="semicolon">;</span>
 
     <span class="comment documentation">/// Constructs a new `Foo`.</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// # Examples</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">/// #</span><span class="dummy injected"> </span><span class="attribute attribute injected">#</span><span class="attribute attribute injected">!</span><span class="attribute attribute injected">[</span><span class="function attribute injected">allow</span><span class="punctuation attribute injected">(</span><span class="attribute attribute injected">unused_mut</span><span class="punctuation attribute injected">)</span><span class="attribute attribute injected">]</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="keyword injected">mut</span><span class="dummy injected"> </span><span class="variable declaration injected mutable">foo</span><span class="punctuation injected">:</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
-</span>    <span class="comment documentation">/// ```</span>
-    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration static associated">new</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
-        <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">bar</span><span class="punctuation">:</span> <span class="bool_literal">true</span> <span class="punctuation">}</span>
-    <span class="punctuation">}</span>
+    <span class="comment documentation">/// #</span><span class="none injected"> </span><span class="attribute attribute injected">#</span><span class="attribute attribute injected">!</span><span class="attribute attribute injected">[</span><span class="function attribute injected">allow</span><span class="parenthesis attribute injected">(</span><span class="attribute attribute injected">unused_mut</span><span class="parenthesis attribute injected">)</span><span class="attribute attribute injected">]</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="keyword injected">mut</span><span class="none injected"> </span><span class="variable declaration injected mutable">foo</span><span class="colon injected">:</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="semicolon injected">;</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration static associated">new</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="struct">Foo</span> <span class="brace">{</span>
+        <span class="struct">Foo</span> <span class="brace">{</span> <span class="field">bar</span><span class="colon">:</span> <span class="bool_literal">true</span> <span class="brace">}</span>
+    <span class="brace">}</span>
 
     <span class="comment documentation">/// `bar` method on `Foo`.</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// # Examples</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="dummy injected"> </span><span class="module injected">x</span><span class="operator injected">::</span><span class="module injected">y</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="none injected"> </span><span class="module injected">x</span><span class="operator injected">::</span><span class="module injected">y</span><span class="semicolon injected">;</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">foo</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="variable declaration injected">foo</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="semicolon injected">;</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span>
-    <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="punctuation injected">(</span><span class="dummy injected">foo</span><span class="operator injected">.</span><span class="dummy injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="parenthesis injected">(</span><span class="none injected">foo</span><span class="operator injected">.</span><span class="none injected">bar</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="parenthesis injected">)</span><span class="semicolon injected">;</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">bar</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="dummy injected"> </span><span class="operator injected">||</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="variable declaration injected">bar</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="none injected"> </span><span class="operator injected">||</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="semicolon injected">;</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="comment injected">/* multi-line
-    </span><span class="comment documentation">/// </span><span class="comment injected">       comment */</span>
+    <span class="comment documentation">/// </span><span class="comment injected">/* multi-line</span>
+    <span class="comment documentation">/// </span><span class="comment injected">       comment */</span>
     <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="string_literal injected">"Foo
-    </span><span class="comment documentation">/// </span><span class="string_literal injected">  bar
-    </span><span class="comment documentation">/// </span><span class="string_literal injected">         "</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="string_literal injected">"Foo</span>
+    <span class="comment documentation">/// </span><span class="string_literal injected">  bar</span>
+    <span class="comment documentation">/// </span><span class="string_literal injected">         "</span><span class="semicolon injected">;</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```rust,no_run</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">foobar</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="operator injected">.</span><span class="function injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
-</span>    <span class="comment documentation">/// ```</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="variable declaration injected">foobar</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="operator injected">.</span><span class="function injected">bar</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="semicolon injected">;</span>
+    <span class="comment documentation">/// ```</span>
     <span class="comment documentation">///</span>
     <span class="comment documentation">/// ```sh</span>
     <span class="comment documentation">/// echo 1</span>
     <span class="comment documentation">/// ```</span>
-    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">foo</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">bool</span> <span class="punctuation">{</span>
+    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">foo</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">bool</span> <span class="brace">{</span>
         <span class="bool_literal">true</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
 <span class="comment documentation">/// ```</span>
-<span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="punctuation injected">(</span><span class="numeric_literal injected">1</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
-</span><span class="comment documentation">/// ```</span>
-<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+<span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="parenthesis injected">(</span><span class="numeric_literal injected">1</span><span class="parenthesis injected">)</span><span class="semicolon injected">;</span>
+<span class="comment documentation">/// ```</span>
+<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">noop</span> <span class="brace">{</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span>expr<span class="colon">:</span>expr<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span>
         <span class="punctuation">$</span>expr
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span></code></pre>
\ No newline at end of file
+    <span class="brace">}</span>
+<span class="brace">}</span></code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html b/crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html
index ed452586a..6f7a7ffff 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html
@@ -36,6 +36,6 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module">std</span><span class="punctuation">;</span>
-<span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module">alloc</span> <span class="keyword">as</span> <span class="module">abc</span><span class="punctuation">;</span>
+<pre><code><span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module">std</span><span class="semicolon">;</span>
+<span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module">alloc</span> <span class="keyword">as</span> <span class="module">abc</span><span class="semicolon">;</span>
 </code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
index 92e7dc3e4..753b535b5 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
@@ -36,14 +36,14 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</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>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="parenthesis">(</span><span class="value_param declaration">ra_fixture</span><span class="colon">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</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">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span>
-        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="punctuation">{</span>
-            <span class="keyword">fn</span> <span class="function declaration static associated">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-                <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span>
-            <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
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="function">fixture</span><span class="parenthesis">(</span><span class="string_literal">r#"</span>
+        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="brace">{</span>
+            <span class="keyword">fn</span> <span class="function declaration static associated">foo</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+                <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="comma">,</span> <span class="numeric_literal">4</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+            <span class="brace">}</span>
+        <span class="brace">}</span><span class="string_literal">"#</span>
+    <span class="parenthesis">)</span><span class="semicolon">;</span>
+<span class="brace">}</span></code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
index 31dad5d42..66d80c4b6 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
@@ -36,64 +36,64 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">println</span> <span class="punctuation">{</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>arg<span class="punctuation">:</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">(</span><span class="punctuation">{</span>
-        <span class="punctuation">$</span>crate<span class="punctuation">:</span><span class="punctuation">:</span>io<span class="punctuation">:</span><span class="punctuation">:</span>_print<span class="punctuation">(</span><span class="punctuation">$</span>crate<span class="punctuation">:</span><span class="punctuation">:</span>format_args_nl<span class="punctuation">!</span><span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>arg<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span><span class="punctuation">)</span>
-<span class="punctuation">}</span>
+<pre><code><span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">println</span> <span class="brace">{</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>arg<span class="colon">:</span>tt<span class="parenthesis">)</span><span class="punctuation">*</span><span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="parenthesis">(</span><span class="brace">{</span>
+        <span class="punctuation">$</span>crate<span class="colon">:</span><span class="colon">:</span>io<span class="colon">:</span><span class="colon">:</span>_print<span class="parenthesis">(</span><span class="punctuation">$</span>crate<span class="colon">:</span><span class="colon">:</span>format_args_nl<span class="punctuation">!</span><span class="parenthesis">(</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>arg<span class="parenthesis">)</span><span class="punctuation">*</span><span class="parenthesis">)</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="brace">}</span><span class="parenthesis">)</span>
+<span class="brace">}</span>
 <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">rustc_builtin_macro</span><span class="attribute attribute">]</span>
-<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">format_args_nl</span> <span class="punctuation">{</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span>fmt<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">{</span> <span class="comment">/* compiler built-in */</span> <span class="punctuation">}</span><span class="punctuation">}</span><span class="punctuation">;</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span>fmt<span class="punctuation">:</span>expr<span class="punctuation">,</span> <span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>args<span class="punctuation">:</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">{</span> <span class="comment">/* compiler built-in */</span> <span class="punctuation">}</span><span class="punctuation">}</span><span class="punctuation">;</span>
-<span class="punctuation">}</span>
+<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">format_args_nl</span> <span class="brace">{</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span>fmt<span class="colon">:</span>expr<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">{</span> <span class="comment">/* compiler built-in */</span> <span class="brace">}</span><span class="brace">}</span><span class="semicolon">;</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span>fmt<span class="colon">:</span>expr<span class="comma">,</span> <span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>args<span class="colon">:</span>tt<span class="parenthesis">)</span><span class="punctuation">*</span><span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">{</span> <span class="comment">/* compiler built-in */</span> <span class="brace">}</span><span class="brace">}</span><span class="semicolon">;</span>
+<span class="brace">}</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="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
     <span class="comment">// from https://doc.rust-lang.org/std/fmt/index.html</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello"</span><span class="punctuation">)</span><span class="punctuation">;</span>                 <span class="comment">// =&gt; "Hello"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"world"</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "Hello, world!"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"The number is </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "The number is 1"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="punctuation">(</span><span class="numeric_literal">3</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span>          <span class="comment">// =&gt; "(3, 4)"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">value</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> value<span class="operator">=</span><span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span>      <span class="comment">// =&gt; "4"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>           <span class="comment">// =&gt; "1 2"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">4</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">42</span><span class="punctuation">)</span><span class="punctuation">;</span>             <span class="comment">// =&gt; "0042" with leading zerosV</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "2 1 1 2"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">argument</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> argument <span class="operator">=</span> <span class="string_literal">"test"</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "test"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> name <span class="operator">=</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>          <span class="comment">// =&gt; "2 1"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">a</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">c</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">b</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> a<span class="operator">=</span><span class="string_literal">"a"</span><span class="punctuation">,</span> b<span class="operator">=</span><span class="char_literal">'b'</span><span class="punctuation">,</span> c<span class="operator">=</span><span class="numeric_literal">3</span><span class="punctuation">)</span><span class="punctuation">;</span>  <span class="comment">// =&gt; "a 3 b"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"{{</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">}}"</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>                       <span class="comment">// =&gt; "{2}"</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">width</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> width <span class="operator">=</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">-</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">^</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">+</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">27</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="punctuation">-</span><span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="numeric_literal">0</span><span class="numeric_literal">10</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">27</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span>    <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span>   <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="variable">number</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="variable">prec</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> prec <span class="operator">=</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> number <span class="operator">=</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 fractional digits"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="operator">=</span><span class="numeric_literal">1234.56</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 characters"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">8</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 right-aligned characters"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello {{}}"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"{{ Hello"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello"</span><span class="parenthesis">)</span><span class="semicolon">;</span>                 <span class="comment">// =&gt; "Hello"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"world"</span><span class="parenthesis">)</span><span class="semicolon">;</span>   <span class="comment">// =&gt; "Hello, world!"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"The number is </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="numeric_literal">1</span><span class="parenthesis">)</span><span class="semicolon">;</span>   <span class="comment">// =&gt; "The number is 1"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="parenthesis">(</span><span class="numeric_literal">3</span><span class="comma">,</span> <span class="numeric_literal">4</span><span class="parenthesis">)</span><span class="parenthesis">)</span><span class="semicolon">;</span>          <span class="comment">// =&gt; "(3, 4)"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">value</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> value<span class="operator">=</span><span class="numeric_literal">4</span><span class="parenthesis">)</span><span class="semicolon">;</span>      <span class="comment">// =&gt; "4"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="numeric_literal">1</span><span class="comma">,</span> <span class="numeric_literal">2</span><span class="parenthesis">)</span><span class="semicolon">;</span>           <span class="comment">// =&gt; "1 2"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">4</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="numeric_literal">42</span><span class="parenthesis">)</span><span class="semicolon">;</span>             <span class="comment">// =&gt; "0042" with leading zerosV</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="numeric_literal">1</span><span class="comma">,</span> <span class="numeric_literal">2</span><span class="parenthesis">)</span><span class="semicolon">;</span>   <span class="comment">// =&gt; "2 1 1 2"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">argument</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> argument <span class="operator">=</span> <span class="string_literal">"test"</span><span class="parenthesis">)</span><span class="semicolon">;</span>   <span class="comment">// =&gt; "test"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="numeric_literal">1</span><span class="comma">,</span> name <span class="operator">=</span> <span class="numeric_literal">2</span><span class="parenthesis">)</span><span class="semicolon">;</span>          <span class="comment">// =&gt; "2 1"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">a</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">c</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">b</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> a<span class="operator">=</span><span class="string_literal">"a"</span><span class="comma">,</span> b<span class="operator">=</span><span class="char_literal">'b'</span><span class="comma">,</span> c<span class="operator">=</span><span class="numeric_literal">3</span><span class="parenthesis">)</span><span class="semicolon">;</span>  <span class="comment">// =&gt; "a 3 b"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"{{</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">}}"</span><span class="comma">,</span> <span class="numeric_literal">2</span><span class="parenthesis">)</span><span class="semicolon">;</span>                       <span class="comment">// =&gt; "{2}"</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">width</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="comma">,</span> width <span class="operator">=</span> <span class="numeric_literal">5</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">-</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">^</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">+</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="numeric_literal">27</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="punctuation">-</span><span class="numeric_literal">5</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="numeric_literal">0</span><span class="numeric_literal">10</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="numeric_literal">27</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="comma">,</span> <span class="numeric_literal">0.01</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="comma">,</span> <span class="numeric_literal">0.01</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="comma">,</span> <span class="numeric_literal">0.01</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span>    <span class="string_literal">"x"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="comma">,</span> <span class="numeric_literal">0.01</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span>   <span class="string_literal">"x"</span><span class="comma">,</span> <span class="numeric_literal">5</span><span class="comma">,</span> <span class="numeric_literal">0.01</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="variable">number</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="variable">prec</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> <span class="string_literal">"x"</span><span class="comma">,</span> prec <span class="operator">=</span> <span class="numeric_literal">5</span><span class="comma">,</span> number <span class="operator">=</span> <span class="numeric_literal">0.01</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 fractional digits"</span><span class="comma">,</span> <span class="string_literal">"Hello"</span><span class="comma">,</span> <span class="numeric_literal">3</span><span class="comma">,</span> name<span class="operator">=</span><span class="numeric_literal">1234.56</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 characters"</span><span class="comma">,</span> <span class="string_literal">"Hello"</span><span class="comma">,</span> <span class="numeric_literal">3</span><span class="comma">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">8</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 right-aligned characters"</span><span class="comma">,</span> <span class="string_literal">"Hello"</span><span class="comma">,</span> <span class="numeric_literal">3</span><span class="comma">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello {{}}"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"{{ Hello"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">r"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"world"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">r"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="comma">,</span> <span class="string_literal">"world"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
     <span class="comment">// escape sequences</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello</span><span class="escape_sequence">\n</span><span class="string_literal">World"</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="escape_sequence">\u{48}</span><span class="escape_sequence">\x65</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6F</span><span class="string_literal"> World"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello</span><span class="escape_sequence">\n</span><span class="string_literal">World"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="escape_sequence">\u{48}</span><span class="escape_sequence">\x65</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6F</span><span class="string_literal"> World"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="escape_sequence">\x41</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> A <span class="operator">=</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">ничоси</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> ничоси <span class="operator">=</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="escape_sequence">\x41</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> A <span class="operator">=</span> <span class="numeric_literal">92</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">ничоси</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="comma">,</span> ничоси <span class="operator">=</span> <span class="numeric_literal">92</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">x</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> "</span><span class="punctuation">,</span> thingy<span class="punctuation">,</span> n2<span class="punctuation">)</span><span class="punctuation">;</span>
-<span class="punctuation">}</span></code></pre>
\ No newline at end of file
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">x</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> "</span><span class="comma">,</span> thingy<span class="comma">,</span> n2<span class="parenthesis">)</span><span class="semicolon">;</span>
+<span class="brace">}</span></code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
index e3a0aa317..9d4d6d4a0 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
@@ -36,65 +36,65 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
 
-<span class="keyword">union</span> <span class="union declaration">Union</span> <span class="punctuation">{</span>
-    <span class="field declaration">a</span><span class="punctuation">:</span> <span class="builtin_type">u32</span><span class="punctuation">,</span>
-    <span class="field declaration">b</span><span class="punctuation">:</span> <span class="builtin_type">f32</span><span class="punctuation">,</span>
-<span class="punctuation">}</span>
+<span class="keyword">union</span> <span class="union declaration">Union</span> <span class="brace">{</span>
+    <span class="field declaration">a</span><span class="colon">:</span> <span class="builtin_type">u32</span><span class="comma">,</span>
+    <span class="field declaration">b</span><span class="colon">:</span> <span class="builtin_type">f32</span><span class="comma">,</span>
+<span class="brace">}</span>
 
-<span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="punctuation">;</span>
+<span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="semicolon">;</span>
 
-<span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="punctuation">{</span>
-    <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration associated unsafe">unsafe_method</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="brace">{</span>
+    <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration associated unsafe">unsafe_method</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">struct</span> <span class="struct declaration">TypeForStaticMut</span> <span class="punctuation">{</span>
-    <span class="field declaration">a</span><span class="punctuation">:</span> <span class="builtin_type">u8</span>
-<span class="punctuation">}</span>
+<span class="keyword">struct</span> <span class="struct declaration">TypeForStaticMut</span> <span class="brace">{</span>
+    <span class="field declaration">a</span><span class="colon">:</span> <span class="builtin_type">u8</span>
+<span class="brace">}</span>
 
-<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable unsafe">global_mut</span><span class="punctuation">:</span> <span class="struct">TypeForStaticMut</span> <span class="operator">=</span> <span class="struct">TypeForStaticMut</span> <span class="punctuation">{</span> <span class="field">a</span><span class="punctuation">:</span> <span class="numeric_literal">0</span> <span class="punctuation">}</span><span class="punctuation">;</span>
+<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable unsafe">global_mut</span><span class="colon">:</span> <span class="struct">TypeForStaticMut</span> <span class="operator">=</span> <span class="struct">TypeForStaticMut</span> <span class="brace">{</span> <span class="field">a</span><span class="colon">:</span> <span class="numeric_literal">0</span> <span class="brace">}</span><span class="semicolon">;</span>
 
-<span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">repr</span><span class="punctuation attribute">(</span><span class="attribute attribute">packed</span><span class="punctuation attribute">)</span><span class="attribute attribute">]</span>
-<span class="keyword">struct</span> <span class="struct declaration">Packed</span> <span class="punctuation">{</span>
-    <span class="field declaration">a</span><span class="punctuation">:</span> <span class="builtin_type">u16</span><span class="punctuation">,</span>
-<span class="punctuation">}</span>
+<span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">repr</span><span class="parenthesis attribute">(</span><span class="attribute attribute">packed</span><span class="parenthesis attribute">)</span><span class="attribute attribute">]</span>
+<span class="keyword">struct</span> <span class="struct declaration">Packed</span> <span class="brace">{</span>
+    <span class="field declaration">a</span><span class="colon">:</span> <span class="builtin_type">u16</span><span class="comma">,</span>
+<span class="brace">}</span>
 
-<span class="keyword">trait</span> <span class="trait declaration">DoTheAutoref</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">calls_autoref</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span><span class="punctuation">;</span>
-<span class="punctuation">}</span>
+<span class="keyword">trait</span> <span class="trait declaration">DoTheAutoref</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">calls_autoref</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+<span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="trait">DoTheAutoref</span> <span class="keyword">for</span> <span class="builtin_type">u16</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">calls_autoref</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="trait">DoTheAutoref</span> <span class="keyword">for</span> <span class="builtin_type">u16</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">calls_autoref</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</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="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="operator">&</span><span class="numeric_literal">5</span> <span class="keyword">as</span> <span class="keyword">*</span><span class="keyword">const</span> <span class="punctuation">_</span> <span class="keyword">as</span> <span class="keyword">*</span><span class="keyword">const</span> <span class="builtin_type">usize</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration">u</span> <span class="operator">=</span> <span class="union">Union</span> <span class="punctuation">{</span> <span class="field">b</span><span class="punctuation">:</span> <span class="numeric_literal">0</span> <span class="punctuation">}</span><span class="punctuation">;</span>
-    <span class="keyword unsafe">unsafe</span> <span class="punctuation">{</span>
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="operator">&</span><span class="numeric_literal">5</span> <span class="keyword">as</span> <span class="keyword">*</span><span class="keyword">const</span> <span class="punctuation">_</span> <span class="keyword">as</span> <span class="keyword">*</span><span class="keyword">const</span> <span class="builtin_type">usize</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">u</span> <span class="operator">=</span> <span class="union">Union</span> <span class="brace">{</span> <span class="field">b</span><span class="colon">:</span> <span class="numeric_literal">0</span> <span class="brace">}</span><span class="semicolon">;</span>
+    <span class="keyword unsafe">unsafe</span> <span class="brace">{</span>
         <span class="comment">// unsafe fn and method calls</span>
-        <span class="function unsafe">unsafe_fn</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="variable declaration">b</span> <span class="operator">=</span> <span class="variable">u</span><span class="operator">.</span><span class="field unsafe">b</span><span class="punctuation">;</span>
-        <span class="keyword control">match</span> <span class="variable">u</span> <span class="punctuation">{</span>
-            <span class="union">Union</span> <span class="punctuation">{</span> <span class="field unsafe">b</span><span class="punctuation">:</span> <span class="numeric_literal">0</span> <span class="punctuation">}</span> <span class="operator">=&gt;</span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span>
-            <span class="union">Union</span> <span class="punctuation">{</span> <span class="field unsafe">a</span> <span class="punctuation">}</span> <span class="operator">=&gt;</span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span>
-        <span class="punctuation">}</span>
-        <span class="struct">HasUnsafeFn</span><span class="operator">.</span><span class="function associated unsafe">unsafe_method</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
+        <span class="function unsafe">unsafe_fn</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+        <span class="keyword">let</span> <span class="variable declaration">b</span> <span class="operator">=</span> <span class="variable">u</span><span class="operator">.</span><span class="field unsafe">b</span><span class="semicolon">;</span>
+        <span class="keyword control">match</span> <span class="variable">u</span> <span class="brace">{</span>
+            <span class="union">Union</span> <span class="brace">{</span> <span class="field unsafe">b</span><span class="colon">:</span> <span class="numeric_literal">0</span> <span class="brace">}</span> <span class="operator">=&gt;</span> <span class="parenthesis">(</span><span class="parenthesis">)</span><span class="comma">,</span>
+            <span class="union">Union</span> <span class="brace">{</span> <span class="field unsafe">a</span> <span class="brace">}</span> <span class="operator">=&gt;</span> <span class="parenthesis">(</span><span class="parenthesis">)</span><span class="comma">,</span>
+        <span class="brace">}</span>
+        <span class="struct">HasUnsafeFn</span><span class="operator">.</span><span class="function associated unsafe">unsafe_method</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
         <span class="comment">// unsafe deref</span>
-        <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="operator">=</span> <span class="operator unsafe">*</span><span class="variable">x</span><span class="punctuation">;</span>
+        <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="operator">=</span> <span class="operator unsafe">*</span><span class="variable">x</span><span class="semicolon">;</span>
 
         <span class="comment">// unsafe access to a static mut</span>
-        <span class="keyword">let</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="static mutable unsafe">global_mut</span><span class="operator">.</span><span class="field">a</span><span class="punctuation">;</span>
+        <span class="keyword">let</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="static mutable unsafe">global_mut</span><span class="operator">.</span><span class="field">a</span><span class="semicolon">;</span>
 
         <span class="comment">// unsafe ref of packed fields</span>
-        <span class="keyword">let</span> <span class="variable declaration">packed</span> <span class="operator">=</span> <span class="struct">Packed</span> <span class="punctuation">{</span> <span class="field">a</span><span class="punctuation">:</span> <span class="numeric_literal">0</span> <span class="punctuation">}</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="operator unsafe">&</span><span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="keyword unsafe">ref</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="struct">Packed</span> <span class="punctuation">{</span> <span class="keyword unsafe">ref</span> <span class="field">a</span> <span class="punctuation">}</span> <span class="operator">=</span> <span class="variable">packed</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="struct">Packed</span> <span class="punctuation">{</span> <span class="field">a</span><span class="punctuation">:</span> <span class="keyword unsafe">ref</span> <span class="variable declaration">_a</span> <span class="punctuation">}</span> <span class="operator">=</span> <span class="variable">packed</span><span class="punctuation">;</span>
+        <span class="keyword">let</span> <span class="variable declaration">packed</span> <span class="operator">=</span> <span class="struct">Packed</span> <span class="brace">{</span> <span class="field">a</span><span class="colon">:</span> <span class="numeric_literal">0</span> <span class="brace">}</span><span class="semicolon">;</span>
+        <span class="keyword">let</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="operator unsafe">&</span><span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="semicolon">;</span>
+        <span class="keyword">let</span> <span class="keyword unsafe">ref</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="semicolon">;</span>
+        <span class="keyword">let</span> <span class="struct">Packed</span> <span class="brace">{</span> <span class="keyword unsafe">ref</span> <span class="field">a</span> <span class="brace">}</span> <span class="operator">=</span> <span class="variable">packed</span><span class="semicolon">;</span>
+        <span class="keyword">let</span> <span class="struct">Packed</span> <span class="brace">{</span> <span class="field">a</span><span class="colon">:</span> <span class="keyword unsafe">ref</span> <span class="variable declaration">_a</span> <span class="brace">}</span> <span class="operator">=</span> <span class="variable">packed</span><span class="semicolon">;</span>
 
         <span class="comment">// unsafe auto ref of packed field</span>
-        <span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="operator">.</span><span class="function associated unsafe">calls_autoref</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span></code></pre>
\ No newline at end of file
+        <span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="operator">.</span><span class="function associated unsafe">calls_autoref</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="brace">}</span>
+<span class="brace">}</span></code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlighting.html b/crates/ide/src/syntax_highlighting/test_data/highlighting.html
index 72ff9dd40..6b7447c46 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlighting.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlighting.html
@@ -36,183 +36,187 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">use</span> <span class="module">inner</span><span class="operator">::</span><span class="punctuation">{</span><span class="self_keyword">self</span> <span class="keyword">as</span> <span class="module declaration">inner_mod</span><span class="punctuation">}</span><span class="punctuation">;</span>
-<span class="keyword">mod</span> <span class="module declaration">inner</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<pre><code><span class="keyword">use</span> <span class="module">inner</span><span class="operator">::</span><span class="brace">{</span><span class="self_keyword">self</span> <span class="keyword">as</span> <span class="module declaration">inner_mod</span><span class="brace">}</span><span class="semicolon">;</span>
+<span class="keyword">mod</span> <span class="module declaration">inner</span> <span class="brace">{</span><span class="brace">}</span>
 
 <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">rustc_builtin_macro</span><span class="attribute attribute">]</span>
-<span class="keyword">macro</span> <span class="unresolved_reference declaration">Copy</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<span class="keyword">macro</span> <span class="unresolved_reference declaration">Copy</span> <span class="brace">{</span><span class="brace">}</span>
 
 <span class="comment">// Needed for function consuming vs normal</span>
-<span class="keyword">pub</span> <span class="keyword">mod</span> <span class="module declaration">marker</span> <span class="punctuation">{</span>
+<span class="keyword">pub</span> <span class="keyword">mod</span> <span class="module declaration">marker</span> <span class="brace">{</span>
     <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">lang</span><span class="attribute attribute"> </span><span class="operator attribute">=</span><span class="attribute attribute"> </span><span class="string_literal attribute">"copy"</span><span class="attribute attribute">]</span>
-    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">Copy</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">Copy</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">pub</span> <span class="keyword">mod</span> <span class="module declaration">ops</span> <span class="punctuation">{</span>
+<span class="keyword">pub</span> <span class="keyword">mod</span> <span class="module declaration">ops</span> <span class="brace">{</span>
     <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">lang</span><span class="attribute attribute"> </span><span class="operator attribute">=</span><span class="attribute attribute"> </span><span class="string_literal attribute">"fn_once"</span><span class="attribute attribute">]</span>
-    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">FnOnce</span><span class="punctuation">&lt;</span><span class="type_param declaration">Args</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">FnOnce</span><span class="angle">&lt;</span><span class="type_param declaration">Args</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">}</span>
 
     <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">lang</span><span class="attribute attribute"> </span><span class="operator attribute">=</span><span class="attribute attribute"> </span><span class="string_literal attribute">"fn_mut"</span><span class="attribute attribute">]</span>
-    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">FnMut</span><span class="punctuation">&lt;</span><span class="type_param declaration">Args</span><span class="punctuation">&gt;</span><span class="punctuation">:</span> <span class="trait">FnOnce</span><span class="punctuation">&lt;</span><span class="type_param">Args</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">FnMut</span><span class="angle">&lt;</span><span class="type_param declaration">Args</span><span class="angle">&gt;</span><span class="colon">:</span> <span class="trait">FnOnce</span><span class="angle">&lt;</span><span class="type_param">Args</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">}</span>
 
     <span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">lang</span><span class="attribute attribute"> </span><span class="operator attribute">=</span><span class="attribute attribute"> </span><span class="string_literal attribute">"fn"</span><span class="attribute attribute">]</span>
-    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">Fn</span><span class="punctuation">&lt;</span><span class="type_param declaration">Args</span><span class="punctuation">&gt;</span><span class="punctuation">:</span> <span class="trait">FnMut</span><span class="punctuation">&lt;</span><span class="type_param">Args</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="keyword">pub</span> <span class="keyword">trait</span> <span class="trait declaration">Fn</span><span class="angle">&lt;</span><span class="type_param declaration">Args</span><span class="angle">&gt;</span><span class="colon">:</span> <span class="trait">FnMut</span><span class="angle">&lt;</span><span class="type_param">Args</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
 
 
-<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span>
-    <span class="keyword">pub</span> <span class="field declaration">x</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span>
-    <span class="keyword">pub</span> <span class="field declaration">y</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span>
-<span class="punctuation">}</span>
+<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="brace">{</span>
+    <span class="keyword">pub</span> <span class="field declaration">x</span><span class="colon">:</span> <span class="builtin_type">i32</span><span class="comma">,</span>
+    <span class="keyword">pub</span> <span class="field declaration">y</span><span class="colon">:</span> <span class="builtin_type">i32</span><span class="comma">,</span>
+<span class="brace">}</span>
 
-<span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span><span class="punctuation">;</span>
-<span class="punctuation">}</span>
+<span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">bar</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span><span class="semicolon">;</span>
+<span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
+<span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">bar</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="brace">{</span>
         <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">Foo</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
-        <span class="value_param">f</span><span class="operator">.</span><span class="function consuming associated">baz</span><span class="punctuation">(</span><span class="self_keyword mutable consuming">self</span><span class="punctuation">)</span>
-    <span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">baz</span><span class="parenthesis">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="comma">,</span> <span class="value_param declaration">f</span><span class="colon">:</span> <span class="struct">Foo</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="brace">{</span>
+        <span class="value_param">f</span><span class="operator">.</span><span class="function consuming associated">baz</span><span class="parenthesis">(</span><span class="self_keyword mutable consuming">self</span><span class="parenthesis">)</span>
+    <span class="brace">}</span>
 
-    <span class="keyword">fn</span> <span class="function declaration associated">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-        <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">qux</span><span class="parenthesis">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="parenthesis">)</span> <span class="brace">{</span>
+        <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="semicolon">;</span>
+    <span class="brace">}</span>
 
-    <span class="keyword">fn</span> <span class="function declaration associated">quop</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">quop</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="brace">{</span>
         <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">derive</span><span class="punctuation attribute">(</span><span class="attribute attribute">Copy</span><span class="punctuation attribute">)</span><span class="attribute attribute">]</span>
-<span class="keyword">struct</span> <span class="struct declaration">FooCopy</span> <span class="punctuation">{</span>
-    <span class="field declaration">x</span><span class="punctuation">:</span> <span class="builtin_type">u32</span><span class="punctuation">,</span>
-<span class="punctuation">}</span>
+<span class="attribute attribute">#</span><span class="attribute attribute">[</span><span class="function attribute">derive</span><span class="parenthesis attribute">(</span><span class="attribute attribute">Copy</span><span class="parenthesis attribute">)</span><span class="attribute attribute">]</span>
+<span class="keyword">struct</span> <span class="struct declaration">FooCopy</span> <span class="brace">{</span>
+    <span class="field declaration">x</span><span class="colon">:</span> <span class="builtin_type">u32</span><span class="comma">,</span>
+<span class="brace">}</span>
 
-<span class="keyword">impl</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">FooCopy</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">u32</span> <span class="punctuation">{</span>
-        <span class="value_param">f</span><span class="operator">.</span><span class="function associated">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">)</span>
-    <span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="struct">FooCopy</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">baz</span><span class="parenthesis">(</span><span class="self_keyword">self</span><span class="comma">,</span> <span class="value_param declaration">f</span><span class="colon">:</span> <span class="struct">FooCopy</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">u32</span> <span class="brace">{</span>
+        <span class="value_param">f</span><span class="operator">.</span><span class="function associated">baz</span><span class="parenthesis">(</span><span class="self_keyword">self</span><span class="parenthesis">)</span>
+    <span class="brace">}</span>
 
-    <span class="keyword">fn</span> <span class="function declaration associated">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-        <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">qux</span><span class="parenthesis">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="parenthesis">)</span> <span class="brace">{</span>
+        <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="semicolon">;</span>
+    <span class="brace">}</span>
 
-    <span class="keyword">fn</span> <span class="function declaration associated">quop</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">u32</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">quop</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">u32</span> <span class="brace">{</span>
         <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable unsafe">STATIC_MUT</span><span class="punctuation">:</span> <span class="builtin_type">i32</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
+<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable unsafe">STATIC_MUT</span><span class="colon">:</span> <span class="builtin_type">i32</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="semicolon">;</span>
 
-<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">&lt;</span><span class="lifetime declaration">'a</span><span class="punctuation">,</span> <span class="type_param declaration">T</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="type_param">T</span> <span class="punctuation">{</span>
-    <span class="function">foo</span><span class="operator">::</span><span class="punctuation">&lt;</span><span class="lifetime">'a</span><span class="punctuation">,</span> <span class="builtin_type">i32</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="punctuation">)</span>
-<span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="angle">&lt;</span><span class="lifetime declaration">'a</span><span class="comma">,</span> <span class="type_param declaration">T</span><span class="angle">&gt;</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="type_param">T</span> <span class="brace">{</span>
+    <span class="function">foo</span><span class="operator">::</span><span class="angle">&lt;</span><span class="lifetime">'a</span><span class="comma">,</span> <span class="builtin_type">i32</span><span class="angle">&gt;</span><span class="parenthesis">(</span><span class="parenthesis">)</span>
+<span class="brace">}</span>
 
-<span class="keyword">fn</span> <span class="function declaration">never</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">!</span> <span class="punctuation">{</span>
-    <span class="keyword control">loop</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">never</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">!</span> <span class="brace">{</span>
+    <span class="keyword control">loop</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">use</span> <span class="module">ops</span><span class="operator">::</span><span class="trait">Fn</span><span class="punctuation">;</span>
-<span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">&lt;</span><span class="type_param declaration">F</span><span class="punctuation">:</span> <span class="trait">Fn</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="value_param declaration callable">f</span><span class="punctuation">:</span> <span class="type_param">F</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="value_param callable">f</span><span class="punctuation">(</span><span class="punctuation">)</span>
-<span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">const_param</span><span class="angle">&lt;</span><span class="keyword">const</span> <span class="const_param declaration">FOO</span><span class="colon">:</span> <span class="builtin_type">usize</span><span class="angle">&gt;</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">usize</span> <span class="brace">{</span>
+    <span class="const_param">FOO</span>
+<span class="brace">}</span>
 
-<span class="keyword">fn</span> <span class="function declaration">foobar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="keyword">impl</span> <span class="macro">Copy</span> <span class="punctuation">{</span><span class="punctuation">}</span>
+<span class="keyword">use</span> <span class="module">ops</span><span class="operator">::</span><span class="trait">Fn</span><span class="semicolon">;</span>
+<span class="keyword">fn</span> <span class="function declaration">baz</span><span class="angle">&lt;</span><span class="type_param declaration">F</span><span class="colon">:</span> <span class="trait">Fn</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="parenthesis">(</span><span class="parenthesis">)</span><span class="angle">&gt;</span><span class="parenthesis">(</span><span class="value_param declaration callable">f</span><span class="colon">:</span> <span class="type_param">F</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="value_param callable">f</span><span class="parenthesis">(</span><span class="parenthesis">)</span>
+<span class="brace">}</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="keyword">let</span> <span class="variable declaration">bar</span> <span class="operator">=</span> <span class="function">foobar</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-<span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">foobar</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="keyword">impl</span> <span class="macro">Copy</span> <span class="brace">{</span><span class="brace">}</span>
 
-<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">def_fn</span> <span class="punctuation">{</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>tt<span class="punctuation">:</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">}</span>
-<span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="keyword">let</span> <span class="variable declaration">bar</span> <span class="operator">=</span> <span class="function">foobar</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+<span class="brace">}</span>
 
-<span class="macro">def_fn!</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-</span><span class="operator">&gt;</span> <span class="builtin_type">u32</span> <span class="punctuation">{</span>
+<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">def_fn</span> <span class="brace">{</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>tt<span class="colon">:</span>tt<span class="parenthesis">)</span><span class="punctuation">*</span><span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>tt<span class="parenthesis">)</span><span class="punctuation">*</span><span class="brace">}</span>
+<span class="brace">}</span>
+
+<span class="macro">def_fn!</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="operator">-</span><span class="operator">&gt;</span> <span class="builtin_type">u32</span> <span class="brace">{</span>
         <span class="numeric_literal">100</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">noop</span> <span class="brace">{</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span>expr<span class="colon">:</span>expr<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span>
         <span class="punctuation">$</span>expr
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">keyword_frag</span> <span class="punctuation">{</span>
-    <span class="punctuation">(</span><span class="punctuation">$</span>type<span class="punctuation">:</span>ty<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">(</span><span class="punctuation">$</span>type<span class="punctuation">)</span>
-<span class="punctuation">}</span>
+<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">keyword_frag</span> <span class="brace">{</span>
+    <span class="parenthesis">(</span><span class="punctuation">$</span>type<span class="colon">:</span>ty<span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="parenthesis">(</span><span class="punctuation">$</span>type<span class="parenthesis">)</span>
+<span class="brace">}</span>
 
 <span class="comment">// comment</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="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello, {}!"</span><span class="punctuation">,</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span>
-
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">vec</span> <span class="operator">=</span> <span class="unresolved_reference">Vec</span><span class="operator">::</span><span class="unresolved_reference">new</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="keyword control">if</span> <span class="bool_literal">true</span> <span class="punctuation">{</span>
-        <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="numeric_literal">92</span><span class="punctuation">;</span>
-        <span class="variable mutable">vec</span><span class="operator">.</span><span class="unresolved_reference">push</span><span class="punctuation">(</span><span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="numeric_literal">1</span> <span class="punctuation">}</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-    <span class="keyword unsafe">unsafe</span> <span class="punctuation">{</span>
-        <span class="variable mutable">vec</span><span class="operator">.</span><span class="unresolved_reference">set_len</span><span class="punctuation">(</span><span class="numeric_literal">0</span><span class="punctuation">)</span><span class="punctuation">;</span>
-        <span class="static mutable unsafe">STATIC_MUT</span> <span class="operator">=</span> <span class="numeric_literal">1</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-
-    <span class="keyword control">for</span> <span class="variable declaration">e</span> <span class="keyword control">in</span> <span class="variable mutable">vec</span> <span class="punctuation">{</span>
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="macro">println!</span><span class="parenthesis">(</span><span class="string_literal">"Hello, {}!"</span><span class="comma">,</span> <span class="numeric_literal">92</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">vec</span> <span class="operator">=</span> <span class="unresolved_reference">Vec</span><span class="operator">::</span><span class="unresolved_reference">new</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="keyword control">if</span> <span class="bool_literal">true</span> <span class="brace">{</span>
+        <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="numeric_literal">92</span><span class="semicolon">;</span>
+        <span class="variable mutable">vec</span><span class="operator">.</span><span class="unresolved_reference">push</span><span class="parenthesis">(</span><span class="struct">Foo</span> <span class="brace">{</span> <span class="field">x</span><span class="comma">,</span> <span class="field">y</span><span class="colon">:</span> <span class="numeric_literal">1</span> <span class="brace">}</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="brace">}</span>
+    <span class="keyword unsafe">unsafe</span> <span class="brace">{</span>
+        <span class="variable mutable">vec</span><span class="operator">.</span><span class="unresolved_reference">set_len</span><span class="parenthesis">(</span><span class="numeric_literal">0</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+        <span class="static mutable unsafe">STATIC_MUT</span> <span class="operator">=</span> <span class="numeric_literal">1</span><span class="semicolon">;</span>
+    <span class="brace">}</span>
+
+    <span class="keyword control">for</span> <span class="variable declaration">e</span> <span class="keyword control">in</span> <span class="variable mutable">vec</span> <span class="brace">{</span>
         <span class="comment">// Do nothing</span>
-    <span class="punctuation">}</span>
+    <span class="brace">}</span>
 
-    <span class="macro">noop!</span><span class="punctuation">(</span><span class="macro">noop</span><span class="macro">!</span><span class="punctuation">(</span><span class="numeric_literal">1</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">noop!</span><span class="parenthesis">(</span><span class="macro">noop</span><span class="macro">!</span><span class="parenthesis">(</span><span class="numeric_literal">1</span><span class="parenthesis">)</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">x</span> <span class="operator">=</span> <span class="numeric_literal">42</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration mutable">y</span> <span class="operator">=</span> <span class="operator">&</span><span class="keyword">mut</span> <span class="variable mutable">x</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="operator">=</span> <span class="operator">&</span><span class="variable mutable">y</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">x</span> <span class="operator">=</span> <span class="numeric_literal">42</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration mutable">y</span> <span class="operator">=</span> <span class="operator">&</span><span class="keyword">mut</span> <span class="variable mutable">x</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="operator">=</span> <span class="operator">&</span><span class="variable mutable">y</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">:</span> <span class="variable declaration">z</span><span class="punctuation">,</span> <span class="field">y</span> <span class="punctuation">}</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">:</span> <span class="variable">z</span><span class="punctuation">,</span> <span class="field">y</span> <span class="punctuation">}</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="struct">Foo</span> <span class="brace">{</span> <span class="field">x</span><span class="colon">:</span> <span class="variable declaration">z</span><span class="comma">,</span> <span class="field">y</span> <span class="brace">}</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="brace">{</span> <span class="field">x</span><span class="colon">:</span> <span class="variable">z</span><span class="comma">,</span> <span class="field">y</span> <span class="brace">}</span><span class="semicolon">;</span>
 
-    <span class="variable">y</span><span class="punctuation">;</span>
+    <span class="variable">y</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">foo</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration">foo2</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span>
-    <span class="variable mutable">foo</span><span class="operator">.</span><span class="function associated">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="variable mutable">foo</span><span class="operator">.</span><span class="function mutable associated">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="variable mutable">foo</span><span class="operator">.</span><span class="function consuming associated">baz</span><span class="punctuation">(</span><span class="variable consuming">foo2</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">foo</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="brace">{</span> <span class="field">x</span><span class="comma">,</span> <span class="field">y</span><span class="colon">:</span> <span class="variable mutable">x</span> <span class="brace">}</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">foo2</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="brace">{</span> <span class="field">x</span><span class="comma">,</span> <span class="field">y</span><span class="colon">:</span> <span class="variable mutable">x</span> <span class="brace">}</span><span class="semicolon">;</span>
+    <span class="variable mutable">foo</span><span class="operator">.</span><span class="function associated">quop</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="variable mutable">foo</span><span class="operator">.</span><span class="function mutable associated">qux</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="variable mutable">foo</span><span class="operator">.</span><span class="function consuming associated">baz</span><span class="parenthesis">(</span><span class="variable consuming">foo2</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">copy</span> <span class="operator">=</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span> <span class="field">x</span> <span class="punctuation">}</span><span class="punctuation">;</span>
-    <span class="variable mutable">copy</span><span class="operator">.</span><span class="function associated">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="variable mutable">copy</span><span class="operator">.</span><span class="function mutable associated">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="variable mutable">copy</span><span class="operator">.</span><span class="function associated">baz</span><span class="punctuation">(</span><span class="variable mutable">copy</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">copy</span> <span class="operator">=</span> <span class="struct">FooCopy</span> <span class="brace">{</span> <span class="field">x</span> <span class="brace">}</span><span class="semicolon">;</span>
+    <span class="variable mutable">copy</span><span class="operator">.</span><span class="function associated">quop</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="variable mutable">copy</span><span class="operator">.</span><span class="function mutable associated">qux</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="variable mutable">copy</span><span class="operator">.</span><span class="function associated">baz</span><span class="parenthesis">(</span><span class="variable mutable">copy</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="variable declaration callable">a</span> <span class="operator">=</span> <span class="punctuation">|</span><span class="value_param declaration">x</span><span class="punctuation">|</span> <span class="value_param">x</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration callable">bar</span> <span class="operator">=</span> <span class="struct">Foo</span><span class="operator">::</span><span class="function associated">baz</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="variable declaration callable">a</span> <span class="operator">=</span> <span class="punctuation">|</span><span class="value_param declaration">x</span><span class="punctuation">|</span> <span class="value_param">x</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration callable">bar</span> <span class="operator">=</span> <span class="struct">Foo</span><span class="operator">::</span><span class="function associated">baz</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="punctuation">_</span> <span class="operator">=</span> <span class="operator">!</span><span class="bool_literal">true</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="punctuation">_</span> <span class="operator">=</span> <span class="operator">!</span><span class="bool_literal">true</span><span class="semicolon">;</span>
 
-    <span class="label declaration">'foo</span><span class="punctuation">:</span> <span class="keyword control">loop</span> <span class="punctuation">{</span>
-        <span class="keyword control">break</span> <span class="label">'foo</span><span class="punctuation">;</span>
-        <span class="keyword control">continue</span> <span class="label">'foo</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span>
+    <span class="label declaration">'foo</span><span class="colon">:</span> <span class="keyword control">loop</span> <span class="brace">{</span>
+        <span class="keyword control">break</span> <span class="label">'foo</span><span class="semicolon">;</span>
+        <span class="keyword control">continue</span> <span class="label">'foo</span><span class="semicolon">;</span>
+    <span class="brace">}</span>
+<span class="brace">}</span>
 
-<span class="keyword">enum</span> <span class="enum declaration">Option</span><span class="punctuation">&lt;</span><span class="type_param declaration">T</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
-    <span class="enum_variant declaration">Some</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">)</span><span class="punctuation">,</span>
-    <span class="enum_variant declaration">None</span><span class="punctuation">,</span>
-<span class="punctuation">}</span>
-<span class="keyword">use</span> <span class="enum">Option</span><span class="operator">::</span><span class="punctuation">*</span><span class="punctuation">;</span>
+<span class="keyword">enum</span> <span class="enum declaration">Option</span><span class="angle">&lt;</span><span class="type_param declaration">T</span><span class="angle">&gt;</span> <span class="brace">{</span>
+    <span class="enum_variant declaration">Some</span><span class="parenthesis">(</span><span class="type_param">T</span><span class="parenthesis">)</span><span class="comma">,</span>
+    <span class="enum_variant declaration">None</span><span class="comma">,</span>
+<span class="brace">}</span>
+<span class="keyword">use</span> <span class="enum">Option</span><span class="operator">::</span><span class="punctuation">*</span><span class="semicolon">;</span>
 
-<span class="keyword">impl</span><span class="punctuation">&lt;</span><span class="type_param declaration">T</span><span class="punctuation">&gt;</span> <span class="enum">Option</span><span class="punctuation">&lt;</span><span class="type_param">T</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
-    <span class="keyword">fn</span> <span class="function declaration associated">and</span><span class="punctuation">&lt;</span><span class="type_param declaration">U</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">other</span><span class="punctuation">:</span> <span class="enum">Option</span><span class="punctuation">&lt;</span><span class="type_param">U</span><span class="punctuation">&gt;</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="enum">Option</span><span class="punctuation">&lt;</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">,</span> <span class="type_param">U</span><span class="punctuation">)</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
-        <span class="keyword control">match</span> <span class="value_param">other</span> <span class="punctuation">{</span>
-            <span class="enum_variant">None</span> <span class="operator">=&gt;</span> <span class="macro">unimplemented!</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span>
-            <span class="variable declaration">Nope</span> <span class="operator">=&gt;</span> <span class="variable">Nope</span><span class="punctuation">,</span>
-        <span class="punctuation">}</span>
-    <span class="punctuation">}</span>
-<span class="punctuation">}</span></code></pre>
\ No newline at end of file
+<span class="keyword">impl</span><span class="angle">&lt;</span><span class="type_param declaration">T</span><span class="angle">&gt;</span> <span class="enum">Option</span><span class="angle">&lt;</span><span class="type_param">T</span><span class="angle">&gt;</span> <span class="brace">{</span>
+    <span class="keyword">fn</span> <span class="function declaration associated">and</span><span class="angle">&lt;</span><span class="type_param declaration">U</span><span class="angle">&gt;</span><span class="parenthesis">(</span><span class="self_keyword">self</span><span class="comma">,</span> <span class="value_param declaration">other</span><span class="colon">:</span> <span class="enum">Option</span><span class="angle">&lt;</span><span class="type_param">U</span><span class="angle">&gt;</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="enum">Option</span><span class="angle">&lt;</span><span class="parenthesis">(</span><span class="type_param">T</span><span class="comma">,</span> <span class="type_param">U</span><span class="parenthesis">)</span><span class="angle">&gt;</span> <span class="brace">{</span>
+        <span class="keyword control">match</span> <span class="value_param">other</span> <span class="brace">{</span>
+            <span class="enum_variant">None</span> <span class="operator">=&gt;</span> <span class="macro">unimplemented!</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="comma">,</span>
+            <span class="variable declaration">Nope</span> <span class="operator">=&gt;</span> <span class="variable">Nope</span><span class="comma">,</span>
+        <span class="brace">}</span>
+    <span class="brace">}</span>
+<span class="brace">}</span></code></pre>
\ No newline at end of file
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..78dfec951
--- /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="parenthesis">(</span><span class="value_param declaration">ra_fixture</span><span class="colon">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span>
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="function">f</span><span class="parenthesis">(</span><span class="string_literal">r"</span>
+<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="function">foo</span><span class="parenthesis">(</span><span class="keyword">$0</span><span class="brace">{</span>
+        <span class="numeric_literal">92</span>
+    <span class="brace">}</span><span class="keyword">$0</span><span class="parenthesis">)</span>
+<span class="brace">}</span><span class="string_literal">"</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+<span class="brace">}</span>
+    </code></pre>
\ No newline at end of file
diff --git a/crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html b/crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html
index 8b3dfa69f..e64f2e5e9 100644
--- a/crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html
+++ b/crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html
@@ -36,15 +36,15 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><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="keyword">let</span> <span class="variable declaration" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="2705725358298919760" style="color: hsl(76,47%,83%);">x</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="3365759661443752373" style="color: hsl(15,86%,51%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
+<pre><code><span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="2705725358298919760" style="color: hsl(76,47%,83%);">x</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="3365759661443752373" style="color: hsl(15,86%,51%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="794745962933817518" style="color: hsl(127,71%,87%);">x</span> <span class="operator">=</span> <span class="string_literal">"other color please!"</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="6717528807933952652" style="color: hsl(90,74%,79%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(127,71%,87%);">x</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-<span class="punctuation">}</span>
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="794745962933817518" style="color: hsl(127,71%,87%);">x</span> <span class="operator">=</span> <span class="string_literal">"other color please!"</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="6717528807933952652" style="color: hsl(90,74%,79%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(127,71%,87%);">x</span><span class="operator">.</span><span class="unresolved_reference">to_string</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+<span class="brace">}</span>
 
-<span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="punctuation">;</span>
-<span class="punctuation">}</span></code></pre>
\ No newline at end of file
+<span class="keyword">fn</span> <span class="function declaration">bar</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="semicolon">;</span>
+<span class="brace">}</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 e0df0d2b5..a62704c39 100644
--- a/crates/ide/src/syntax_highlighting/tests.rs
+++ b/crates/ide/src/syntax_highlighting/tests.rs
@@ -91,6 +91,10 @@ fn never() -> ! {
     loop {}
 }
 
+fn const_param<const FOO: usize>() -> usize {
+    FOO
+}
+
 use ops::Fn;
 fn baz<F: Fn() -> ()>(f: F) {
     f()
@@ -442,6 +446,11 @@ struct Foo {
 }
 
 impl Foo {
+    /// ```
+    /// let _ = "Call me
+    //    KILLER WHALE
+    ///     Ishmael.";
+    /// ```
     pub const bar: bool = true;
 
     /// Constructs a new `Foo`.
@@ -551,6 +560,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/src/view_hir.rs b/crates/ide/src/view_hir.rs
new file mode 100644
index 000000000..cfcfb7cfb
--- /dev/null
+++ b/crates/ide/src/view_hir.rs
@@ -0,0 +1,25 @@
+use hir::{Function, Semantics};
+use ide_db::base_db::FilePosition;
+use ide_db::RootDatabase;
+use syntax::{algo::find_node_at_offset, ast, AstNode};
+
+// Feature: View Hir
+//
+// |===
+// | Editor  | Action Name
+//
+// | VS Code | **Rust Analyzer: View Hir**
+// |===
+pub(crate) fn view_hir(db: &RootDatabase, position: FilePosition) -> String {
+    body_hir(db, position).unwrap_or("Not inside a function body".to_string())
+}
+
+fn body_hir(db: &RootDatabase, position: FilePosition) -> Option<String> {
+    let sema = Semantics::new(db);
+    let source_file = sema.parse(position.file_id);
+
+    let function = find_node_at_offset::<ast::Fn>(source_file.syntax(), position.offset)?;
+
+    let function: Function = sema.to_def(&function)?;
+    Some(function.debug_hir(db))
+}
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index 0ad6e1000..d3d3dc688 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -19,7 +19,7 @@ fst = { version = "0.4", default-features = false }
 rustc-hash = "1.1.0"
 once_cell = "1.3.1"
 either = "1.6.1"
-itertools = "0.9.0"
+itertools = "0.10.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
@@ -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/apply_change.rs b/crates/ide_db/src/apply_change.rs
index 71c19ed13..c770a236b 100644
--- a/crates/ide_db/src/apply_change.rs
+++ b/crates/ide_db/src/apply_change.rs
@@ -145,6 +145,7 @@ impl RootDatabase {
             hir::db::MacroDefQuery
             hir::db::ParseMacroExpansionQuery
             hir::db::MacroExpandQuery
+            hir::db::HygieneFrameQuery
 
             // DefDatabase
             hir::db::ItemTreeQuery
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 d33a6cb86..d68fe42b0 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -6,8 +6,8 @@
 // FIXME: this badly needs rename/rewrite (matklad, 2020-02-06).
 
 use hir::{
-    db::HirDatabase, Crate, Field, HasVisibility, Impl, Label, LifetimeParam, Local, MacroDef,
-    Module, ModuleDef, Name, PathResolution, Semantics, TypeParam, Visibility,
+    db::HirDatabase, Crate, Field, GenericParam, HasVisibility, Impl, Label, Local, MacroDef,
+    Module, ModuleDef, Name, PathResolution, Semantics, Visibility,
 };
 use syntax::{
     ast::{self, AstNode},
@@ -24,8 +24,7 @@ pub enum Definition {
     ModuleDef(ModuleDef),
     SelfType(Impl),
     Local(Local),
-    TypeParam(TypeParam),
-    LifetimeParam(LifetimeParam),
+    GenericParam(GenericParam),
     Label(Label),
 }
 
@@ -37,8 +36,7 @@ impl Definition {
             Definition::ModuleDef(it) => it.module(db),
             Definition::SelfType(it) => Some(it.module(db)),
             Definition::Local(it) => Some(it.module(db)),
-            Definition::TypeParam(it) => Some(it.module(db)),
-            Definition::LifetimeParam(it) => Some(it.module(db)),
+            Definition::GenericParam(it) => Some(it.module(db)),
             Definition::Label(it) => Some(it.module(db)),
         }
     }
@@ -50,8 +48,7 @@ impl Definition {
             Definition::ModuleDef(def) => def.definition_visibility(db),
             Definition::SelfType(_) => None,
             Definition::Local(_) => None,
-            Definition::TypeParam(_) => None,
-            Definition::LifetimeParam(_) => None,
+            Definition::GenericParam(_) => None,
             Definition::Label(_) => None,
         }
     }
@@ -77,8 +74,7 @@ impl Definition {
             },
             Definition::SelfType(_) => return None,
             Definition::Local(it) => it.name(db)?,
-            Definition::TypeParam(it) => it.name(db),
-            Definition::LifetimeParam(it) => it.name(db),
+            Definition::GenericParam(it) => it.name(db),
             Definition::Label(it) => it.name(db),
         };
         Some(name)
@@ -231,7 +227,11 @@ impl NameClass {
                 },
                 ast::TypeParam(it) => {
                     let def = sema.to_def(&it)?;
-                    Some(NameClass::Definition(Definition::TypeParam(def)))
+                    Some(NameClass::Definition(Definition::GenericParam(def.into())))
+                },
+                ast::ConstParam(it) => {
+                    let def = sema.to_def(&it)?;
+                    Some(NameClass::Definition(Definition::GenericParam(def.into())))
                 },
                 _ => None,
             }
@@ -249,7 +249,7 @@ impl NameClass {
             match parent {
                 ast::LifetimeParam(it) => {
                     let def = sema.to_def(&it)?;
-                    Some(NameClass::Definition(Definition::LifetimeParam(def)))
+                    Some(NameClass::Definition(Definition::GenericParam(def.into())))
                 },
                 ast::Label(it) => {
                     let def = sema.to_def(&it)?;
@@ -350,7 +350,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)));
                     }
@@ -385,7 +385,8 @@ impl NameRefClass {
             | SyntaxKind::WHERE_PRED
             | SyntaxKind::REF_TYPE => sema
                 .resolve_lifetime_param(lifetime)
-                .map(Definition::LifetimeParam)
+                .map(GenericParam::LifetimeParam)
+                .map(Definition::GenericParam)
                 .map(NameRefClass::Definition),
             // lifetime bounds, as in the 'b in 'a: 'b aren't wrapped in TypeBound nodes so we gotta check
             // if our lifetime is in a LifetimeParam without being the constrained lifetime
@@ -393,7 +394,8 @@ impl NameRefClass {
                 != Some(lifetime) =>
             {
                 sema.resolve_lifetime_param(lifetime)
-                    .map(Definition::LifetimeParam)
+                    .map(GenericParam::LifetimeParam)
+                    .map(Definition::GenericParam)
                     .map(NameRefClass::Definition)
             }
             _ => None,
@@ -414,9 +416,10 @@ impl From<PathResolution> for Definition {
                 Definition::ModuleDef(def)
             }
             PathResolution::Local(local) => Definition::Local(local),
-            PathResolution::TypeParam(par) => Definition::TypeParam(par),
+            PathResolution::TypeParam(par) => Definition::GenericParam(par.into()),
             PathResolution::Macro(def) => Definition::Macro(def),
             PathResolution::SelfType(impl_def) => Definition::SelfType(impl_def),
+            PathResolution::ConstParam(par) => Definition::GenericParam(par.into()),
         }
     }
 }
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index d988588ff..c6763ae36 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 {
@@ -37,94 +38,7 @@ pub struct FamousDefs<'a, 'b>(pub &'a Semantics<'b, RootDatabase>, pub Option<Cr
 
 #[allow(non_snake_case)]
 impl FamousDefs<'_, '_> {
-    pub const FIXTURE: &'static str = r#"//- /libcore.rs crate:core
-pub mod convert {
-    pub trait From<T> {
-        fn from(t: T) -> Self;
-    }
-}
-
-pub mod default {
-    pub trait Default {
-       fn default() -> Self;
-    }
-}
-
-pub mod iter {
-    pub use self::traits::{collect::IntoIterator, iterator::Iterator};
-    mod traits {
-        pub(crate) mod iterator {
-            use crate::option::Option;
-            pub trait Iterator {
-                type Item;
-                fn next(&mut self) -> Option<Self::Item>;
-                fn by_ref(&mut self) -> &mut Self {
-                    self
-                }
-                fn take(self, n: usize) -> crate::iter::Take<Self> {
-                    crate::iter::Take { inner: self }
-                }
-            }
-
-            impl<I: Iterator> Iterator for &mut I {
-                type Item = I::Item;
-                fn next(&mut self) -> Option<I::Item> {
-                    (**self).next()
-                }
-            }
-        }
-        pub(crate) mod collect {
-            pub trait IntoIterator {
-                type Item;
-            }
-        }
-    }
-
-    pub use self::sources::*;
-    pub(crate) mod sources {
-        use super::Iterator;
-        use crate::option::Option::{self, *};
-        pub struct Repeat<A> {
-            element: A,
-        }
-
-        pub fn repeat<T>(elt: T) -> Repeat<T> {
-            Repeat { element: elt }
-        }
-
-        impl<A> Iterator for Repeat<A> {
-            type Item = A;
-
-            fn next(&mut self) -> Option<A> {
-                None
-            }
-        }
-    }
-
-    pub use self::adapters::*;
-    pub(crate) mod adapters {
-        use super::Iterator;
-        use crate::option::Option::{self, *};
-        pub struct Take<I> { pub(crate) inner: I }
-        impl<I> Iterator for Take<I> where I: Iterator {
-            type Item = <I as Iterator>::Item;
-            fn next(&mut self) -> Option<<I as Iterator>::Item> {
-                None
-            }
-        }
-    }
-}
-
-pub mod option {
-    pub enum Option<T> { None, Some(T)}
-}
-
-pub mod prelude {
-    pub use crate::{convert::From, iter::{IntoIterator, Iterator}, option::Option::{self, *}, default::Default};
-}
-#[prelude_import]
-pub use prelude::*;
-"#;
+    pub const FIXTURE: &'static str = include_str!("helpers/famous_defs_fixture.rs");
 
     pub fn core(&self) -> Option<Crate> {
         self.find_crate("core")
@@ -201,3 +115,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/helpers/famous_defs_fixture.rs b/crates/ide_db/src/helpers/famous_defs_fixture.rs
new file mode 100644
index 000000000..5e88de64d
--- /dev/null
+++ b/crates/ide_db/src/helpers/famous_defs_fixture.rs
@@ -0,0 +1,120 @@
+//- /libcore.rs crate:core
+//! Signatures of traits, types and functions from the core lib for use in tests.
+pub mod convert {
+    pub trait From<T> {
+        fn from(t: T) -> Self;
+    }
+}
+
+pub mod default {
+    pub trait Default {
+        fn default() -> Self;
+    }
+}
+
+pub mod iter {
+    pub use self::traits::{collect::IntoIterator, iterator::Iterator};
+    mod traits {
+        pub(crate) mod iterator {
+            use crate::option::Option;
+            pub trait Iterator {
+                type Item;
+                fn next(&mut self) -> Option<Self::Item>;
+                fn by_ref(&mut self) -> &mut Self {
+                    self
+                }
+                fn take(self, n: usize) -> crate::iter::Take<Self> {
+                    crate::iter::Take { inner: self }
+                }
+            }
+
+            impl<I: Iterator> Iterator for &mut I {
+                type Item = I::Item;
+                fn next(&mut self) -> Option<I::Item> {
+                    (**self).next()
+                }
+            }
+        }
+        pub(crate) mod collect {
+            pub trait IntoIterator {
+                type Item;
+            }
+        }
+    }
+
+    pub use self::sources::*;
+    pub(crate) mod sources {
+        use super::Iterator;
+        use crate::option::Option::{self, *};
+        pub struct Repeat<A> {
+            element: A,
+        }
+
+        pub fn repeat<T>(elt: T) -> Repeat<T> {
+            Repeat { element: elt }
+        }
+
+        impl<A> Iterator for Repeat<A> {
+            type Item = A;
+
+            fn next(&mut self) -> Option<A> {
+                None
+            }
+        }
+    }
+
+    pub use self::adapters::*;
+    pub(crate) mod adapters {
+        use super::Iterator;
+        use crate::option::Option::{self, *};
+        pub struct Take<I> {
+            pub(crate) inner: I,
+        }
+        impl<I> Iterator for Take<I>
+        where
+            I: Iterator,
+        {
+            type Item = <I as Iterator>::Item;
+            fn next(&mut self) -> Option<<I as Iterator>::Item> {
+                None
+            }
+        }
+    }
+}
+
+pub mod ops {
+    #[lang = "fn"]
+    pub trait Fn<Args>: FnMut<Args> {
+        extern "rust-call" fn call(&self, args: Args) -> Self::Output;
+    }
+
+    #[lang = "fn_mut"]
+    pub trait FnMut<Args>: FnOnce<Args> {
+        extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output;
+    }
+    #[lang = "fn_once"]
+    pub trait FnOnce<Args> {
+        #[lang = "fn_once_output"]
+        type Output;
+        extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+    }
+}
+
+pub mod option {
+    pub enum Option<T> {
+        None,
+        Some(T),
+    }
+}
+
+pub mod prelude {
+    pub use crate::{
+        convert::From,
+        default::Default,
+        iter::{IntoIterator, Iterator},
+        ops::{Fn, FnMut, FnOnce},
+        option::Option::{self, *},
+    };
+}
+#[prelude_import]
+pub use prelude::*;
diff --git a/crates/ide_db/src/imports_locator.rs b/crates/ide_db/src/imports_locator.rs
index 0f4c2ca47..e9f23adf8 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.
+//! This module contains an import search functionality 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 ff10f71c3..b5fa46642 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -18,9 +18,43 @@ use crate::{
     RootDatabase,
 };
 
+#[derive(Debug, Default, Clone)]
+pub struct UsageSearchResult {
+    pub references: FxHashMap<FileId, Vec<FileReference>>,
+}
+
+impl UsageSearchResult {
+    pub fn is_empty(&self) -> bool {
+        self.references.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.references.len()
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (&FileId, &Vec<FileReference>)> + '_ {
+        self.references.iter()
+    }
+
+    pub fn file_ranges(&self) -> impl Iterator<Item = FileRange> + '_ {
+        self.references.iter().flat_map(|(&file_id, refs)| {
+            refs.iter().map(move |&FileReference { range, .. }| FileRange { file_id, range })
+        })
+    }
+}
+
+impl IntoIterator for UsageSearchResult {
+    type Item = (FileId, Vec<FileReference>);
+    type IntoIter = <FxHashMap<FileId, Vec<FileReference>> as IntoIterator>::IntoIter;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.references.into_iter()
+    }
+}
+
 #[derive(Debug, Clone)]
-pub struct Reference {
-    pub file_range: FileRange,
+pub struct FileReference {
+    pub range: TextRange,
     pub kind: ReferenceKind,
     pub access: Option<ReferenceAccess>,
 }
@@ -121,31 +155,55 @@ impl Definition {
 
         if let Definition::Local(var) = self {
             let range = match var.parent(db) {
-                DefWithBody::Function(f) => f.source(db).value.syntax().text_range(),
-                DefWithBody::Const(c) => c.source(db).value.syntax().text_range(),
-                DefWithBody::Static(s) => s.source(db).value.syntax().text_range(),
+                DefWithBody::Function(f) => {
+                    f.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
+                DefWithBody::Const(c) => {
+                    c.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
+                DefWithBody::Static(s) => {
+                    s.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
             };
             let mut res = FxHashMap::default();
-            res.insert(file_id, Some(range));
+            res.insert(file_id, range);
             return SearchScope::new(res);
         }
 
-        if let Definition::LifetimeParam(param) = self {
+        if let Definition::GenericParam(hir::GenericParam::LifetimeParam(param)) = self {
             let range = match param.parent(db) {
-                hir::GenericDef::Function(it) => it.source(db).value.syntax().text_range(),
+                hir::GenericDef::Function(it) => {
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
                 hir::GenericDef::Adt(it) => match it {
-                    hir::Adt::Struct(it) => it.source(db).value.syntax().text_range(),
-                    hir::Adt::Union(it) => it.source(db).value.syntax().text_range(),
-                    hir::Adt::Enum(it) => it.source(db).value.syntax().text_range(),
+                    hir::Adt::Struct(it) => {
+                        it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                    }
+                    hir::Adt::Union(it) => {
+                        it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                    }
+                    hir::Adt::Enum(it) => {
+                        it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                    }
                 },
-                hir::GenericDef::Trait(it) => it.source(db).value.syntax().text_range(),
-                hir::GenericDef::TypeAlias(it) => it.source(db).value.syntax().text_range(),
-                hir::GenericDef::Impl(it) => it.source(db).value.syntax().text_range(),
-                hir::GenericDef::Variant(it) => it.source(db).value.syntax().text_range(),
-                hir::GenericDef::Const(it) => it.source(db).value.syntax().text_range(),
+                hir::GenericDef::Trait(it) => {
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
+                hir::GenericDef::TypeAlias(it) => {
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
+                hir::GenericDef::Impl(it) => {
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
+                hir::GenericDef::Variant(it) => {
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
+                hir::GenericDef::Const(it) => {
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
+                }
             };
             let mut res = FxHashMap::default();
-            res.insert(file_id, Some(range));
+            res.insert(file_id, range);
             return SearchScope::new(res);
         }
 
@@ -228,23 +286,23 @@ impl<'a> FindUsages<'a> {
 
     pub fn at_least_one(self) -> bool {
         let mut found = false;
-        self.search(&mut |_reference| {
+        self.search(&mut |_, _| {
             found = true;
             true
         });
         found
     }
 
-    pub fn all(self) -> Vec<Reference> {
-        let mut res = Vec::new();
-        self.search(&mut |reference| {
-            res.push(reference);
+    pub fn all(self) -> UsageSearchResult {
+        let mut res = UsageSearchResult::default();
+        self.search(&mut |file_id, reference| {
+            res.references.entry(file_id).or_default().push(reference);
             false
         });
         res
     }
 
-    fn search(self, sink: &mut dyn FnMut(Reference) -> bool) {
+    fn search(self, sink: &mut dyn FnMut(FileId, FileReference) -> bool) {
         let _p = profile::span("FindUsages:search");
         let sema = self.sema;
 
@@ -296,16 +354,14 @@ impl<'a> FindUsages<'a> {
     fn found_lifetime(
         &self,
         lifetime: &ast::Lifetime,
-        sink: &mut dyn FnMut(Reference) -> bool,
+        sink: &mut dyn FnMut(FileId, FileReference) -> bool,
     ) -> bool {
         match NameRefClass::classify_lifetime(self.sema, lifetime) {
             Some(NameRefClass::Definition(def)) if &def == self.def => {
-                let reference = Reference {
-                    file_range: self.sema.original_range(lifetime.syntax()),
-                    kind: ReferenceKind::Lifetime,
-                    access: None,
-                };
-                sink(reference)
+                let FileRange { file_id, range } = self.sema.original_range(lifetime.syntax());
+                let reference =
+                    FileReference { range, kind: ReferenceKind::Lifetime, access: None };
+                sink(file_id, reference)
             }
             _ => false, // not a usage
         }
@@ -314,7 +370,7 @@ impl<'a> FindUsages<'a> {
     fn found_name_ref(
         &self,
         name_ref: &ast::NameRef,
-        sink: &mut dyn FnMut(Reference) -> bool,
+        sink: &mut dyn FnMut(FileId, FileReference) -> bool,
     ) -> bool {
         match NameRefClass::classify(self.sema, &name_ref) {
             Some(NameRefClass::Definition(def)) if &def == self.def => {
@@ -328,46 +384,50 @@ impl<'a> FindUsages<'a> {
                     ReferenceKind::Other
                 };
 
-                let reference = Reference {
-                    file_range: self.sema.original_range(name_ref.syntax()),
-                    kind,
-                    access: reference_access(&def, &name_ref),
-                };
-                sink(reference)
+                let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
+                let reference =
+                    FileReference { range, kind, access: reference_access(&def, &name_ref) };
+                sink(file_id, reference)
             }
             Some(NameRefClass::FieldShorthand { local_ref: local, field_ref: field }) => {
+                let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
                 let reference = match self.def {
-                    Definition::Field(_) if &field == self.def => Reference {
-                        file_range: self.sema.original_range(name_ref.syntax()),
+                    Definition::Field(_) if &field == self.def => FileReference {
+                        range,
                         kind: ReferenceKind::FieldShorthandForField,
                         access: reference_access(&field, &name_ref),
                     },
-                    Definition::Local(l) if &local == l => Reference {
-                        file_range: self.sema.original_range(name_ref.syntax()),
+                    Definition::Local(l) if &local == l => FileReference {
+                        range,
                         kind: ReferenceKind::FieldShorthandForLocal,
                         access: reference_access(&Definition::Local(local), &name_ref),
                     },
                     _ => return false, // not a usage
                 };
-                sink(reference)
+                sink(file_id, reference)
             }
             _ => false, // not a usage
         }
     }
 
-    fn found_name(&self, name: &ast::Name, sink: &mut dyn FnMut(Reference) -> bool) -> bool {
+    fn found_name(
+        &self,
+        name: &ast::Name,
+        sink: &mut dyn FnMut(FileId, FileReference) -> bool,
+    ) -> bool {
         match NameClass::classify(self.sema, name) {
             Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) => {
-                let reference = match self.def {
-                    Definition::Field(_) if &field_ref == self.def => Reference {
-                        file_range: self.sema.original_range(name.syntax()),
-                        kind: ReferenceKind::FieldShorthandForField,
-                        // FIXME: mutable patterns should have `Write` access
-                        access: Some(ReferenceAccess::Read),
-                    },
-                    _ => return false, // not a usage
+                if !matches!(self.def, Definition::Field(_) if &field_ref == self.def) {
+                    return false;
+                }
+                let FileRange { file_id, range } = self.sema.original_range(name.syntax());
+                let reference = FileReference {
+                    range,
+                    kind: ReferenceKind::FieldShorthandForField,
+                    // FIXME: mutable patterns should have `Write` access
+                    access: Some(ReferenceAccess::Read),
                 };
-                sink(reference)
+                sink(file_id, reference)
             }
             _ => false, // not a usage
         }
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/lib.rs b/crates/mbe/src/lib.rs
index 7878faaa4..19543d777 100644
--- a/crates/mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
@@ -24,7 +24,7 @@ use crate::{
 #[derive(Debug, PartialEq, Eq)]
 pub enum ParseError {
     Expected(String),
-    RepetitionEmtpyTokenTree,
+    RepetitionEmptyTokenTree,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -217,18 +217,14 @@ impl MacroRules {
 
 impl Rule {
     fn parse(src: &mut TtIter) -> Result<Rule, ParseError> {
-        let mut lhs = src
+        let lhs = src
             .expect_subtree()
-            .map_err(|()| ParseError::Expected("expected subtree".to_string()))?
-            .clone();
-        lhs.delimiter = None;
+            .map_err(|()| ParseError::Expected("expected subtree".to_string()))?;
         src.expect_char('=').map_err(|()| ParseError::Expected("expected `=`".to_string()))?;
         src.expect_char('>').map_err(|()| ParseError::Expected("expected `>`".to_string()))?;
-        let mut rhs = src
+        let rhs = src
             .expect_subtree()
-            .map_err(|()| ParseError::Expected("expected subtree".to_string()))?
-            .clone();
-        rhs.delimiter = None;
+            .map_err(|()| ParseError::Expected("expected subtree".to_string()))?;
 
         let lhs = MetaTemplate { tokens: parse_pattern(&lhs), delimiter: None };
         let rhs = MetaTemplate { tokens: parse_template(&rhs), delimiter: None };
@@ -274,7 +270,7 @@ fn validate(pattern: &MetaTemplate) -> Result<(), ParseError> {
                         }
                         false
                     }) {
-                        return Err(ParseError::RepetitionEmtpyTokenTree);
+                        return Err(ParseError::RepetitionEmptyTokenTree);
                     }
                 }
                 validate(subtree)?
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index ab5f87c48..d32e60521 100644
--- a/crates/mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
@@ -150,7 +150,7 @@ fn match_subtree(
                     res.add_err(err!("leftover tokens"));
                 }
             }
-            Op::Var { name, kind } => {
+            Op::Var { name, kind, .. } => {
                 let kind = match kind {
                     Some(k) => k,
                     None => {
@@ -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 }
@@ -378,7 +378,7 @@ pub(super) fn match_repeat(
     src: &mut TtIter,
 ) -> Result<(), ExpandError> {
     // Dirty hack to make macro-expansion terminate.
-    // This should be replaced by a propper macro-by-example implementation
+    // This should be replaced by a proper macro-by-example implementation
     let mut limit = 65536;
     let mut counter = 0;
 
diff --git a/crates/mbe/src/mbe_expander/transcriber.rs b/crates/mbe/src/mbe_expander/transcriber.rs
index 720531237..59a3c80a8 100644
--- a/crates/mbe/src/mbe_expander/transcriber.rs
+++ b/crates/mbe/src/mbe_expander/transcriber.rs
@@ -67,7 +67,7 @@ struct NestingState {
     /// because there is no variable in use by the current repetition
     hit: bool,
     /// `at_end` is currently necessary to tell `expand_repeat` if it should stop
-    /// because there is no more value avaible for the current repetition
+    /// because there is no more value available for the current repetition
     at_end: bool,
 }
 
@@ -100,8 +100,8 @@ fn expand_subtree(
                 err = err.or(e);
                 arena.push(tt.into());
             }
-            Op::Var { name, .. } => {
-                let ExpandResult { value: fragment, err: e } = expand_var(ctx, &name);
+            Op::Var { name, id, .. } => {
+                let ExpandResult { value: fragment, err: e } = expand_var(ctx, &name, *id);
                 err = err.or(e);
                 push_fragment(arena, fragment);
             }
@@ -118,14 +118,11 @@ fn expand_subtree(
     ExpandResult { value: tt::Subtree { delimiter: template.delimiter, token_trees: tts }, err }
 }
 
-fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> ExpandResult<Fragment> {
-    if v == "crate" {
-        // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path.
-        let tt =
-            tt::Leaf::from(tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() })
-                .into();
-        ExpandResult::ok(Fragment::Tokens(tt))
-    } else if !ctx.bindings.contains(v) {
+fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr, id: tt::TokenId) -> ExpandResult<Fragment> {
+    // We already handle $crate case in mbe parser
+    debug_assert!(v != "crate");
+
+    if !ctx.bindings.contains(v) {
         // Note that it is possible to have a `$var` inside a macro which is not bound.
         // For example:
         // ```
@@ -142,14 +139,8 @@ fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> ExpandResult<Fragment> {
         let tt = tt::Subtree {
             delimiter: None,
             token_trees: vec![
-                tt::Leaf::from(tt::Punct {
-                    char: '$',
-                    spacing: tt::Spacing::Alone,
-                    id: tt::TokenId::unspecified(),
-                })
-                .into(),
-                tt::Leaf::from(tt::Ident { text: v.clone(), id: tt::TokenId::unspecified() })
-                    .into(),
+                tt::Leaf::from(tt::Punct { char: '$', spacing: tt::Spacing::Alone, id }).into(),
+                tt::Leaf::from(tt::Ident { text: v.clone(), id }).into(),
             ],
         }
         .into();
@@ -188,11 +179,7 @@ fn expand_repeat(
 
         counter += 1;
         if counter == limit {
-            log::warn!(
-                "expand_tt excced in repeat pattern exceed limit => {:#?}\n{:#?}",
-                template,
-                ctx
-            );
+            log::warn!("expand_tt in repeat pattern exceed limit => {:#?}\n{:#?}", template, ctx);
             break;
         }
 
diff --git a/crates/mbe/src/parser.rs b/crates/mbe/src/parser.rs
index 2f3ebc831..f3047972d 100644
--- a/crates/mbe/src/parser.rs
+++ b/crates/mbe/src/parser.rs
@@ -8,7 +8,7 @@ use crate::{tt_iter::TtIter, ExpandError, MetaTemplate};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) enum Op {
-    Var { name: SmolStr, kind: Option<SmolStr> },
+    Var { name: SmolStr, kind: Option<SmolStr>, id: tt::TokenId },
     Repeat { subtree: MetaTemplate, kind: RepeatKind, separator: Option<Separator> },
     Leaf(tt::Leaf),
     Subtree(MetaTemplate),
@@ -106,18 +106,25 @@ fn next_op<'a>(first: &tt::TokenTree, src: &mut TtIter<'a>, mode: Mode) -> Resul
                         }
                         let name = UNDERSCORE.clone();
                         let kind = eat_fragment_kind(src, mode)?;
-                        Op::Var { name, kind }
+                        let id = punct.id;
+                        Op::Var { name, kind, id }
+                    }
+                    tt::Leaf::Ident(ident) if ident.text == "crate" => {
+                        // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path.
+                        Op::Leaf(tt::Leaf::from(tt::Ident { text: "$crate".into(), id: ident.id }))
                     }
                     tt::Leaf::Ident(ident) => {
                         let name = ident.text.clone();
                         let kind = eat_fragment_kind(src, mode)?;
-                        Op::Var { name, kind }
+                        let id = ident.id;
+                        Op::Var { name, kind, id }
                     }
                     tt::Leaf::Literal(lit) => {
                         if is_boolean_literal(&lit) {
                             let name = lit.text.clone();
                             let kind = eat_fragment_kind(src, mode)?;
-                            Op::Var { name, kind }
+                            let id = lit.id;
+                            Op::Var { name, kind, id }
                         } else {
                             bail!("bad var 2");
                         }
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..e648519f9 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);
@@ -152,7 +149,7 @@ impl TokenMap {
     }
 
     fn remove_delim(&mut self, idx: usize) {
-        // FIXME: This could be accidently quadratic
+        // FIXME: This could be accidentally quadratic
         self.entries.remove(idx);
     }
 }
@@ -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);
@@ -479,14 +476,14 @@ impl Convertor {
 
 #[derive(Debug)]
 enum SynToken {
-    Ordiniary(SyntaxToken),
+    Ordinary(SyntaxToken),
     Punch(SyntaxToken, TextSize),
 }
 
 impl SynToken {
     fn token(&self) -> &SyntaxToken {
         match self {
-            SynToken::Ordiniary(it) => it,
+            SynToken::Ordinary(it) => it,
             SynToken::Punch(it, _) => it,
         }
     }
@@ -498,7 +495,7 @@ impl SrcToken for SynToken {
     }
     fn to_char(&self) -> Option<char> {
         match self {
-            SynToken::Ordiniary(_) => None,
+            SynToken::Ordinary(_) => None,
             SynToken::Punch(it, i) => it.text().chars().nth((*i).into()),
         }
     }
@@ -538,7 +535,7 @@ impl TokenConvertor for Convertor {
         } else {
             self.punct_offset = None;
             let range = curr.text_range();
-            (SynToken::Ordiniary(curr), range)
+            (SynToken::Ordinary(curr), range)
         };
 
         Some(token)
@@ -560,7 +557,7 @@ impl TokenConvertor for Convertor {
         let token = if curr.kind().is_punct() {
             SynToken::Punch(curr, 0.into())
         } else {
-            SynToken::Ordiniary(curr)
+            SynToken::Ordinary(curr)
         };
         Some(token)
     }
@@ -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/mbe/src/tests.rs b/crates/mbe/src/tests.rs
index 1d9afb4fb..ecea15c11 100644
--- a/crates/mbe/src/tests.rs
+++ b/crates/mbe/src/tests.rs
@@ -1080,6 +1080,19 @@ fn test_vertical_bar_with_pat() {
 }
 
 #[test]
+fn test_dollar_crate_lhs_is_not_meta() {
+    parse_macro(
+        r#"
+macro_rules! foo {
+    ($crate) => {};
+    () => {0};
+}
+    "#,
+    )
+    .assert_expand_items(r#"foo!{}"#, r#"0"#);
+}
+
+#[test]
 fn test_lifetime() {
     parse_macro(
         r#"
@@ -1954,7 +1967,7 @@ fn test_no_space_after_semi_colon() {
 #[test]
 fn test_rustc_issue_57597() {
     fn test_error(fixture: &str) {
-        assert_eq!(parse_macro_error(fixture), ParseError::RepetitionEmtpyTokenTree);
+        assert_eq!(parse_macro_error(fixture), ParseError::RepetitionEmptyTokenTree);
     }
 
     test_error("macro_rules! foo { ($($($i:ident)?)+) => {}; }");
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/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index c7a3556a7..d61950b96 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs
@@ -15,8 +15,16 @@ use super::*;
 //     let _ = b"e";
 //     let _ = br"f";
 // }
-pub(crate) const LITERAL_FIRST: TokenSet =
-    TokenSet::new(&[TRUE_KW, FALSE_KW, INT_NUMBER, FLOAT_NUMBER, BYTE, CHAR, STRING, BYTE_STRING]);
+pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[
+    T![true],
+    T![false],
+    INT_NUMBER,
+    FLOAT_NUMBER,
+    BYTE,
+    CHAR,
+    STRING,
+    BYTE_STRING,
+]);
 
 pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
     if !p.at_ts(LITERAL_FIRST) {
diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index cf4168d32..2070ce163 100644
--- a/crates/parser/src/grammar/items.rs
+++ b/crates/parser/src/grammar/items.rs
@@ -27,19 +27,19 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
 }
 
 pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[
-    FN_KW,
-    STRUCT_KW,
-    ENUM_KW,
-    IMPL_KW,
-    TRAIT_KW,
-    CONST_KW,
-    STATIC_KW,
-    LET_KW,
-    MOD_KW,
-    PUB_KW,
-    CRATE_KW,
-    USE_KW,
-    MACRO_KW,
+    T![fn],
+    T![struct],
+    T![enum],
+    T![impl],
+    T![trait],
+    T![const],
+    T![static],
+    T![let],
+    T![mod],
+    T![pub],
+    T![crate],
+    T![use],
+    T![macro],
     T![;],
 ]);
 
diff --git a/crates/parser/src/grammar/items/traits.rs b/crates/parser/src/grammar/items/traits.rs
index ab9a12b4d..d076974ed 100644
--- a/crates/parser/src/grammar/items/traits.rs
+++ b/crates/parser/src/grammar/items/traits.rs
@@ -110,7 +110,7 @@ fn choose_type_params_over_qpath(p: &Parser) -> bool {
     if !p.at(T![<]) {
         return false;
     }
-    if p.nth(1) == T![#] || p.nth(1) == T![>] || p.nth(1) == CONST_KW {
+    if p.nth(1) == T![#] || p.nth(1) == T![>] || p.nth(1) == T![const] {
         return true;
     }
     (p.nth(1) == LIFETIME_IDENT || p.nth(1) == IDENT)
diff --git a/crates/parser/src/grammar/items/use_item.rs b/crates/parser/src/grammar/items/use_item.rs
index 20e6a13cf..5cb8b08e7 100644
--- a/crates/parser/src/grammar/items/use_item.rs
+++ b/crates/parser/src/grammar/items/use_item.rs
@@ -46,7 +46,7 @@ fn use_tree(p: &mut Parser, top_level: bool) {
         // test use_tree_list
         // use {crate::path::from::root, or::path::from::crate_name}; // Rust 2018 (with a crate named `or`)
         // use {path::from::root}; // Rust 2015
-        // use ::{some::arbritrary::path}; // Rust 2015
+        // use ::{some::arbitrary::path}; // Rust 2015
         // use ::{{{root::export}}}; // Nonsensical but perfectly legal nesting
         T!['{'] => {
             use_tree_list(p);
diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs
index b53d5749f..da71498a8 100644
--- a/crates/parser/src/grammar/patterns.rs
+++ b/crates/parser/src/grammar/patterns.rs
@@ -83,7 +83,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
 }
 
 const PAT_RECOVERY_SET: TokenSet =
-    TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]);
+    TokenSet::new(&[T![let], T![if], T![while], T![loop], T![match], T![')'], T![,]]);
 
 fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> {
     let m = match p.nth(0) {
diff --git a/crates/parser/src/grammar/type_args.rs b/crates/parser/src/grammar/type_args.rs
index a013c49b9..42cd426bd 100644
--- a/crates/parser/src/grammar/type_args.rs
+++ b/crates/parser/src/grammar/type_args.rs
@@ -26,7 +26,7 @@ pub(super) fn opt_generic_arg_list(p: &mut Parser, colon_colon_required: bool) {
 }
 
 // test type_arg
-// type A = B<'static, i32, 1, { 2 }, Item=u64>;
+// type A = B<'static, i32, 1, { 2 }, Item=u64, true, false>;
 fn generic_arg(p: &mut Parser) {
     let m = p.start();
     match p.current() {
@@ -55,6 +55,10 @@ fn generic_arg(p: &mut Parser) {
             expressions::literal(p);
             m.complete(p, CONST_ARG);
         }
+        T![true] | T![false] => {
+            expressions::literal(p);
+            m.complete(p, CONST_ARG);
+        }
         _ => {
             types::type_(p);
             m.complete(p, TYPE_ARG);
diff --git a/crates/parser/src/grammar/type_params.rs b/crates/parser/src/grammar/type_params.rs
index 4aeccd193..3de5248da 100644
--- a/crates/parser/src/grammar/type_params.rs
+++ b/crates/parser/src/grammar/type_params.rs
@@ -25,7 +25,7 @@ fn generic_param_list(p: &mut Parser) {
         match p.current() {
             LIFETIME_IDENT => lifetime_param(p, m),
             IDENT => type_param(p, m),
-            CONST_KW => const_param(p, m),
+            T![const] => const_param(p, m),
             _ => {
                 m.abandon(p);
                 p.err_and_bump("expected type parameter")
@@ -66,7 +66,7 @@ fn type_param(p: &mut Parser, m: Marker) {
 // test const_param
 // struct S<const N: u32>;
 fn const_param(p: &mut Parser, m: Marker) {
-    assert!(p.at(CONST_KW));
+    assert!(p.at(T![const]));
     p.bump(T![const]);
     name(p);
     types::ascription(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_api/src/msg.rs b/crates/proc_macro_api/src/msg.rs
index f84ebdbc5..970f165ed 100644
--- a/crates/proc_macro_api/src/msg.rs
+++ b/crates/proc_macro_api/src/msg.rs
@@ -58,7 +58,13 @@ pub trait Message: Serialize + DeserializeOwned {
     fn read(inp: &mut impl BufRead) -> io::Result<Option<Self>> {
         Ok(match read_json(inp)? {
             None => None,
-            Some(text) => Some(serde_json::from_str(&text)?),
+            Some(text) => {
+                let mut deserializer = serde_json::Deserializer::from_str(&text);
+                // Note that some proc-macro generate very deep syntax tree
+                // We have to disable the current limit of serde here
+                deserializer.disable_recursion_limit();
+                Some(Self::deserialize(&mut deserializer)?)
+            }
         })
     }
     fn write(self, out: &mut impl Write) -> io::Result<()> {
@@ -73,7 +79,7 @@ impl Message for Response {}
 fn read_json(inp: &mut impl BufRead) -> io::Result<Option<String>> {
     let mut buf = String::new();
     inp.read_line(&mut buf)?;
-    buf.pop(); // Remove traling '\n'
+    buf.pop(); // Remove trailing '\n'
     Ok(match buf.len() {
         0 => None,
         _ => Some(buf),
diff --git a/crates/proc_macro_api/src/process.rs b/crates/proc_macro_api/src/process.rs
index d68723ada..6d6ab8888 100644
--- a/crates/proc_macro_api/src/process.rs
+++ b/crates/proc_macro_api/src/process.rs
@@ -92,10 +92,11 @@ fn client_loop(task_rx: Receiver<Task>, mut process: Process) {
     for Task { req, result_tx } in task_rx {
         match send_request(&mut stdin, &mut stdout, req) {
             Ok(res) => result_tx.send(res).unwrap(),
-            Err(_err) => {
+            Err(err) => {
                 log::error!(
-                    "proc macro server crashed, server process state: {:?}",
-                    process.child.try_wait()
+                    "proc macro server crashed, server process state: {:?}, server request error: {:?}",
+                    process.child.try_wait(),
+                    err
                 );
                 let res = Response::Error(ResponseError {
                     code: ErrorCode::ServerErrorEnd,
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index df9a55c10..83f9ead17 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -20,8 +20,7 @@ proc_macro_api = { path = "../proc_macro_api", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
 
 [dev-dependencies]
-cargo_metadata = "=0.12.0"
-difference = "2.0.0"
+cargo_metadata = "0.12.2"
 
 # used as proc macro test targets
 serde_derive = "1.0.106"
diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs b/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs
index 3528d5c99..bd1e7c2fc 100644
--- a/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs
@@ -251,7 +251,7 @@ impl<S> DecodeMut<'_, '_, S> for String {
     }
 }
 
-/// Simplied version of panic payloads, ignoring
+/// Simplified version of panic payloads, ignoring
 /// types other than `&'static str` and `String`.
 #[derive(Debug)]
 pub enum PanicMessage {
diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
index 503f4c101..e6006a3c8 100644
--- a/crates/proc_macro_srv/src/rustc_server.rs
+++ b/crates/proc_macro_srv/src/rustc_server.rs
@@ -4,7 +4,7 @@
 //! The lib-proc-macro server backend is `TokenStream`-agnostic, such that
 //! we could provide any TokenStream implementation.
 //! The original idea from fedochet is using proc-macro2 as backend,
-//! we use tt instead for better intergation with RA.
+//! we use tt instead for better integration with RA.
 //!
 //! FIXME: No span and source file information is implemented yet
 
@@ -204,17 +204,18 @@ pub mod token_stream {
                 let content = subtree
                     .token_trees
                     .iter()
-                    .map(|tkn| {
-                        let s = to_text(tkn);
+                    .fold((String::new(), true), |(last, last_to_joint), tkn| {
+                        let s = [last, to_text(tkn)].join(if last_to_joint { "" } else { " " });
+                        let mut is_joint = false;
                         if let tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) = tkn {
-                            if punct.spacing == tt::Spacing::Alone {
-                                return s + " ";
+                            if punct.spacing == tt::Spacing::Joint {
+                                is_joint = true;
                             }
                         }
-                        s
+                        (s, is_joint)
                     })
-                    .collect::<Vec<_>>()
-                    .concat();
+                    .0;
+
                 let (open, close) = match subtree.delimiter.map(|it| it.kind) {
                     None => ("", ""),
                     Some(tt::DelimiterKind::Brace) => ("{", "}"),
@@ -710,4 +711,32 @@ mod tests {
         assert_eq!(srv.character('c').text, "'c'");
         assert_eq!(srv.byte_string(b"1234586\x88").text, "b\"1234586\\x88\"");
     }
+
+    #[test]
+    fn test_rustc_server_to_string() {
+        let s = TokenStream {
+            subtree: tt::Subtree {
+                delimiter: None,
+                token_trees: vec![
+                    tt::TokenTree::Leaf(tt::Leaf::Ident(tt::Ident {
+                        text: "struct".into(),
+                        id: tt::TokenId::unspecified(),
+                    })),
+                    tt::TokenTree::Leaf(tt::Leaf::Ident(tt::Ident {
+                        text: "T".into(),
+                        id: tt::TokenId::unspecified(),
+                    })),
+                    tt::TokenTree::Subtree(tt::Subtree {
+                        delimiter: Some(tt::Delimiter {
+                            id: tt::TokenId::unspecified(),
+                            kind: tt::DelimiterKind::Brace,
+                        }),
+                        token_trees: vec![],
+                    }),
+                ],
+            },
+        };
+
+        assert_eq!(s.to_string(), "struct T {}");
+    }
 }
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/Cargo.toml b/crates/project_model/Cargo.toml
index c55e85709..855fb83ea 100644
--- a/crates/project_model/Cargo.toml
+++ b/crates/project_model/Cargo.toml
@@ -12,11 +12,11 @@ doctest = false
 [dependencies]
 log = "0.4.8"
 rustc-hash = "1.1.0"
-cargo_metadata = "=0.12.0"
+cargo_metadata = "0.12.2"
 serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.48"
 anyhow = "1.0.26"
-itertools = "0.9.0"
+itertools = "0.10.0"
 
 arena = { path = "../arena", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
index bb3b6f2ef..2ee4e88b2 100644
--- a/crates/project_model/src/cargo_workspace.rs
+++ b/crates/project_model/src/cargo_workspace.rs
@@ -1,10 +1,12 @@
 //! FIXME: write short doc here
 
 use std::{
+    convert::TryInto,
     ffi::OsStr,
+    io::BufReader,
     ops,
     path::{Path, PathBuf},
-    process::Command,
+    process::{Command, Stdio},
 };
 
 use anyhow::{Context, Result};
@@ -14,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;
@@ -79,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>,
 }
 
@@ -101,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,
 }
 
@@ -148,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());
@@ -196,8 +222,26 @@ impl CargoWorkspace {
         if let Some(target) = target {
             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(|| {
-            format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display())
+            let cwd: Option<AbsPathBuf> =
+                std::env::current_dir().ok().and_then(|p| p.try_into().ok());
+
+            let workdir = cargo_toml
+                .parent()
+                .map(|p| p.to_path_buf())
+                .or(cwd)
+                .map(|dir| dir.to_string_lossy().to_string())
+                .unwrap_or_else(|| "<failed to get path>".into());
+
+            format!(
+                "Failed to run `cargo metadata --manifest-path {}` in `{}`",
+                cargo_toml.display(),
+                workdir
+            )
         })?;
 
         let mut out_dir_by_id = FxHashMap::default();
@@ -205,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;
@@ -330,10 +374,16 @@ 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);
 
+    // --all-targets includes tests, benches and examples in addition to the
+    // default lib and bins. This is an independent concept from the --targets
+    // flag below.
+    cmd.arg("--all-targets");
+
     if let Some(target) = &cargo_features.target {
         cmd.args(&["--target", target]);
     }
@@ -352,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 {
@@ -389,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
@@ -399,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 aab279223..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,13 +132,15 @@ struct CrateData {
     source: Option<CrateSource>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(rename = "edition")]
 enum EditionData {
     #[serde(rename = "2015")]
     Edition2015,
     #[serde(rename = "2018")]
     Edition2018,
+    #[serde(rename = "2021")]
+    Edition2021,
 }
 
 impl From<EditionData> for Edition {
@@ -146,11 +148,12 @@ impl From<EditionData> for Edition {
         match data {
             EditionData::Edition2015 => Edition::Edition2015,
             EditionData::Edition2018 => Edition::Edition2018,
+            EditionData::Edition2021 => Edition::Edition2021,
         }
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 struct DepData {
     /// Identifies a crate by position in the crates array.
     #[serde(rename = "crate")]
@@ -159,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 53e70eaf7..af7b86ead 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -17,8 +17,9 @@ path = "src/bin/main.rs"
 [dependencies]
 anyhow = "1.0.26"
 crossbeam-channel = "0.5.0"
+dissimilar = "1.0.2"
 env_logger = { version = "0.8.1", default-features = false }
-itertools = "0.9.0"
+itertools = "0.10.0"
 jod-thread = "0.1.0"
 log = "0.4.8"
 lsp-types = { version = "0.86.0", features = ["proposed"] }
@@ -61,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..f148521a2 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;
@@ -77,14 +75,24 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
                 will_create: None,
                 did_rename: None,
                 will_rename: Some(FileOperationRegistrationOptions {
-                    filters: vec![FileOperationFilter {
-                        scheme: Some(String::from("file")),
-                        pattern: FileOperationPattern {
-                            glob: String::from("**/*.rs"),
-                            matches: Some(FileOperationPatternKind::File),
-                            options: None,
+                    filters: vec![
+                        FileOperationFilter {
+                            scheme: Some(String::from("file")),
+                            pattern: FileOperationPattern {
+                                glob: String::from("**/*.rs"),
+                                matches: Some(FileOperationPatternKind::File),
+                                options: None,
+                            },
                         },
-                    }],
+                        FileOperationFilter {
+                            scheme: Some(String::from("file")),
+                            pattern: FileOperationPattern {
+                                glob: String::from("**"),
+                                matches: Some(FileOperationPatternKind::Folder),
+                                options: None,
+                            },
+                        },
+                    ],
                 }),
                 did_delete: None,
                 will_delete: None,
@@ -118,37 +126,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/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index a23fb7a33..fd1407e60 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -58,7 +58,7 @@ impl AnalysisStatsCmd {
         let mut db_load_sw = self.stop_watch();
         let (host, vfs) = load_cargo(&self.path, self.load_output_dirs, self.with_proc_macro)?;
         let db = host.raw_database();
-        eprintln!("Database loaded {}", db_load_sw.elapsed());
+        eprintln!("{:<20} {}", "Database loaded:", db_load_sw.elapsed());
 
         let mut analysis_sw = self.stop_watch();
         let mut num_crates = 0;
@@ -85,7 +85,7 @@ impl AnalysisStatsCmd {
             shuffle(&mut rng, &mut visit_queue);
         }
 
-        eprintln!("Crates in this dir: {}", num_crates);
+        eprint!("  crates: {}", num_crates);
         let mut num_decls = 0;
         let mut funcs = Vec::new();
         while let Some(module) = visit_queue.pop() {
@@ -109,10 +109,8 @@ impl AnalysisStatsCmd {
                 }
             }
         }
-        eprintln!("Total modules found: {}", visited_modules.len());
-        eprintln!("Total declarations: {}", num_decls);
-        eprintln!("Total functions: {}", funcs.len());
-        eprintln!("Item Collection: {}", analysis_sw.elapsed());
+        eprintln!(", mods: {}, decls: {}, fns: {}", visited_modules.len(), num_decls, funcs.len());
+        eprintln!("{:<20} {}", "Item Collection:", analysis_sw.elapsed());
 
         if self.randomize {
             shuffle(&mut rng, &mut funcs);
@@ -135,7 +133,7 @@ impl AnalysisStatsCmd {
                     snap.0.infer(f_id.into());
                 })
                 .count();
-            eprintln!("Parallel Inference: {}", inference_sw.elapsed());
+            eprintln!("{:<20} {}", "Parallel Inference:", inference_sw.elapsed());
         }
 
         let mut inference_sw = self.stop_watch();
@@ -161,11 +159,12 @@ impl AnalysisStatsCmd {
             }
             let mut msg = format!("processing: {}", full_name);
             if verbosity.is_verbose() {
-                let src = f.source(db);
-                let original_file = src.file_id.original_file(db);
-                let path = vfs.file_path(original_file);
-                let syntax_range = src.value.syntax().text_range();
-                format_to!(msg, " ({} {:?})", path, syntax_range);
+                if let Some(src) = f.source(db) {
+                    let original_file = src.file_id.original_file(db);
+                    let path = vfs.file_path(original_file);
+                    let syntax_range = src.value.syntax().text_range();
+                    format_to!(msg, " ({} {:?})", path, syntax_range);
+                }
             }
             if verbosity.is_spammy() {
                 bar.println(msg.to_string());
@@ -272,27 +271,22 @@ impl AnalysisStatsCmd {
             bar.inc(1);
         }
         bar.finish_and_clear();
-        eprintln!("Total expressions: {}", num_exprs);
         eprintln!(
-            "Expressions of unknown type: {} ({}%)",
+            "  exprs: {}, ??ty: {} ({}%), ?ty: {} ({}%), !ty: {}",
+            num_exprs,
             num_exprs_unknown,
-            if num_exprs > 0 { num_exprs_unknown * 100 / num_exprs } else { 100 }
-        );
-        report_metric("unknown type", num_exprs_unknown, "#");
-
-        eprintln!(
-            "Expressions of partially unknown type: {} ({}%)",
+            percentage(num_exprs_unknown, num_exprs),
             num_exprs_partially_unknown,
-            if num_exprs > 0 { num_exprs_partially_unknown * 100 / num_exprs } else { 100 }
+            percentage(num_exprs_partially_unknown, num_exprs),
+            num_type_mismatches
         );
-
-        eprintln!("Type mismatches: {}", num_type_mismatches);
+        report_metric("unknown type", num_exprs_unknown, "#");
         report_metric("type mismatches", num_type_mismatches, "#");
 
-        eprintln!("Inference: {}", inference_sw.elapsed());
+        eprintln!("{:<20} {}", "Inference:", inference_sw.elapsed());
 
         let total_span = analysis_sw.elapsed();
-        eprintln!("Total: {}", total_span);
+        eprintln!("{:<20} {}", "Total:", total_span);
         report_metric("total time", total_span.time.as_millis() as u64, "ms");
         if let Some(instructions) = total_span.instructions {
             report_metric("total instructions", instructions, "#instr");
@@ -301,7 +295,7 @@ impl AnalysisStatsCmd {
             report_metric("total memory", memory.allocated.megabytes() as u64, "MB");
         }
 
-        if self.memory_usage {
+        if self.memory_usage && verbosity.is_verbose() {
             print_memory_usage(host, vfs);
         }
 
@@ -324,3 +318,7 @@ fn shuffle<T>(rng: &mut Rand32, slice: &mut [T]) {
         slice.swap(0, idx);
     }
 }
+
+fn percentage(n: u64, total: u64) -> u64 {
+    (n * 100).checked_div(total).unwrap_or(100)
+}
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 1db5b4e7d..27b92a5a9 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,366 @@ 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 did_save_text_document_dynamic_registration(&self) -> bool {
+        let caps =
+            try_or!(self.caps.text_document.as_ref()?.synchronization.clone()?, Default::default());
+        caps.did_save == Some(true) && caps.dynamic_registration == Some(true)
+    }
+    pub fn did_change_watched_files_dynamic_registration(&self) -> bool {
+        try_or!(
+            self.caps.workspace.as_ref()?.did_change_watched_files.as_ref()?.dynamic_registration?,
+            false
+        )
     }
 
-    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 +640,7 @@ enum MergeBehaviorDef {
     Last,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "snake_case")]
 enum ImportPrefixDef {
     Plain,
@@ -624,15 +652,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 +698,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)
 }
 
@@ -679,7 +720,7 @@ fn schema(fields: &[(&'static str, &'static str, &[&str], &str)]) -> serde_json:
     for ((f1, ..), (f2, ..)) in fields.iter().zip(&fields[1..]) {
         fn key(f: &str) -> &str {
             f.splitn(2, "_").next().unwrap()
-        };
+        }
         assert!(key(f1) <= key(f2), "wrong field order: {:?} {:?}", f1, f2);
     }
 
@@ -733,6 +774,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 +821,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/diff.rs b/crates/rust-analyzer/src/diff.rs
new file mode 100644
index 000000000..231be5807
--- /dev/null
+++ b/crates/rust-analyzer/src/diff.rs
@@ -0,0 +1,53 @@
+//! Generate minimal `TextEdit`s from different text versions
+use dissimilar::Chunk;
+use ide::{TextEdit, TextRange, TextSize};
+
+pub(crate) fn diff(left: &str, right: &str) -> TextEdit {
+    let chunks = dissimilar::diff(left, right);
+    textedit_from_chunks(chunks)
+}
+
+fn textedit_from_chunks(chunks: Vec<dissimilar::Chunk>) -> TextEdit {
+    let mut builder = TextEdit::builder();
+    let mut pos = TextSize::default();
+
+    let mut chunks = chunks.into_iter().peekable();
+    while let Some(chunk) = chunks.next() {
+        if let (Chunk::Delete(deleted), Some(&Chunk::Insert(inserted))) = (chunk, chunks.peek()) {
+            chunks.next().unwrap();
+            let deleted_len = TextSize::of(deleted);
+            builder.replace(TextRange::at(pos, deleted_len), inserted.into());
+            pos += deleted_len;
+            continue;
+        }
+
+        match chunk {
+            Chunk::Equal(text) => {
+                pos += TextSize::of(text);
+            }
+            Chunk::Delete(deleted) => {
+                let deleted_len = TextSize::of(deleted);
+                builder.delete(TextRange::at(pos, deleted_len));
+                pos += deleted_len;
+            }
+            Chunk::Insert(inserted) => {
+                builder.insert(pos, inserted.into());
+            }
+        }
+    }
+    builder.finish()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn diff_applies() {
+        let mut original = String::from("fn foo(a:u32){\n}");
+        let result = "fn foo(a: u32) {}";
+        let edit = diff(&original, result);
+        edit.apply(&mut original);
+        assert_eq!(original, result);
+    }
+}
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index 71dc56915..442fbd14c 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -22,6 +22,7 @@ use crate::{
     from_proto,
     line_endings::LineEndings,
     main_loop::Task,
+    op_queue::OpQueue,
     reload::SourceRootConfig,
     request_metrics::{LatestRequests, RequestMetrics},
     thread_pool::TaskPool,
@@ -67,7 +68,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>,
@@ -78,12 +79,13 @@ pub(crate) struct GlobalState {
     pub(crate) source_root_config: SourceRootConfig,
     pub(crate) proc_macro_client: Option<ProcMacroClient>,
     pub(crate) workspaces: Arc<Vec<ProjectWorkspace>>,
+    pub(crate) fetch_workspaces_queue: OpQueue,
     latest_requests: Arc<RwLock<LatestRequests>>,
 }
 
 /// 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 +111,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 +121,7 @@ impl GlobalState {
             flycheck: Vec::new(),
             flycheck_sender,
             flycheck_receiver,
-            config,
+            config: Arc::new(config),
             analysis_host,
             diagnostics: Default::default(),
             mem_docs: FxHashMap::default(),
@@ -130,6 +132,7 @@ impl GlobalState {
             source_root_config: SourceRootConfig::default(),
             proc_macro_client: None,
             workspaces: Arc::new(Vec::new()),
+            fetch_workspaces_queue: OpQueue::default(),
             latest_requests: Default::default(),
         }
     }
@@ -184,7 +187,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 23f323f55..dc81f55d6 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,
@@ -34,8 +33,10 @@ use syntax::{algo, ast, AstNode, TextRange, TextSize};
 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,
@@ -104,6 +105,16 @@ pub(crate) fn handle_syntax_tree(
     Ok(res)
 }
 
+pub(crate) fn handle_view_hir(
+    snap: GlobalStateSnapshot,
+    params: lsp_types::TextDocumentPositionParams,
+) -> Result<String> {
+    let _p = profile::span("handle_view_hir");
+    let position = from_proto::file_position(&snap, params)?;
+    let res = snap.analysis.view_hir(position)?;
+    Ok(res)
+}
+
 pub(crate) fn handle_expand_macro(
     snap: GlobalStateSnapshot,
     params: lsp_ext::ExpandMacroParams,
@@ -269,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();
@@ -278,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),
@@ -309,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);
@@ -322,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>,
@@ -421,9 +432,27 @@ pub(crate) fn handle_will_rename_files(
             // Limit to single-level moves for now.
             match (from_path.parent(), to_path.parent()) {
                 (Some(p1), Some(p2)) if p1 == p2 => {
-                    let new_name = to_path.file_stem()?;
-                    let new_name = new_name.to_str()?;
-                    Some((snap.url_to_file_id(&from).ok()?, new_name.to_string()))
+                    if from_path.is_dir() {
+                        // add '/' to end of url -- from `file://path/to/folder` to `file://path/to/folder/`
+                        let mut old_folder_name = from_path.file_stem()?.to_str()?.to_string();
+                        old_folder_name.push('/');
+                        let from_with_trailing_slash = from.join(&old_folder_name).ok()?;
+
+                        let imitate_from_url = from_with_trailing_slash.join("mod.rs").ok()?;
+                        let new_file_name = to_path.file_name()?.to_str()?;
+                        Some((
+                            snap.url_to_file_id(&imitate_from_url).ok()?,
+                            new_file_name.to_string(),
+                        ))
+                    } else {
+                        let old_name = from_path.file_stem()?.to_str()?;
+                        let new_name = to_path.file_stem()?.to_str()?;
+                        match (old_name, new_name) {
+                            ("mod", _) => None,
+                            (_, "mod") => None,
+                            _ => Some((snap.url_to_file_id(&from).ok()?, new_name.to_string())),
+                        }
+                    }
                 }
                 _ => None,
             }
@@ -536,7 +565,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() {
@@ -567,9 +596,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,
                 },
@@ -608,7 +637,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,
     };
@@ -621,10 +651,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);
                 }
             }
 
@@ -650,16 +679,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()
@@ -678,7 +697,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,
@@ -716,7 +735,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))
@@ -734,12 +753,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))
 }
 
@@ -749,14 +765,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 {
@@ -777,7 +791,8 @@ pub(crate) fn handle_prepare_rename(
     let _p = profile::span("handle_prepare_rename");
     let position = from_proto::file_position(&snap, params)?;
 
-    let change = snap.analysis.prepare_rename(position)??;
+    let change = snap.analysis.prepare_rename(position)?.map_err(to_proto::rename_error)?;
+
     let line_index = snap.analysis.file_line_index(position.file_id)?;
     let range = to_proto::range(&line_index, change.range);
     Ok(Some(PrepareRenameResponse::Range(range)))
@@ -790,15 +805,8 @@ pub(crate) fn handle_rename(
     let _p = profile::span("handle_rename");
     let position = from_proto::file_position(&snap, params.text_document_position)?;
 
-    if params.new_name.is_empty() {
-        return Err(LspError::new(
-            ErrorCode::InvalidParams as i32,
-            "New Name cannot be empty".into(),
-        )
-        .into());
-    }
-
-    let change = snap.analysis.rename(position, &*params.new_name)??;
+    let change =
+        snap.analysis.rename(position, &*params.new_name)?.map_err(to_proto::rename_error)?;
     let workspace_edit = to_proto::workspace_edit(&snap, change.info)?;
     Ok(Some(workspace_edit))
 }
@@ -816,14 +824,15 @@ pub(crate) fn handle_references(
     };
 
     let locations = if params.context.include_declaration {
-        refs.into_iter()
-            .filter_map(|reference| to_proto::location(&snap, reference.file_range).ok())
+        refs.references_with_declaration()
+            .file_ranges()
+            .filter_map(|frange| to_proto::location(&snap, frange).ok())
             .collect()
     } else {
         // Only iterate over the references if include_declaration was false
         refs.references()
-            .iter()
-            .filter_map(|reference| to_proto::location(&snap, reference.file_range).ok())
+            .file_ranges()
+            .filter_map(|frange| to_proto::location(&snap, frange).ok())
             .collect()
     };
 
@@ -840,9 +849,9 @@ pub(crate) fn handle_formatting(
     let crate_ids = snap.analysis.crate_for(file_id)?;
 
     let file_line_index = snap.analysis.file_line_index(file_id)?;
-    let end_position = to_proto::position(&file_line_index, TextSize::of(file.as_str()));
+    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);
@@ -861,16 +870,18 @@ pub(crate) fn handle_formatting(
         }
     };
 
-    let mut rustfmt = rustfmt.stdin(Stdio::piped()).stdout(Stdio::piped()).spawn()?;
+    let mut rustfmt =
+        rustfmt.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn()?;
 
     rustfmt.stdin.as_mut().unwrap().write_all(file.as_bytes())?;
 
     let output = rustfmt.wait_with_output()?;
     let captured_stdout = String::from_utf8(output.stdout)?;
+    let captured_stderr = String::from_utf8(output.stderr).unwrap_or_default();
 
     if !output.status.success() {
         match output.status.code() {
-            Some(1) => {
+            Some(1) if !captured_stderr.contains("not installed") => {
                 // While `rustfmt` doesn't have a specific exit code for parse errors this is the
                 // likely cause exiting with 1. Most Language Servers swallow parse errors on
                 // formatting because otherwise an error is surfaced to the user on top of the
@@ -886,8 +897,9 @@ pub(crate) fn handle_formatting(
                     format!(
                         r#"rustfmt exited with:
                            Status: {}
-                           stdout: {}"#,
-                        output.status, captured_stdout,
+                           stdout: {}
+                           stderr: {}"#,
+                        output.status, captured_stdout, captured_stderr,
                     ),
                 )
                 .into());
@@ -895,14 +907,26 @@ 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(vec![lsp_types::TextEdit {
-            range: Range::new(Position::new(0, 0), end_position),
-            new_text: captured_stdout,
-        }]))
+        Ok(Some(to_proto::text_edit_vec(
+            &file_line_index,
+            file_line_endings,
+            diff(&file, &new_text),
+        )))
     }
 }
 
@@ -914,7 +938,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);
     }
 
@@ -923,14 +947,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();
 
@@ -944,7 +966,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()
         {
@@ -965,7 +987,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()
@@ -994,7 +1016,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");
@@ -1008,13 +1030,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];
@@ -1031,7 +1054,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));
     }
@@ -1040,7 +1064,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()) {
@@ -1050,7 +1074,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)),
@@ -1059,7 +1083,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);
@@ -1067,7 +1091,7 @@ pub(crate) fn handle_code_lens(
         }
     }
 
-    if snap.config.lens.implementations {
+    if lens_config.implementations {
         // Handle impls
         lenses.extend(
             snap.analysis
@@ -1102,7 +1126,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());
@@ -1164,8 +1188,8 @@ pub(crate) fn handle_code_lens_resolve(
                 .unwrap_or(None)
                 .map(|r| {
                     r.references()
-                        .iter()
-                        .filter_map(|it| to_proto::location(&snap, it.file_range).ok())
+                        .file_ranges()
+                        .filter_map(|frange| to_proto::location(&snap, frange).ok())
                         .collect_vec()
                 })
                 .unwrap_or_default();
@@ -1209,13 +1233,19 @@ pub(crate) fn handle_document_highlight(
     };
 
     let res = refs
-        .into_iter()
-        .filter(|reference| reference.file_range.file_id == position.file_id)
-        .map(|reference| DocumentHighlight {
-            range: to_proto::range(&line_index, reference.file_range.range),
-            kind: reference.access.map(to_proto::document_highlight_kind),
+        .references_with_declaration()
+        .references
+        .get(&position.file_id)
+        .map(|file_refs| {
+            file_refs
+                .into_iter()
+                .map(|r| DocumentHighlight {
+                    range: to_proto::range(&line_index, r.range),
+                    kind: r.access.map(to_proto::document_highlight_kind),
+                })
+                .collect()
         })
-        .collect();
+        .unwrap_or_default();
     Ok(Some(res))
 }
 
@@ -1248,7 +1278,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),
@@ -1281,7 +1311,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())
@@ -1527,7 +1557,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 {
@@ -1551,7 +1581,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()?;
@@ -1579,7 +1609,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;
     }
 
@@ -1587,12 +1618,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));
         }
@@ -1605,7 +1636,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;
     }
 
@@ -1626,14 +1657,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/lib.rs b/crates/rust-analyzer/src/lib.rs
index d538ad69a..2207b9a87 100644
--- a/crates/rust-analyzer/src/lib.rs
+++ b/crates/rust-analyzer/src/lib.rs
@@ -34,6 +34,8 @@ mod request_metrics;
 mod lsp_utils;
 mod thread_pool;
 mod document;
+mod diff;
+mod op_queue;
 pub mod lsp_ext;
 pub mod config;
 
diff --git a/crates/rust-analyzer/src/lsp_ext.rs b/crates/rust-analyzer/src/lsp_ext.rs
index 93ac45415..a85978737 100644
--- a/crates/rust-analyzer/src/lsp_ext.rs
+++ b/crates/rust-analyzer/src/lsp_ext.rs
@@ -53,6 +53,14 @@ pub struct SyntaxTreeParams {
     pub range: Option<Range>,
 }
 
+pub enum ViewHir {}
+
+impl Request for ViewHir {
+    type Params = lsp_types::TextDocumentPositionParams;
+    type Result = String;
+    const METHOD: &'static str = "rust-analyzer/viewHir";
+}
+
 pub enum ExpandMacro {}
 
 impl Request for ExpandMacro {
diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs
index 60c12e4e2..2d06fe538 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| {
@@ -130,7 +130,7 @@ pub(crate) fn apply_document_changes(
 }
 
 /// Checks that the edits inside the completion and the additional edits do not overlap.
-/// LSP explicitly forbits the additional edits to overlap both with the main edit and themselves.
+/// LSP explicitly forbids the additional edits to overlap both with the main edit and themselves.
 pub(crate) fn all_edits_are_disjoint(
     completion: &lsp_types::CompletionItem,
     additional_edits: &[lsp_types::TextEdit],
@@ -290,7 +290,7 @@ mod tests {
             Some(vec![disjoint_edit.clone(), joint_edit.clone()]);
         assert!(
             !all_edits_are_disjoint(&completion_with_joint_edits, &[]),
-            "Completion with disjoint edits fails the validaton even with empty extra edits"
+            "Completion with disjoint edits fails the validation even with empty extra edits"
         );
 
         completion_with_joint_edits.text_edit =
@@ -298,7 +298,7 @@ mod tests {
         completion_with_joint_edits.additional_text_edits = Some(vec![joint_edit.clone()]);
         assert!(
             !all_edits_are_disjoint(&completion_with_joint_edits, &[]),
-            "Completion with disjoint edits fails the validaton even with empty extra edits"
+            "Completion with disjoint edits fails the validation even with empty extra edits"
         );
 
         completion_with_joint_edits.text_edit =
@@ -310,7 +310,7 @@ mod tests {
         completion_with_joint_edits.additional_text_edits = None;
         assert!(
             !all_edits_are_disjoint(&completion_with_joint_edits, &[]),
-            "Completion with disjoint edits fails the validaton even with empty extra edits"
+            "Completion with disjoint edits fails the validation even with empty extra edits"
         );
 
         completion_with_joint_edits.text_edit =
@@ -322,7 +322,7 @@ mod tests {
         completion_with_joint_edits.additional_text_edits = Some(vec![joint_edit]);
         assert!(
             !all_edits_are_disjoint(&completion_with_joint_edits, &[]),
-            "Completion with disjoint edits fails the validaton even with empty extra edits"
+            "Completion with disjoint edits fails the validation even with empty extra edits"
         );
     }
 
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 5d55dc96e..6d2475a59 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -11,7 +11,6 @@ use ide::{Canceled, FileId};
 use ide_db::base_db::VfsPath;
 use lsp_server::{Connection, Notification, Request, Response};
 use lsp_types::notification::Notification as _;
-use project_model::ProjectWorkspace;
 use vfs::ChangeKind;
 
 use crate::{
@@ -22,6 +21,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,
 };
 
@@ -61,8 +61,8 @@ enum Event {
 pub(crate) enum Task {
     Response(Response),
     Diagnostics(Vec<(FileId, Vec<lsp_types::Diagnostic>)>),
-    Workspaces(Vec<anyhow::Result<ProjectWorkspace>>),
     PrimeCaches(PrimeCachesProgress),
+    FetchWorkspace(ProjectWorkspaceProgress),
 }
 
 impl fmt::Debug for Event {
@@ -99,7 +99,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,
@@ -107,40 +108,43 @@ impl GlobalState {
             );
         };
 
-        let save_registration_options = lsp_types::TextDocumentSaveRegistrationOptions {
-            include_text: Some(false),
-            text_document_registration_options: lsp_types::TextDocumentRegistrationOptions {
-                document_selector: Some(vec![
-                    lsp_types::DocumentFilter {
-                        language: None,
-                        scheme: None,
-                        pattern: Some("**/*.rs".into()),
-                    },
-                    lsp_types::DocumentFilter {
-                        language: None,
-                        scheme: None,
-                        pattern: Some("**/Cargo.toml".into()),
-                    },
-                    lsp_types::DocumentFilter {
-                        language: None,
-                        scheme: None,
-                        pattern: Some("**/Cargo.lock".into()),
-                    },
-                ]),
-            },
-        };
-
-        let registration = lsp_types::Registration {
-            id: "textDocument/didSave".to_string(),
-            method: "textDocument/didSave".to_string(),
-            register_options: Some(serde_json::to_value(save_registration_options).unwrap()),
-        };
-        self.send_request::<lsp_types::request::RegisterCapability>(
-            lsp_types::RegistrationParams { registrations: vec![registration] },
-            |_, _| (),
-        );
+        if self.config.did_save_text_document_dynamic_registration() {
+            let save_registration_options = lsp_types::TextDocumentSaveRegistrationOptions {
+                include_text: Some(false),
+                text_document_registration_options: lsp_types::TextDocumentRegistrationOptions {
+                    document_selector: Some(vec![
+                        lsp_types::DocumentFilter {
+                            language: None,
+                            scheme: None,
+                            pattern: Some("**/*.rs".into()),
+                        },
+                        lsp_types::DocumentFilter {
+                            language: None,
+                            scheme: None,
+                            pattern: Some("**/Cargo.toml".into()),
+                        },
+                        lsp_types::DocumentFilter {
+                            language: None,
+                            scheme: None,
+                            pattern: Some("**/Cargo.lock".into()),
+                        },
+                    ]),
+                },
+            };
+
+            let registration = lsp_types::Registration {
+                id: "textDocument/didSave".to_string(),
+                method: "textDocument/didSave".to_string(),
+                register_options: Some(serde_json::to_value(save_registration_options).unwrap()),
+            };
+            self.send_request::<lsp_types::request::RegisterCapability>(
+                lsp_types::RegistrationParams { registrations: vec![registration] },
+                |_, _| (),
+            );
+        }
 
-        self.fetch_workspaces();
+        self.fetch_workspaces_request();
+        self.fetch_workspaces_if_needed();
 
         while let Some(event) = self.next_event(&inbox) {
             if let Event::Lsp(lsp_server::Message::Notification(not)) = &event {
@@ -201,7 +205,6 @@ impl GlobalState {
                                 self.diagnostics.set_native_diagnostics(file_id, diagnostics)
                             }
                         }
-                        Task::Workspaces(workspaces) => self.switch_workspaces(workspaces),
                         Task::PrimeCaches(progress) => match progress {
                             PrimeCachesProgress::Started => prime_caches_progress.push(progress),
                             PrimeCachesProgress::StartedOnCrate { .. } => {
@@ -215,6 +218,20 @@ 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(workspaces) => {
+                                    self.fetch_workspaces_completed();
+                                    self.switch_workspaces(workspaces);
+                                    (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 +313,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 +382,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>((), |_, _| ());
             }
         }
@@ -390,6 +407,8 @@ impl GlobalState {
             }
         }
 
+        self.fetch_workspaces_if_needed();
+
         let loop_duration = loop_start.elapsed();
         if loop_duration > Duration::from_millis(100) {
             log::warn!("overly long loop turn: {:?}", loop_duration);
@@ -427,7 +446,7 @@ impl GlobalState {
         }
 
         RequestDispatcher { req: Some(req), global_state: self }
-            .on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| Ok(s.fetch_workspaces()))?
+            .on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| Ok(s.fetch_workspaces_request()))?
             .on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))?
             .on_sync::<lsp_ext::OnEnter>(|s, p| handlers::handle_on_enter(s.snapshot(), p))?
             .on_sync::<lsp_types::request::Shutdown>(|s, ()| {
@@ -443,6 +462,7 @@ impl GlobalState {
             .on_sync::<lsp_ext::MemoryUsage>(|s, p| handlers::handle_memory_usage(s, p))?
             .on::<lsp_ext::AnalyzerStatus>(handlers::handle_analyzer_status)
             .on::<lsp_ext::SyntaxTree>(handlers::handle_syntax_tree)
+            .on::<lsp_ext::ViewHir>(handlers::handle_view_hir)
             .on::<lsp_ext::ExpandMacro>(handlers::handle_expand_macro)
             .on::<lsp_ext::ParentModule>(handlers::handle_parent_module)
             .on::<lsp_ext::Runnables>(handlers::handle_runnables)
@@ -607,7 +627,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);
                                 }
@@ -657,7 +677,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/markdown.rs b/crates/rust-analyzer/src/markdown.rs
index 968ea55f0..865eaae9b 100644
--- a/crates/rust-analyzer/src/markdown.rs
+++ b/crates/rust-analyzer/src/markdown.rs
@@ -1,8 +1,17 @@
 //! Transforms markdown
 
 const RUSTDOC_FENCE: &str = "```";
-const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUST_SPECIFIC: &[&str] =
-    &["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018"];
+const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUST_SPECIFIC: &[&str] = &[
+    "",
+    "rust",
+    "should_panic",
+    "ignore",
+    "no_run",
+    "compile_fail",
+    "edition2015",
+    "edition2018",
+    "edition2021",
+];
 
 pub(crate) fn format_docs(src: &str) -> String {
     let mut processed_lines = Vec::new();
@@ -97,7 +106,7 @@ mod tests {
 
     #[test]
     fn test_format_docs_preserves_newlines() {
-        let comment = "this\nis\nultiline";
+        let comment = "this\nis\nmultiline";
         assert_eq!(format_docs(comment), comment);
     }
 
diff --git a/crates/rust-analyzer/src/op_queue.rs b/crates/rust-analyzer/src/op_queue.rs
new file mode 100644
index 000000000..51d66f4b3
--- /dev/null
+++ b/crates/rust-analyzer/src/op_queue.rs
@@ -0,0 +1,25 @@
+//! Bookkeeping to make sure only one long-running operation is executed.
+
+#[derive(Default)]
+pub(crate) struct OpQueue {
+    op_scheduled: bool,
+    op_in_progress: bool,
+}
+
+impl OpQueue {
+    pub(crate) fn request_op(&mut self) {
+        self.op_scheduled = true;
+    }
+    pub(crate) fn should_start_op(&mut self) -> bool {
+        if !self.op_in_progress && self.op_scheduled {
+            self.op_in_progress = true;
+            self.op_scheduled = false;
+            return true;
+        }
+        false
+    }
+    pub(crate) fn op_completed(&mut self) {
+        assert!(self.op_in_progress);
+        self.op_in_progress = false;
+    }
+}
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 79e39e3a5..97e20362f 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(Vec<anyhow::Result<ProjectWorkspace>>),
+}
+
 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 {
-            self.fetch_workspaces()
-        } else if self.config.flycheck != old_config.flycheck {
+        if self.config.linked_projects() != old_config.linked_projects() {
+            self.fetch_workspaces_request()
+        } else if self.config.flycheck() != old_config.flycheck() {
             self.reload_flycheck();
         }
     }
@@ -36,8 +43,8 @@ impl GlobalState {
             Status::Loading | Status::NeedsReload => return,
             Status::Ready | Status::Invalid => (),
         }
-        if self.config.cargo_autoreload {
-            self.fetch_workspaces();
+        if self.config.cargo_autoreload() {
+            self.fetch_workspaces_request();
         } 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,
@@ -91,28 +98,59 @@ impl GlobalState {
             });
         }
     }
-    pub(crate) fn fetch_workspaces(&mut self) {
+
+    pub(crate) fn fetch_workspaces_request(&mut self) {
+        self.fetch_workspaces_queue.request_op()
+    }
+    pub(crate) fn fetch_workspaces_if_needed(&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 || {
+        if !self.fetch_workspaces_queue.should_start_op() {
+            return;
+        }
+
+        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<_>>();
+
                 log::info!("did fetch workspaces {:?}", workspaces);
-                Task::Workspaces(workspaces)
+                sender
+                    .send(Task::FetchWorkspace(ProjectWorkspaceProgress::End(workspaces)))
+                    .unwrap();
             }
         });
     }
+    pub(crate) fn fetch_workspaces_completed(&mut self) {
+        self.fetch_workspaces_queue.op_completed()
+    }
+
     pub(crate) fn switch_workspaces(&mut self, workspaces: Vec<anyhow::Result<ProjectWorkspace>>) {
         let _p = profile::span("GlobalState::switch_workspaces");
         log::info!("will switch workspaces: {:?}", workspaces);
@@ -143,36 +181,41 @@ impl GlobalState {
             return;
         }
 
-        if let FilesWatcher::Client = self.config.files.watcher {
-            let registration_options = lsp_types::DidChangeWatchedFilesRegistrationOptions {
-                watchers: workspaces
-                    .iter()
-                    .flat_map(ProjectWorkspace::to_roots)
-                    .filter(|it| it.is_member)
-                    .flat_map(|root| {
-                        root.include.into_iter().map(|it| format!("{}/**/*.rs", it.display()))
-                    })
-                    .map(|glob_pattern| lsp_types::FileSystemWatcher { glob_pattern, kind: None })
-                    .collect(),
-            };
-            let registration = lsp_types::Registration {
-                id: "workspace/didChangeWatchedFiles".to_string(),
-                method: "workspace/didChangeWatchedFiles".to_string(),
-                register_options: Some(serde_json::to_value(registration_options).unwrap()),
-            };
-            self.send_request::<lsp_types::request::RegisterCapability>(
-                lsp_types::RegistrationParams { registrations: vec![registration] },
-                |_, _| (),
-            );
+        if let FilesWatcher::Client = self.config.files().watcher {
+            if self.config.did_change_watched_files_dynamic_registration() {
+                let registration_options = lsp_types::DidChangeWatchedFilesRegistrationOptions {
+                    watchers: workspaces
+                        .iter()
+                        .flat_map(ProjectWorkspace::to_roots)
+                        .filter(|it| it.is_member)
+                        .flat_map(|root| {
+                            root.include.into_iter().map(|it| format!("{}/**/*.rs", it.display()))
+                        })
+                        .map(|glob_pattern| lsp_types::FileSystemWatcher {
+                            glob_pattern,
+                            kind: None,
+                        })
+                        .collect(),
+                };
+                let registration = lsp_types::Registration {
+                    id: "workspace/didChangeWatchedFiles".to_string(),
+                    method: "workspace/didChangeWatchedFiles".to_string(),
+                    register_options: Some(serde_json::to_value(registration_options).unwrap()),
+                };
+                self.send_request::<lsp_types::request::RegisterCapability>(
+                    lsp_types::RegistrationParams { registrations: vec![registration] },
+                    |_, _| (),
+                );
+            }
         }
 
         let mut change = Change::new();
 
         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 +228,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 +254,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 +274,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/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
index c2f6a655d..7ce9a4ab6 100644
--- a/crates/rust-analyzer/src/semantic_tokens.rs
+++ b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -38,16 +38,25 @@ macro_rules! define_semantic_token_types {
 }
 
 define_semantic_token_types![
+    (ANGLE, "angle"),
     (ATTRIBUTE, "attribute"),
     (BOOLEAN, "boolean"),
+    (BRACE, "brace"),
+    (BRACKET, "bracket"),
     (BUILTIN_TYPE, "builtinType"),
+    (COMMA, "comma"),
+    (COLON, "colon"),
+    (DOT, "dot"),
     (ESCAPE_SEQUENCE, "escapeSequence"),
     (FORMAT_SPECIFIER, "formatSpecifier"),
     (GENERIC, "generic"),
+    (CONST_PARAMETER, "constParameter"),
     (LIFETIME, "lifetime"),
     (LABEL, "label"),
+    (PARENTHESIS, "parenthesis"),
     (PUNCTUATION, "punctuation"),
     (SELF_KEYWORD, "selfKeyword"),
+    (SEMICOLON, "semicolon"),
     (TYPE_ALIAS, "typeAlias"),
     (UNION, "union"),
     (UNRESOLVED_REFERENCE, "unresolvedReference"),
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 1a38e79f0..a7ff8975a 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -6,10 +6,10 @@ use std::{
 
 use ide::{
     Assist, AssistKind, CallInfo, CompletionItem, CompletionItemKind, Documentation, FileId,
-    FileRange, FileSystemEdit, Fold, FoldKind, Highlight, HighlightModifier, HighlightTag,
-    HighlightedRange, Indel, InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup,
-    NavigationTarget, ReferenceAccess, Runnable, Severity, SourceChange, SourceFileEdit,
-    SymbolKind, TextEdit, TextRange, TextSize,
+    FileRange, FileSystemEdit, Fold, FoldKind, Highlight, HlMod, HlPunct, HlRange, HlTag, Indel,
+    InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup, NavigationTarget, ReferenceAccess,
+    RenameError, Runnable, Severity, SourceChange, SourceFileEdit, SymbolKind, TextEdit, TextRange,
+    TextSize,
 };
 use itertools::Itertools;
 
@@ -42,6 +42,7 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
         SymbolKind::Field => lsp_types::SymbolKind::Field,
         SymbolKind::Static => lsp_types::SymbolKind::Constant,
         SymbolKind::Const => lsp_types::SymbolKind::Constant,
+        SymbolKind::ConstParam => lsp_types::SymbolKind::Constant,
         SymbolKind::Impl => lsp_types::SymbolKind::Object,
         SymbolKind::Local
         | SymbolKind::SelfParam
@@ -336,12 +337,15 @@ static TOKEN_RESULT_COUNTER: AtomicU32 = AtomicU32::new(1);
 pub(crate) fn semantic_tokens(
     text: &str,
     line_index: &LineIndex,
-    highlights: Vec<HighlightedRange>,
+    highlights: Vec<HlRange>,
 ) -> lsp_types::SemanticTokens {
     let id = TOKEN_RESULT_COUNTER.fetch_add(1, Ordering::SeqCst).to_string();
     let mut builder = semantic_tokens::SemanticTokensBuilder::new(id);
 
     for highlight_range in highlights {
+        if highlight_range.highlight.is_empty() {
+            continue;
+        }
         let (type_, mods) = semantic_token_type_and_modifiers(highlight_range.highlight);
         let token_index = semantic_tokens::type_index(type_);
         let modifier_bitset = mods.0;
@@ -373,18 +377,19 @@ fn semantic_token_type_and_modifiers(
 ) -> (lsp_types::SemanticTokenType, semantic_tokens::ModifierSet) {
     let mut mods = semantic_tokens::ModifierSet::default();
     let type_ = match highlight.tag {
-        HighlightTag::Symbol(symbol) => match symbol {
+        HlTag::Symbol(symbol) => match symbol {
             SymbolKind::Module => lsp_types::SemanticTokenType::NAMESPACE,
             SymbolKind::Impl => lsp_types::SemanticTokenType::TYPE,
             SymbolKind::Field => lsp_types::SemanticTokenType::PROPERTY,
             SymbolKind::TypeParam => lsp_types::SemanticTokenType::TYPE_PARAMETER,
+            SymbolKind::ConstParam => semantic_tokens::CONST_PARAMETER,
             SymbolKind::LifetimeParam => semantic_tokens::LIFETIME,
             SymbolKind::Label => semantic_tokens::LABEL,
             SymbolKind::ValueParam => lsp_types::SemanticTokenType::PARAMETER,
             SymbolKind::SelfParam => semantic_tokens::SELF_KEYWORD,
             SymbolKind::Local => lsp_types::SemanticTokenType::VARIABLE,
             SymbolKind::Function => {
-                if highlight.modifiers.contains(HighlightModifier::Associated) {
+                if highlight.mods.contains(HlMod::Associated) {
                     lsp_types::SemanticTokenType::METHOD
                 } else {
                     lsp_types::SemanticTokenType::FUNCTION
@@ -407,38 +412,44 @@ fn semantic_token_type_and_modifiers(
             SymbolKind::Trait => lsp_types::SemanticTokenType::INTERFACE,
             SymbolKind::Macro => lsp_types::SemanticTokenType::MACRO,
         },
-        HighlightTag::BuiltinType => semantic_tokens::BUILTIN_TYPE,
-        HighlightTag::Dummy => semantic_tokens::GENERIC,
-        HighlightTag::ByteLiteral | HighlightTag::NumericLiteral => {
-            lsp_types::SemanticTokenType::NUMBER
-        }
-        HighlightTag::BoolLiteral => semantic_tokens::BOOLEAN,
-        HighlightTag::CharLiteral | HighlightTag::StringLiteral => {
-            lsp_types::SemanticTokenType::STRING
-        }
-        HighlightTag::Comment => lsp_types::SemanticTokenType::COMMENT,
-        HighlightTag::Attribute => semantic_tokens::ATTRIBUTE,
-        HighlightTag::Keyword => lsp_types::SemanticTokenType::KEYWORD,
-        HighlightTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE,
-        HighlightTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER,
-        HighlightTag::Operator => lsp_types::SemanticTokenType::OPERATOR,
-        HighlightTag::EscapeSequence => semantic_tokens::ESCAPE_SEQUENCE,
-        HighlightTag::Punctuation => semantic_tokens::PUNCTUATION,
+        HlTag::BuiltinType => semantic_tokens::BUILTIN_TYPE,
+        HlTag::None => semantic_tokens::GENERIC,
+        HlTag::ByteLiteral | HlTag::NumericLiteral => lsp_types::SemanticTokenType::NUMBER,
+        HlTag::BoolLiteral => semantic_tokens::BOOLEAN,
+        HlTag::CharLiteral | HlTag::StringLiteral => lsp_types::SemanticTokenType::STRING,
+        HlTag::Comment => lsp_types::SemanticTokenType::COMMENT,
+        HlTag::Attribute => semantic_tokens::ATTRIBUTE,
+        HlTag::Keyword => lsp_types::SemanticTokenType::KEYWORD,
+        HlTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE,
+        HlTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER,
+        HlTag::Operator => lsp_types::SemanticTokenType::OPERATOR,
+        HlTag::EscapeSequence => semantic_tokens::ESCAPE_SEQUENCE,
+        HlTag::Punctuation(punct) => match punct {
+            HlPunct::Bracket => semantic_tokens::BRACKET,
+            HlPunct::Brace => semantic_tokens::BRACE,
+            HlPunct::Parenthesis => semantic_tokens::PARENTHESIS,
+            HlPunct::Angle => semantic_tokens::ANGLE,
+            HlPunct::Comma => semantic_tokens::COMMA,
+            HlPunct::Dot => semantic_tokens::DOT,
+            HlPunct::Colon => semantic_tokens::COLON,
+            HlPunct::Semi => semantic_tokens::SEMICOLON,
+            HlPunct::Other => semantic_tokens::PUNCTUATION,
+        },
     };
 
-    for modifier in highlight.modifiers.iter() {
+    for modifier in highlight.mods.iter() {
         let modifier = match modifier {
-            HighlightModifier::Attribute => semantic_tokens::ATTRIBUTE_MODIFIER,
-            HighlightModifier::Definition => lsp_types::SemanticTokenModifier::DECLARATION,
-            HighlightModifier::Documentation => lsp_types::SemanticTokenModifier::DOCUMENTATION,
-            HighlightModifier::Injected => semantic_tokens::INJECTED,
-            HighlightModifier::ControlFlow => semantic_tokens::CONTROL_FLOW,
-            HighlightModifier::Mutable => semantic_tokens::MUTABLE,
-            HighlightModifier::Consuming => semantic_tokens::CONSUMING,
-            HighlightModifier::Unsafe => semantic_tokens::UNSAFE,
-            HighlightModifier::Callable => semantic_tokens::CALLABLE,
-            HighlightModifier::Static => lsp_types::SemanticTokenModifier::STATIC,
-            HighlightModifier::Associated => continue,
+            HlMod::Attribute => semantic_tokens::ATTRIBUTE_MODIFIER,
+            HlMod::Definition => lsp_types::SemanticTokenModifier::DECLARATION,
+            HlMod::Documentation => lsp_types::SemanticTokenModifier::DOCUMENTATION,
+            HlMod::Injected => semantic_tokens::INJECTED,
+            HlMod::ControlFlow => semantic_tokens::CONTROL_FLOW,
+            HlMod::Mutable => semantic_tokens::MUTABLE,
+            HlMod::Consuming => semantic_tokens::CONSUMING,
+            HlMod::Unsafe => semantic_tokens::UNSAFE,
+            HlMod::Callable => semantic_tokens::CALLABLE,
+            HlMod::Static => lsp_types::SemanticTokenModifier::STATIC,
+            HlMod::Associated => continue,
         };
         mods |= modifier;
     }
@@ -603,7 +614,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))
@@ -783,7 +794,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,
@@ -803,7 +814,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,
@@ -816,7 +827,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());
@@ -831,9 +842,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,
         },
@@ -845,9 +856,14 @@ pub(crate) fn markup_content(markup: Markup) -> lsp_types::MarkupContent {
     lsp_types::MarkupContent { kind: lsp_types::MarkupKind::Markdown, value }
 }
 
+pub(crate) fn rename_error(err: RenameError) -> crate::LspError {
+    crate::LspError { code: lsp_server::ErrorCode::InvalidParams as i32, message: err.to_string() }
+}
+
 #[cfg(test)]
 mod tests {
     use ide::Analysis;
+    use ide_db::helpers::SnippetCap;
 
     use super::*;
 
@@ -858,7 +874,7 @@ mod tests {
         fn foo(arg: &Foo) {}
         fn main() {
             let arg = Foo;
-            foo(<|>)
+            foo($0)
         }"#;
 
         let (offset, text) = test_utils::extract_offset(fixture);
@@ -866,7 +882,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 e51eb2626..80bde29b9 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/main.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/main.rs
@@ -13,13 +13,17 @@ 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},
+    request::{
+        CodeActionRequest, Completion, Formatting, GotoTypeDefinition, HoverRequest,
+        WillRenameFiles,
+    },
     CodeActionContext, CodeActionParams, CompletionParams, DidOpenTextDocumentParams,
-    DocumentFormattingParams, FormattingOptions, GotoDefinitionParams, HoverParams,
-    PartialResultParams, Position, Range, TextDocumentItem, TextDocumentPositionParams,
-    WorkDoneProgressParams,
+    DocumentFormattingParams, FileRename, FormattingOptions, GotoDefinitionParams, HoverParams,
+    PartialResultParams, Position, Range, RenameFilesParams, TextDocumentItem,
+    TextDocumentPositionParams, WorkDoneProgressParams,
 };
 use rust_analyzer::lsp_ext::{OnEnter, Runnables, RunnablesParams};
 use serde_json::json;
@@ -190,15 +194,10 @@ pub use std::collections::HashMap;
         },
         json!([
             {
-                "newText": r#"mod bar;
-
-fn main() {}
-
-pub use std::collections::HashMap;
-"#,
+                "newText": "",
                 "range": {
-                    "end": { "character": 0, "line": 6 },
-                    "start": { "character": 0, "line": 0 }
+                    "end": { "character": 0, "line": 3 },
+                    "start": { "character": 11, "line": 2 }
                 }
             }
         ]),
@@ -248,17 +247,17 @@ pub use std::collections::HashMap;
         },
         json!([
             {
-                "newText": r#"mod bar;
-
-async fn test() {}
-
-fn main() {}
-
-pub use std::collections::HashMap;
-"#,
+                "newText": "",
+                "range": {
+                    "end": { "character": 0, "line": 3 },
+                    "start": { "character": 17, "line": 2 }
+                }
+            },
+            {
+                "newText": "",
                 "range": {
-                    "end": { "character": 0, "line": 9 },
-                    "start": { "character": 0, "line": 0 }
+                    "end": { "character": 0, "line": 6 },
+                    "start": { "character": 11, "line": 5 }
                 }
             }
         ]),
@@ -574,9 +573,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();
 
@@ -717,12 +716,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()
@@ -735,6 +735,149 @@ 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);
+}
+
+#[test]
+fn test_will_rename_files_same_level() {
+    if skip_slow_tests() {
+        return;
+    }
+
+    let tmp_dir = TestDir::new();
+    let tmp_dir_path = tmp_dir.path().to_owned();
+    let tmp_dir_str = tmp_dir_path.to_str().unwrap();
+    let base_path = PathBuf::from(format!("file://{}", tmp_dir_str));
+
+    let code = r#"
+//- /Cargo.toml
+[package]
+name = "foo"
+version = "0.0.0"
+
+//- /src/lib.rs
+mod old_file;
+mod from_mod;
+mod to_mod;
+mod old_folder;
+fn main() {}
+
+//- /src/old_file.rs
+
+//- /src/old_folder/mod.rs
+
+//- /src/from_mod/mod.rs
+
+//- /src/to_mod/foo.rs
+
+"#;
+    let server =
+        Project::with_fixture(&code).tmp_dir(tmp_dir).server().wait_until_workspace_is_loaded();
+
+    //rename same level file
+    server.request::<WillRenameFiles>(
+        RenameFilesParams {
+            files: vec![FileRename {
+                old_uri: base_path.join("src/old_file.rs").to_str().unwrap().to_string(),
+                new_uri: base_path.join("src/new_file.rs").to_str().unwrap().to_string(),
+            }],
+        },
+        json!({
+          "documentChanges": [
+            {
+              "textDocument": {
+                "uri": format!("file://{}", tmp_dir_path.join("src").join("lib.rs").to_str().unwrap().to_string().replace("C:\\", "/c:/").replace("\\", "/")),
+                "version": null
+              },
+              "edits": [
+                {
+                  "range": {
+                    "start": {
+                      "line": 0,
+                      "character": 4
+                    },
+                    "end": {
+                      "line": 0,
+                      "character": 12
+                    }
+                  },
+                  "newText": "new_file"
+                }
+              ]
+            }
+          ]
+        }),
+    );
+
+    //rename file from mod.rs to foo.rs
+    server.request::<WillRenameFiles>(
+        RenameFilesParams {
+            files: vec![FileRename {
+                old_uri: base_path.join("src/from_mod/mod.rs").to_str().unwrap().to_string(),
+                new_uri: base_path.join("src/from_mod/foo.rs").to_str().unwrap().to_string(),
+            }],
+        },
+        json!({
+          "documentChanges": []
+        }),
+    );
+
+    //rename file from foo.rs to mod.rs
+    server.request::<WillRenameFiles>(
+        RenameFilesParams {
+            files: vec![FileRename {
+                old_uri: base_path.join("src/to_mod/foo.rs").to_str().unwrap().to_string(),
+                new_uri: base_path.join("src/to_mod/mod.rs").to_str().unwrap().to_string(),
+            }],
+        },
+        json!({
+          "documentChanges": []
+        }),
+    );
+
+    //rename same level file
+    server.request::<WillRenameFiles>(
+        RenameFilesParams {
+            files: vec![FileRename {
+                old_uri: base_path.join("src/old_folder").to_str().unwrap().to_string(),
+                new_uri: base_path.join("src/new_folder").to_str().unwrap().to_string(),
+            }],
+        },
+        json!({
+          "documentChanges": [
+            {
+              "textDocument": {
+                "uri": format!("file://{}", tmp_dir_path.join("src").join("lib.rs").to_str().unwrap().to_string().replace("C:\\", "/c:/").replace("\\", "/")),
+                "version": null
+              },
+              "edits": [
+                {
+                  "range": {
+                    "start": {
+                      "line": 3,
+                      "character": 4
+                    },
+                    "end": {
+                      "line": 3,
+                      "character": 14
+                    }
+                  },
+                  "newText": "new_folder"
+                }
+              ]
+            }
+          ]
+        }),
+    );
 }
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 98ed25fb6..cc8136d22 100644
--- a/crates/ssr/Cargo.toml
+++ b/crates/ssr/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 
 [dependencies]
 rustc-hash = "1.1.0"
-itertools = "0.9.0"
+itertools = "0.10.0"
 
 text_edit = { path = "../text_edit", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
@@ -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/matching.rs b/crates/ssr/src/matching.rs
index 99b187311..6cf831431 100644
--- a/crates/ssr/src/matching.rs
+++ b/crates/ssr/src/matching.rs
@@ -473,7 +473,9 @@ impl<'db, 'sema> Matcher<'db, 'sema> {
                         }
                         SyntaxElement::Node(n) => {
                             if let Some(first_token) = n.first_token() {
-                                if Some(first_token.to_string()) == next_pattern_token {
+                                if Some(first_token.text().as_str())
+                                    == next_pattern_token.as_deref()
+                                {
                                     if let Some(SyntaxElement::Node(p)) = pattern.next() {
                                         // We have a subtree that starts with the next token in our pattern.
                                         self.attempt_match_token_tree(phase, &p, &n)?;
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/search.rs b/crates/ssr/src/search.rs
index 44b5db029..836eb94b2 100644
--- a/crates/ssr/src/search.rs
+++ b/crates/ssr/src/search.rs
@@ -5,10 +5,10 @@ use crate::{
     resolving::{ResolvedPath, ResolvedPattern, ResolvedRule},
     Match, MatchFinder,
 };
-use ide_db::base_db::{FileId, FileRange};
 use ide_db::{
+    base_db::{FileId, FileRange},
     defs::Definition,
-    search::{Reference, SearchScope},
+    search::{SearchScope, UsageSearchResult},
 };
 use rustc_hash::FxHashSet;
 use syntax::{ast, AstNode, SyntaxKind, SyntaxNode};
@@ -20,7 +20,7 @@ use test_utils::mark;
 /// them more than once.
 #[derive(Default)]
 pub(crate) struct UsageCache {
-    usages: Vec<(Definition, Vec<Reference>)>,
+    usages: Vec<(Definition, UsageSearchResult)>,
 }
 
 impl<'db> MatchFinder<'db> {
@@ -58,8 +58,8 @@ impl<'db> MatchFinder<'db> {
     ) {
         if let Some(resolved_path) = pick_path_for_usages(pattern) {
             let definition: Definition = resolved_path.resolution.clone().into();
-            for reference in self.find_usages(usage_cache, definition) {
-                if let Some(node_to_match) = self.find_node_to_match(resolved_path, reference) {
+            for file_range in self.find_usages(usage_cache, definition).file_ranges() {
+                if let Some(node_to_match) = self.find_node_to_match(resolved_path, file_range) {
                     if !is_search_permitted_ancestors(&node_to_match) {
                         mark::hit!(use_declaration_with_braces);
                         continue;
@@ -73,11 +73,11 @@ impl<'db> MatchFinder<'db> {
     fn find_node_to_match(
         &self,
         resolved_path: &ResolvedPath,
-        reference: &Reference,
+        file_range: FileRange,
     ) -> Option<SyntaxNode> {
-        let file = self.sema.parse(reference.file_range.file_id);
+        let file = self.sema.parse(file_range.file_id);
         let depth = resolved_path.depth as usize;
-        let offset = reference.file_range.range.start();
+        let offset = file_range.range.start();
         if let Some(path) =
             self.sema.find_node_at_offset_with_descend::<ast::Path>(file.syntax(), offset)
         {
@@ -108,7 +108,7 @@ impl<'db> MatchFinder<'db> {
         &self,
         usage_cache: &'a mut UsageCache,
         definition: Definition,
-    ) -> &'a [Reference] {
+    ) -> &'a UsageSearchResult {
         // Logically if a lookup succeeds we should just return it. Unfortunately returning it would
         // extend the lifetime of the borrow, then we wouldn't be able to do the insertion on a
         // cache miss. This is a limitation of NLL and is fixed with Polonius. For now we do two
@@ -250,7 +250,7 @@ fn is_search_permitted(node: &SyntaxNode) -> bool {
 }
 
 impl UsageCache {
-    fn find(&mut self, definition: &Definition) -> Option<&[Reference]> {
+    fn find(&mut self, definition: &Definition) -> Option<&UsageSearchResult> {
         // We expect a very small number of cache entries (generally 1), so a linear scan should be
         // fast enough and avoids the need to implement Hash for Definition.
         for (d, refs) in &self.usages {
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..13aab1451 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::{cmp::Ordering, ops, process, time::Instant};
 
 mod macros;
 pub mod panic_context;
@@ -117,7 +117,12 @@ impl<'a> Iterator for LinesWithEnds<'a> {
     }
 }
 
-// https://github.com/rust-lang/rust/issues/73831
+/// Returns `idx` such that:
+///
+///     ∀ x in slice[..idx]:  pred(x)
+///  && ∀ x in slice[idx..]: !pred(x)
+///
+/// https://github.com/rust-lang/rust/issues/73831
 pub fn partition_point<T, P>(slice: &[T], mut pred: P) -> usize
 where
     P: FnMut(&T) -> bool,
@@ -147,6 +152,36 @@ where
     left
 }
 
+pub fn equal_range_by<T, F>(slice: &[T], mut key: F) -> ops::Range<usize>
+where
+    F: FnMut(&T) -> Ordering,
+{
+    let start = partition_point(slice, |it| key(it) == Ordering::Less);
+    let len = partition_point(&slice[start..], |it| key(it) == Ordering::Equal);
+    start..start + len
+}
+
+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 21015591c..cfeaed9e6 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-itertools = "0.9.0"
+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..384d031e7 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(
@@ -88,8 +88,8 @@ pub fn least_common_ancestor(u: &SyntaxNode, v: &SyntaxNode) -> Option<SyntaxNod
     let keep = u_depth.min(v_depth);
 
     let u_candidates = u.ancestors().skip(u_depth - keep);
-    let v_canidates = v.ancestors().skip(v_depth - keep);
-    let (res, _) = u_candidates.zip(v_canidates).find(|(x, y)| x == y)?;
+    let v_candidates = v.ancestors().skip(v_depth - keep);
+    let (res, _) = u_candidates.zip(v_candidates).find(|(x, y)| x == y)?;
     Some(res)
 }
 
diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs
index 77233ab31..824ebf41c 100644
--- a/crates/syntax/src/ast/edit.rs
+++ b/crates/syntax/src/ast/edit.rs
@@ -220,7 +220,7 @@ impl ast::RecordExprFieldList {
                     InsertPosition::After($anchor.syntax().clone().into())
                 }
             };
-        };
+        }
 
         let position = match position {
             InsertPosition::First => after_l_curly!(),
@@ -533,7 +533,7 @@ impl ast::GenericParamList {
                     InsertPosition::After($anchor.syntax().clone().into())
                 }
             };
-        };
+        }
 
         let position = match self.generic_params().last() {
             Some(it) => after_field!(it),
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/ast/make.rs b/crates/syntax/src/ast/make.rs
index cafa4c198..1ed8a96e5 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -241,7 +241,7 @@ pub fn wildcard_pat() -> ast::WildcardPat {
     }
 }
 
-/// Creates a tuple of patterns from an interator of patterns.
+/// Creates a tuple of patterns from an iterator of patterns.
 ///
 /// Invariant: `pats` must be length > 1
 ///
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 2aa472fb4..27381ba80 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -133,7 +133,7 @@ impl ast::Attr {
             first_token.and_then(|token| token.next_token()).as_ref().map(SyntaxToken::kind);
 
         match (first_token_kind, second_token_kind) {
-            (Some(SyntaxKind::POUND), Some(T![!])) => AttrKind::Inner,
+            (Some(T![#]), Some(T![!])) => AttrKind::Inner,
             _ => AttrKind::Outer,
         }
     }
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/lexer.rs b/crates/syntax/src/parsing/lexer.rs
index 0cbba73c5..7c8d0a4c4 100644
--- a/crates/syntax/src/parsing/lexer.rs
+++ b/crates/syntax/src/parsing/lexer.rs
@@ -24,7 +24,7 @@ pub struct Token {
 /// Beware that it checks for shebang first and its length contributes to resulting
 /// tokens offsets.
 pub fn tokenize(text: &str) -> (Vec<Token>, Vec<SyntaxError>) {
-    // non-empty string is a precondtion of `rustc_lexer::strip_shebang()`.
+    // non-empty string is a precondition of `rustc_lexer::strip_shebang()`.
     if text.is_empty() {
         return Default::default();
     }
@@ -76,7 +76,7 @@ pub fn lex_single_syntax_kind(text: &str) -> Option<(SyntaxKind, Option<SyntaxEr
 }
 
 /// The same as `lex_single_syntax_kind()` but returns only `SyntaxKind` and
-/// returns `None` if any tokenization error occured.
+/// returns `None` if any tokenization error occurred.
 ///
 /// Beware that unescape errors are not checked at tokenization time.
 pub fn lex_single_valid_syntax_kind(text: &str) -> Option<SyntaxKind> {
@@ -96,7 +96,7 @@ pub fn lex_single_valid_syntax_kind(text: &str) -> Option<SyntaxKind> {
 ///
 /// Beware that unescape errors are not checked at tokenization time.
 fn lex_first_token(text: &str) -> Option<(Token, Option<SyntaxError>)> {
-    // non-empty string is a precondtion of `rustc_lexer::first_token()`.
+    // non-empty string is a precondition of `rustc_lexer::first_token()`.
     if text.is_empty() {
         return None;
     }
@@ -117,7 +117,7 @@ fn rustc_token_kind_to_syntax_kind(
     token_text: &str,
 ) -> (SyntaxKind, Option<&'static str>) {
     // A note on an intended tradeoff:
-    // We drop some useful infromation here (see patterns with double dots `..`)
+    // We drop some useful information here (see patterns with double dots `..`)
     // Storing that info in `SyntaxKind` is not possible due to its layout requirements of
     // being `u16` that come from `rowan::SyntaxKind`.
 
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/src/validation.rs b/crates/syntax/src/validation.rs
index 2ddaeb176..bfa2dc4ba 100644
--- a/crates/syntax/src/validation.rs
+++ b/crates/syntax/src/validation.rs
@@ -173,7 +173,7 @@ pub(crate) fn validate_block_structure(root: &SyntaxNode) {
                     assert_eq!(
                         node.parent(),
                         pair.parent(),
-                        "\nunpaired curleys:\n{}\n{:#?}\n",
+                        "\nunpaired curlys:\n{}\n{:#?}\n",
                         root.text(),
                         root,
                     );
@@ -344,9 +344,9 @@ fn validate_trait_object_ty(ty: ast::DynTraitType) -> Option<SyntaxError> {
 
     if tbl.bounds().count() > 1 {
         let dyn_token = ty.dyn_token()?;
-        let potential_parentheses =
+        let potential_parenthesis =
             algo::skip_trivia_token(dyn_token.prev_token()?, Direction::Prev)?;
-        let kind = potential_parentheses.kind();
+        let kind = potential_parenthesis.kind();
         if !matches!(kind, T!['('] | T![<] | T![=]) {
             return Some(SyntaxError::new("ambiguous `+` in a type", ty.syntax().text_range()));
         }
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/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index b1fb75ed1..f40500e38 100644
--- a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -1,4 +1,4 @@
-[email protected]9
+[email protected]8
   [email protected]
     [email protected] "use"
     [email protected] " "
@@ -75,62 +75,62 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] " "
-  [email protected]6
+  [email protected]5
     [email protected] "// Rust 2015"
     [email protected] "\n"
     [email protected] "use"
     [email protected] " "
-    [email protected]5
+    [email protected]4
       [email protected] "::"
-      [email protected]5
+      [email protected]4
         [email protected] "{"
-        [email protected]4
-          [email protected]4
-            [email protected]8
+        [email protected]3
+          [email protected]3
+            [email protected]7
               [email protected]
                 [email protected]
                   [email protected]
                     [email protected] "some"
               [email protected] "::"
-              [email protected]8
-                [email protected]8
-                  [email protected]8 "arbritrary"
-            COLON2@158..160 "::"
-            PATH_SEGMENT@160..164
-              NAME_REF@160..164
-                IDENT@160..164 "path"
-        R_CURLY@164..165 "}"
-    SEMICOLON@165..166 ";"
-  WHITESPACE@166..167 " "
-  USE@167..205
-    COMMENT@167..179 "// Rust 2015"
-    WHITESPACE@179..180 "\n"
-    USE_KW@180..183 "use"
-    WHITESPACE@183..184 " "
-    USE_TREE@184..204
-      COLON2@184..186 "::"
-      USE_TREE_LIST@186..204
-        L_CURLY@186..187 "{"
-        USE_TREE@187..203
-          USE_TREE_LIST@187..203
-            L_CURLY@187..188 "{"
-            USE_TREE@188..202
-              USE_TREE_LIST@188..202
-                L_CURLY@188..189 "{"
-                USE_TREE@189..201
-                  PATH@189..201
-                    PATH@189..193
-                      PATH_SEGMENT@189..193
-                        NAME_REF@189..193
-                          IDENT@189..193 "root"
-                    COLON2@193..195 "::"
-                    PATH_SEGMENT@195..201
-                      NAME_REF@195..201
-                        IDENT@195..201 "export"
-                R_CURLY@201..202 "}"
-            R_CURLY@202..203 "}"
-        R_CURLY@203..204 "}"
-    SEMICOLON@204..205 ";"
-  WHITESPACE@205..206 " "
-  COMMENT@206..248 "// Nonsensical but pe ..."
-  WHITESPACE@248..249 "\n"
+              [email protected]7
+                [email protected]7
+                  [email protected]7 "arbitrary"
+            COLON2@157..159 "::"
+            PATH_SEGMENT@159..163
+              NAME_REF@159..163
+                IDENT@159..163 "path"
+        R_CURLY@163..164 "}"
+    SEMICOLON@164..165 ";"
+  WHITESPACE@165..166 " "
+  USE@166..204
+    COMMENT@166..178 "// Rust 2015"
+    WHITESPACE@178..179 "\n"
+    USE_KW@179..182 "use"
+    WHITESPACE@182..183 " "
+    USE_TREE@183..203
+      COLON2@183..185 "::"
+      USE_TREE_LIST@185..203
+        L_CURLY@185..186 "{"
+        USE_TREE@186..202
+          USE_TREE_LIST@186..202
+            L_CURLY@186..187 "{"
+            USE_TREE@187..201
+              USE_TREE_LIST@187..201
+                L_CURLY@187..188 "{"
+                USE_TREE@188..200
+                  PATH@188..200
+                    PATH@188..192
+                      PATH_SEGMENT@188..192
+                        NAME_REF@188..192
+                          IDENT@188..192 "root"
+                    COLON2@192..194 "::"
+                    PATH_SEGMENT@194..200
+                      NAME_REF@194..200
+                        IDENT@194..200 "export"
+                R_CURLY@200..201 "}"
+            R_CURLY@201..202 "}"
+        R_CURLY@202..203 "}"
+    SEMICOLON@203..204 ";"
+  WHITESPACE@204..205 " "
+  COMMENT@205..247 "// Nonsensical but pe ..."
+  WHITESPACE@247..248 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
index 381cba1e2..02af4b446 100644
--- a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
@@ -1,4 +1,4 @@
 use {crate::path::from::root, or::path::from::crate_name}; // Rust 2018 (with a crate named `or`)
 use {path::from::root}; // Rust 2015
-use ::{some::arbritrary::path}; // Rust 2015
+use ::{some::arbitrary::path}; // Rust 2015
 use ::{{{root::export}}}; // Nonsensical but perfectly legal nesting
diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 51e881a8e..68c0f1c66 100644
--- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -1,5 +1,5 @@
-SOURCE_FILE@0..46
-  TYPE_ALIAS@0..45
+SOURCE_FILE@0..59
+  [email protected]8
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -7,12 +7,12 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    PATH_TYPE@9..44
-      PATH@9..44
-        PATH_SEGMENT@9..44
+    PATH_TYPE@9..57
+      PATH@9..57
+        PATH_SEGMENT@9..57
           [email protected]
             [email protected] "B"
-          GENERIC_ARG_LIST@10..44
+          GENERIC_ARG_LIST@10..57
             [email protected] "<"
             [email protected]
               [email protected]
@@ -51,6 +51,16 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "u64"
-            [email protected] ">"
-    [email protected] ";"
-  [email protected] "\n"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "true"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "false"
+            [email protected] ">"
+    [email protected] ";"
+  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
index 0d07d7651..6a8721a73 100644
--- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
@@ -1 +1 @@
-type A = B<'static, i32, 1, { 2 }, Item=u64>;
+type A = B<'static, i32, 1, { 2 }, Item=u64, true, false>;
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..e19d2ad61 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 occurrence 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};