58 files changed, 1922 insertions, 1020 deletions
diff --git a/crates/assists/src/assist_config.rs b/crates/assists/src/assist_config.rs
index c458d9054..4fe8ea761 100644
--- a/crates/assists/src/assist_config.rs
+++ b/crates/assists/src/assist_config.rs
@@ -4,8 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! assists if we are allowed to.
-use hir::PrefixKind;
+use ide_db::helpers::{insert_use::MergeBehavior, SnippetCap};
-use ide_db::helpers::insert_use::MergeBehavior;
 use crate::AssistKind;
@@ -16,35 +15,8 @@ pub struct AssistConfig {
    pub insert_use: InsertUseConfig,
 }
-impl AssistConfig {
-    pub fn allow_snippets(&mut self, yes: bool) {
-        self.snippet_cap = if yes { Some(SnippetCap { _private: () }) } else { None }
-    }
-}
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct SnippetCap {
-    _private: (),
-}
-impl Default for AssistConfig {
-    fn default() -> Self {
-        AssistConfig {
-            snippet_cap: Some(SnippetCap { _private: () }),
-            allowed: None,
-            insert_use: InsertUseConfig::default(),
-        }
-    }
-}
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct InsertUseConfig {
    pub merge: Option<MergeBehavior>,
-    pub prefix_kind: PrefixKind,
+    pub prefix_kind: hir::PrefixKind,
-}
-impl Default for InsertUseConfig {
-    fn default() -> Self {
-        InsertUseConfig { merge: Some(MergeBehavior::Full), prefix_kind: PrefixKind::Plain }
-    }
 }
diff --git a/crates/assists/src/assist_context.rs b/crates/assists/src/assist_context.rs
index 4f59d39a9..91cc63427 100644
--- a/crates/assists/src/assist_context.rs
+++ b/crates/assists/src/assist_context.rs
@@ -4,7 +4,10 @@ use std::mem;
 use algo::find_covering_element;
 use hir::Semantics;
-use ide_db::base_db::{AnchoredPathBuf, FileId, FileRange};
+use ide_db::{
+    base_db::{AnchoredPathBuf, FileId, FileRange},
+    helpers::SnippetCap,
+};
 use ide_db::{
    label::Label,
    source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
@@ -17,10 +20,7 @@ use syntax::{
 };
 use text_edit::{TextEdit, TextEditBuilder};
-use crate::{
+use crate::{assist_config::AssistConfig, Assist, AssistId, AssistKind, GroupLabel};
-    assist_config::{AssistConfig, SnippetCap},
-    Assist, AssistId, AssistKind, GroupLabel,
-};
 /// `AssistContext` allows to apply an assist or check if it could be applied.
 ///
diff --git a/crates/assists/src/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(
+        check_assist(add_explicit_type, "fn f() { let a$0: _ = 1; }", "fn f() { let a: i32 = 1; }");
-            add_explicit_type,
-            "fn f() { let a<|>: _ = 1; }",
-            "fn f() { let a: i32 = 1; }",
-        );
    }
    #[test]
@@ -109,7 +105,7 @@ mod tests {
            }
            fn f() {
-                let a<|>: Option<_> = Option::Some(1);
+                let a$0: Option<_> = Option::Some(1);
            }"#,
            r#"
            enum Option<T> {
@@ -127,7 +123,7 @@ mod tests {
    fn add_explicit_type_works_for_macro_call() {
        check_assist(
            add_explicit_type,
-            r"macro_rules! v { () => {0u64} } fn f() { let a<|> = v!(); }",
+            r"macro_rules! v { () => {0u64} } fn f() { let a$0 = v!(); }",
            r"macro_rules! v { () => {0u64} } fn f() { let a: u64 = v!(); }",
        );
    }
@@ -136,31 +132,31 @@ mod tests {
    fn add_explicit_type_works_for_macro_call_recursive() {
        check_assist(
            add_explicit_type,
-            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a<|> = v!(); }"#,
+            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a$0 = v!(); }"#,
            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a: u64 = v!(); }"#,
        );
    }
    #[test]
    fn add_explicit_type_not_applicable_if_ty_not_inferred() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|> = None; }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0 = None; }");
    }
    #[test]
    fn add_explicit_type_not_applicable_if_ty_already_specified() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: i32 = 1; }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0: i32 = 1; }");
    }
    #[test]
    fn add_explicit_type_not_applicable_if_specified_ty_is_tuple() {
-        check_assist_not_applicable(add_explicit_type, "fn f() { let a<|>: (i32, i32) = (3, 4); }");
+        check_assist_not_applicable(add_explicit_type, "fn f() { let a$0: (i32, i32) = (3, 4); }");
    }
    #[test]
    fn add_explicit_type_not_applicable_if_cursor_after_equals() {
        check_assist_not_applicable(
            add_explicit_type,
-            "fn f() {let a =<|> match 1 {2 => 3, 3 => 5};}",
+            "fn f() {let a =$0 match 1 {2 => 3, 3 => 5};}",
        )
    }
@@ -168,7 +164,7 @@ mod tests {
    fn add_explicit_type_not_applicable_if_cursor_before_let() {
        check_assist_not_applicable(
            add_explicit_type,
-            "fn f() <|>{let a = match 1 {2 => 3, 3 => 5};}",
+            "fn f() $0{let a = match 1 {2 => 3, 3 => 5};}",
        )
    }
@@ -178,7 +174,7 @@ mod tests {
            add_explicit_type,
            r#"
 fn main() {
-    let multiply_by_two<|> = |i| i * 3;
+    let multiply_by_two$0 = |i| i * 3;
    let six = multiply_by_two(2);
 }"#,
        )
@@ -195,7 +191,7 @@ struct Test<K, T = u8> {
 }
 fn main() {
-    let test<|> = Test { t: 23u8, k: 33 };
+    let test$0 = Test { t: 23u8, k: 33 };
 }"#,
            r#"
 struct Test<K, T = u8> {
diff --git a/crates/assists/src/handlers/add_missing_impl_members.rs b/crates/assists/src/handlers/add_missing_impl_members.rs
index 7df05b841..63cea754d 100644
--- a/crates/assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/assists/src/handlers/add_missing_impl_members.rs
@@ -20,7 +20,7 @@ use crate::{
 //     fn bar(&self) {}
 // }
 //
-// impl Trait<u32> for () {<|>
+// impl Trait<u32> for () {$0
 //
 // }
 // ```
@@ -63,7 +63,7 @@ pub(crate) fn add_missing_impl_members(acc: &mut Assists, ctx: &AssistContext) -
 //
 // impl Trait for () {
 //     type X = ();
-//     fn foo(&self) {}<|>
+//     fn foo(&self) {}$0
 //
 // }
 // ```
@@ -166,7 +166,7 @@ struct S;
 impl Foo for S {
    fn bar(&self) {}
-<|>
+$0
 }"#,
            r#"
 trait Foo {
@@ -214,7 +214,7 @@ struct S;
 impl Foo for S {
    fn bar(&self) {}
-<|>
+$0
 }"#,
            r#"
 trait Foo {
@@ -242,7 +242,7 @@ impl Foo for S {
            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
            r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -261,7 +261,7 @@ impl Foo for S {
            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S<|>"#,
+impl Foo for S$0"#,
            r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -280,7 +280,7 @@ impl Foo for S {
            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl Foo<u32> for S { <|> }"#,
+impl Foo<u32> for S { $0 }"#,
            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
@@ -299,7 +299,7 @@ impl Foo<u32> for S {
            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl<U> Foo<U> for S { <|> }"#,
+impl<U> Foo<U> for S { $0 }"#,
            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
@@ -318,7 +318,7 @@ impl<U> Foo<U> for S {
            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S {}<|>"#,
+impl Foo for S {}$0"#,
            r#"
 trait Foo { fn foo(&self); }
 struct S;
@@ -340,7 +340,7 @@ mod foo {
    trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
            r#"
 mod foo {
    pub struct Bar;
@@ -370,7 +370,7 @@ mod foo {
 use foo::bar;
 struct S;
-impl bar::Foo for S { <|> }"#,
+impl bar::Foo for S { $0 }"#,
            r#"
 mod foo {
    pub mod bar {
@@ -400,7 +400,7 @@ mod foo {
    trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
            r#"
 mod foo {
    pub struct Bar<T>;
@@ -425,7 +425,7 @@ mod foo {
    trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
-impl foo::Foo<u32> for S { <|> }"#,
+impl foo::Foo<u32> for S { $0 }"#,
            r#"
 mod foo {
    pub struct Bar<T>;
@@ -452,7 +452,7 @@ mod foo {
 }
 struct Param;
 struct S;
-impl foo::Foo<Param> for S { <|> }"#,
+impl foo::Foo<Param> for S { $0 }"#,
            r#"
 mod foo {
    trait Foo<T> { fn foo(&self, bar: T); }
@@ -479,7 +479,7 @@ mod foo {
    trait Foo { fn foo(&self, bar: Bar<u32>::Assoc); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
            r#"
 mod foo {
    pub struct Bar<T>;
@@ -506,7 +506,7 @@ mod foo {
    trait Foo { fn foo(&self, bar: Bar<Baz>); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
            r#"
 mod foo {
    pub struct Bar<T>;
@@ -532,7 +532,7 @@ mod foo {
    trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
-impl foo::Foo for S { <|> }"#,
+impl foo::Foo for S { $0 }"#,
            r#"
 mod foo {
    pub trait Fn<Args> { type Output; }
@@ -554,7 +554,7 @@ impl foo::Foo for S {
            r#"
 trait Foo;
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
        )
    }
@@ -568,7 +568,7 @@ trait Foo {
    fn valid(some: u32) -> bool { false }
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
        )
    }
@@ -586,7 +586,7 @@ trait Foo {
    fn foo(&self);
 }
 struct S;
-impl Foo for S {}<|>"#,
+impl Foo for S {}$0"#,
            r#"
 #[doc(alias = "test alias")]
 trait Foo {
@@ -621,7 +621,7 @@ trait Foo {
    fn foo(some: u32) -> bool;
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
            r#"
 trait Foo {
    type Output;
@@ -648,7 +648,7 @@ trait Foo<T = Self> {
 }
 struct S;
-impl Foo for S { <|> }"#,
+impl Foo for S { $0 }"#,
            r#"
 trait Foo<T = Self> {
    fn bar(&self, other: &T);
@@ -673,7 +673,7 @@ trait Foo<T1, T2 = Self> {
 }
 struct S<T>;
-impl Foo<T> for S<T> { <|> }"#,
+impl Foo<T> for S<T> { $0 }"#,
            r#"
 trait Foo<T1, T2 = Self> {
    fn bar(&self, this: &T1, that: &T2);
@@ -697,7 +697,7 @@ trait Tr {
    type Ty: Copy + 'static;
 }
-impl Tr for ()<|> {
+impl Tr for ()$0 {
 }"#,
            r#"
 trait Tr {
@@ -719,7 +719,7 @@ trait Tr {
    fn foo();
 }
-impl Tr for ()<|> {
+impl Tr for ()$0 {
    +++
 }"#,
            r#"
@@ -745,7 +745,7 @@ trait Tr {
    fn foo();
 }
-impl Tr for ()<|> {
+impl Tr for ()$0 {
    // very important
 }"#,
            r#"
@@ -771,7 +771,7 @@ trait Test {
    fn foo(&self, x: crate)
 }
 impl Test for () {
-    <|>
+    $0
 }
 "#,
            r#"
@@ -796,7 +796,7 @@ trait Foo<BAR> {
    fn foo(&self, bar: BAR);
 }
 impl Foo for () {
-    <|>
+    $0
 }
 "#,
            r#"
diff --git a/crates/assists/src/handlers/add_turbo_fish.rs b/crates/assists/src/handlers/add_turbo_fish.rs
index 1f486c013..8e9ea4fad 100644
--- a/crates/assists/src/handlers/add_turbo_fish.rs
+++ b/crates/assists/src/handlers/add_turbo_fish.rs
@@ -14,7 +14,7 @@ use crate::{
 // ```
 // fn make<T>() -> T { todo!() }
 // fn main() {
-//     let x = make<|>();
+//     let x = make$0();
 // }
 // ```
 // ->
@@ -77,7 +77,7 @@ mod tests {
            r#"
 fn make<T>() -> T {}
 fn main() {
-    make<|>();
+    make$0();
 }
 "#,
            r#"
@@ -97,7 +97,7 @@ fn main() {
            r#"
 fn make<T>() -> T {}
 fn main() {
-    make()<|>;
+    make()$0;
 }
 "#,
            r#"
@@ -119,7 +119,7 @@ impl S {
    fn make<T>(&self) -> T {}
 }
 fn main() {
-    S.make<|>();
+    S.make$0();
 }
 "#,
            r#"
@@ -142,7 +142,7 @@ fn main() {
            r#"
 fn make<T>() -> T {}
 fn main() {
-    make<|>::<()>();
+    make$0::<()>();
 }
 "#,
        );
@@ -156,7 +156,7 @@ fn main() {
            r#"
 fn make() -> () {}
 fn main() {
-    make<|>();
+    make$0();
 }
 "#,
        );
diff --git a/crates/assists/src/handlers/apply_demorgan.rs b/crates/assists/src/handlers/apply_demorgan.rs
index 1a6fdafda..ed4d11455 100644
--- a/crates/assists/src/handlers/apply_demorgan.rs
+++ b/crates/assists/src/handlers/apply_demorgan.rs
@@ -12,7 +12,7 @@ use crate::{utils::invert_boolean_expression, AssistContext, AssistId, AssistKin
 //
 // ```
 // fn main() {
-//     if x != 4 ||<|> !y {}
+//     if x != 4 ||$0 !y {}
 // }
 // ```
 // ->
@@ -68,26 +68,26 @@ mod tests {
    #[test]
    fn demorgan_turns_and_into_or() {
-        check_assist(apply_demorgan, "fn f() { !x &&<|> !x }", "fn f() { !(x || x) }")
+        check_assist(apply_demorgan, "fn f() { !x &&$0 !x }", "fn f() { !(x || x) }")
    }
    #[test]
    fn demorgan_turns_or_into_and() {
-        check_assist(apply_demorgan, "fn f() { !x ||<|> !x }", "fn f() { !(x && x) }")
+        check_assist(apply_demorgan, "fn f() { !x ||$0 !x }", "fn f() { !(x && x) }")
    }
    #[test]
    fn demorgan_removes_inequality() {
-        check_assist(apply_demorgan, "fn f() { x != x ||<|> !x }", "fn f() { !(x == x && x) }")
+        check_assist(apply_demorgan, "fn f() { x != x ||$0 !x }", "fn f() { !(x == x && x) }")
    }
    #[test]
    fn demorgan_general_case() {
-        check_assist(apply_demorgan, "fn f() { x ||<|> x }", "fn f() { !(!x && !x) }")
+        check_assist(apply_demorgan, "fn f() { x ||$0 x }", "fn f() { !(!x && !x) }")
    }
    #[test]
    fn demorgan_doesnt_apply_with_cursor_not_on_op() {
-        check_assist_not_applicable(apply_demorgan, "fn f() { <|> !x || !x }")
+        check_assist_not_applicable(apply_demorgan, "fn f() { $0 !x || !x }")
    }
 }
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs
index bd5bba646..55620f0f3 100644
--- a/crates/assists/src/handlers/auto_import.rs
+++ b/crates/assists/src/handlers/auto_import.rs
@@ -70,7 +70,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     let map = HashMap<|>::new();
+//     let map = HashMap$0::new();
 // }
 // # pub mod std { pub mod collections { pub struct HashMap { } } }
 // ```
@@ -151,7 +151,7 @@ mod tests {
            use std::fmt;
-            <|>Formatter
+            $0Formatter
            ",
            r"
            mod std {
@@ -172,7 +172,7 @@ mod tests {
        check_assist(
            auto_import,
            r"
-            <|>PubStruct
+            $0PubStruct
            pub mod PubMod {
                pub struct PubStruct;
@@ -198,7 +198,7 @@ mod tests {
            macro_rules! foo {
                ($i:ident) => { fn foo(a: $i) {} }
            }
-            foo!(Pub<|>Struct);
+            foo!(Pub$0Struct);
            pub mod PubMod {
                pub struct PubStruct;
@@ -227,7 +227,7 @@ mod tests {
            use PubMod::PubStruct1;
            struct Test {
-                test: Pub<|>Struct2<u8>,
+                test: Pub$0Struct2<u8>,
            }
            pub mod PubMod {
@@ -259,7 +259,7 @@ mod tests {
        check_assist(
            auto_import,
            r"
-            PubSt<|>ruct
+            PubSt$0ruct
            pub mod PubMod1 {
                pub struct PubStruct;
@@ -296,7 +296,7 @@ mod tests {
            r"
            use PubMod::PubStruct;
-            PubStruct<|>
+            PubStruct$0
            pub mod PubMod {
                pub struct PubStruct;
@@ -310,7 +310,7 @@ mod tests {
        check_assist_not_applicable(
            auto_import,
            r"
-            PrivateStruct<|>
+            PrivateStruct$0
            pub mod PubMod {
                struct PrivateStruct;
@@ -324,7 +324,7 @@ mod tests {
        check_assist_not_applicable(
            auto_import,
            "
-            PubStruct<|>",
+            PubStruct$0",
        );
    }
@@ -333,7 +333,7 @@ mod tests {
        check_assist_not_applicable(
            auto_import,
            r"
-            use PubStruct<|>;
+            use PubStruct$0;
            pub mod PubMod {
                pub struct PubStruct;
@@ -346,7 +346,7 @@ mod tests {
        check_assist(
            auto_import,
            r"
-            test_function<|>
+            test_function$0
            pub mod PubMod {
                pub fn test_function() {};
@@ -377,7 +377,7 @@ macro_rules! foo {
 //- /main.rs crate:main deps:crate_with_macro
 fn main() {
-    foo<|>
+    foo$0
 }
 ",
            r"use crate_with_macro::foo;
@@ -395,7 +395,7 @@ fn main() {
            auto_import,
            r"
            struct AssistInfo {
-                group_label: Option<<|>GroupLabel>,
+                group_label: Option<$0GroupLabel>,
            }
            mod m { pub struct GroupLabel; }
@@ -419,7 +419,7 @@ fn main() {
            use mod1::mod2;
            fn main() {
-                mod2::mod3::TestStruct<|>
+                mod2::mod3::TestStruct$0
            }
            ",
        );
@@ -436,7 +436,7 @@ fn main() {
            use test_mod::test_function;
            fn main() {
-                test_function<|>
+                test_function$0
            }
            ",
        );
@@ -455,7 +455,7 @@ fn main() {
            }
            fn main() {
-                TestStruct::test_function<|>
+                TestStruct::test_function$0
            }
            ",
            r"
@@ -488,7 +488,7 @@ fn main() {
            }
            fn main() {
-                TestStruct::TEST_CONST<|>
+                TestStruct::TEST_CONST$0
            }
            ",
            r"
@@ -524,7 +524,7 @@ fn main() {
            }
            fn main() {
-                test_mod::TestStruct::test_function<|>
+                test_mod::TestStruct::test_function$0
            }
            ",
            r"
@@ -573,7 +573,7 @@ fn main() {
            use test_mod::TestTrait2;
            fn main() {
-                test_mod::TestEnum::test_function<|>;
+                test_mod::TestEnum::test_function$0;
            }
            ",
        )
@@ -595,7 +595,7 @@ fn main() {
            }
            fn main() {
-                test_mod::TestStruct::TEST_CONST<|>
+                test_mod::TestStruct::TEST_CONST$0
            }
            ",
            r"
@@ -644,7 +644,7 @@ fn main() {
            use test_mod::TestTrait2;
            fn main() {
-                test_mod::TestEnum::TEST_CONST<|>;
+                test_mod::TestEnum::TEST_CONST$0;
            }
            ",
        )
@@ -667,7 +667,7 @@ fn main() {
            fn main() {
                let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
            }
            ",
            r"
@@ -699,7 +699,7 @@ fn main() {
            //- /main.rs crate:main deps:dep
            fn main() {
                let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
            }
            //- /dep.rs crate:dep
            pub mod test_mod {
@@ -730,7 +730,7 @@ fn main() {
            r"
            //- /main.rs crate:main deps:dep
            fn main() {
-                dep::test_mod::TestStruct::test_func<|>tion
+                dep::test_mod::TestStruct::test_func$0tion
            }
            //- /dep.rs crate:dep
            pub mod test_mod {
@@ -760,7 +760,7 @@ fn main() {
            r"
            //- /main.rs crate:main deps:dep
            fn main() {
-                dep::test_mod::TestStruct::CONST<|>
+                dep::test_mod::TestStruct::CONST$0
            }
            //- /dep.rs crate:dep
            pub mod test_mod {
@@ -791,7 +791,7 @@ fn main() {
            //- /main.rs crate:main deps:dep
            fn main() {
                let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_func<|>tion()
+                test_struct.test_func$0tion()
            }
            //- /dep.rs crate:dep
            pub mod test_mod {
@@ -815,7 +815,7 @@ fn main() {
            //- /main.rs crate:main deps:dep
            fn main() {
                let test_struct = dep::test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_meth$0od()
            }
            //- /dep.rs crate:dep
            pub mod test_mod {
@@ -858,7 +858,7 @@ fn main() {
            use test_mod::TestTrait2;
            fn main() {
                let one = test_mod::TestEnum::One;
-                one.test<|>_method();
+                one.test$0_method();
            }
            ",
        )
@@ -874,7 +874,7 @@ pub struct Struct;
 //- /main.rs crate:main deps:dep
 fn main() {
-    Struct<|>
+    Struct$0
 }
 ",
            r"use dep::Struct;
@@ -902,7 +902,7 @@ pub fn panic_fmt() {}
 //- /main.rs crate:main deps:dep
 struct S;
-impl f<|>mt::Display for S {}
+impl f$0mt::Display for S {}
 ",
            r"use dep::fmt;
@@ -930,7 +930,7 @@ mac!();
 //- /main.rs crate:main deps:dep
 fn main() {
-    Cheese<|>;
+    Cheese$0;
 }
 ",
            r"use dep::Cheese;
@@ -954,7 +954,7 @@ pub struct fmt;
 //- /main.rs crate:main deps:dep
 fn main() {
-    FMT<|>;
+    FMT$0;
 }
 ",
            r"use dep::FMT;
diff --git a/crates/assists/src/handlers/change_visibility.rs b/crates/assists/src/handlers/change_visibility.rs
index 22d7c95d9..ac8c44124 100644
--- a/crates/assists/src/handlers/change_visibility.rs
+++ b/crates/assists/src/handlers/change_visibility.rs
@@ -13,7 +13,7 @@ use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
 // Adds or changes existing visibility specifier.
 //
 // ```
-// <|>fn frobnicate() {}
+// $0fn frobnicate() {}
 // ```
 // ->
 // ```
@@ -118,23 +118,23 @@ mod tests {
    #[test]
    fn change_visibility_adds_pub_crate_to_items() {
-        check_assist(change_visibility, "<|>fn foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "$0fn foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "f<|>n foo() {}", "pub(crate) fn foo() {}");
+        check_assist(change_visibility, "f$0n foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "<|>struct Foo {}", "pub(crate) struct Foo {}");
+        check_assist(change_visibility, "$0struct Foo {}", "pub(crate) struct Foo {}");
-        check_assist(change_visibility, "<|>mod foo {}", "pub(crate) mod foo {}");
+        check_assist(change_visibility, "$0mod foo {}", "pub(crate) mod foo {}");
-        check_assist(change_visibility, "<|>trait Foo {}", "pub(crate) trait Foo {}");
+        check_assist(change_visibility, "$0trait Foo {}", "pub(crate) trait Foo {}");
-        check_assist(change_visibility, "m<|>od {}", "pub(crate) mod {}");
+        check_assist(change_visibility, "m$0od {}", "pub(crate) mod {}");
-        check_assist(change_visibility, "unsafe f<|>n foo() {}", "pub(crate) unsafe fn foo() {}");
+        check_assist(change_visibility, "unsafe f$0n foo() {}", "pub(crate) unsafe fn foo() {}");
    }
    #[test]
    fn change_visibility_works_with_struct_fields() {
        check_assist(
            change_visibility,
-            r"struct S { <|>field: u32 }",
+            r"struct S { $0field: u32 }",
            r"struct S { pub(crate) field: u32 }",
        );
-        check_assist(change_visibility, r"struct S ( <|>u32 )", r"struct S ( pub(crate) u32 )");
+        check_assist(change_visibility, r"struct S ( $0u32 )", r"struct S ( pub(crate) u32 )");
    }
    #[test]
@@ -142,33 +142,33 @@ mod tests {
        mark::check!(change_visibility_field_false_positive);
        check_assist_not_applicable(
            change_visibility,
-            r"struct S { field: [(); { let <|>x = ();}] }",
+            r"struct S { field: [(); { let $0x = ();}] }",
        )
    }
    #[test]
    fn change_visibility_pub_to_pub_crate() {
-        check_assist(change_visibility, "<|>pub fn foo() {}", "pub(crate) fn foo() {}")
+        check_assist(change_visibility, "$0pub fn foo() {}", "pub(crate) fn foo() {}")
    }
    #[test]
    fn change_visibility_pub_crate_to_pub() {
-        check_assist(change_visibility, "<|>pub(crate) fn foo() {}", "pub fn foo() {}")
+        check_assist(change_visibility, "$0pub(crate) fn foo() {}", "pub fn foo() {}")
    }
    #[test]
    fn change_visibility_const() {
-        check_assist(change_visibility, "<|>const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
+        check_assist(change_visibility, "$0const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
    }
    #[test]
    fn change_visibility_static() {
-        check_assist(change_visibility, "<|>static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
+        check_assist(change_visibility, "$0static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
    }
    #[test]
    fn change_visibility_type_alias() {
-        check_assist(change_visibility, "<|>type T = ();", "pub(crate) type T = ();");
+        check_assist(change_visibility, "$0type T = ();", "pub(crate) type T = ();");
    }
    #[test]
@@ -181,7 +181,7 @@ mod tests {
            // comments
            #[derive(Debug)]
-            <|>struct Foo;
+            $0struct Foo;
            ",
            r"
            /// docs
@@ -199,14 +199,14 @@ mod tests {
        check_assist_not_applicable(
            change_visibility,
            r"mod foo { pub enum Foo {Foo1} }
-              fn main() { foo::Foo::Foo1<|> } ",
+              fn main() { foo::Foo::Foo1$0 } ",
        );
    }
    #[test]
    fn change_visibility_target() {
-        check_assist_target(change_visibility, "<|>fn foo() {}", "fn");
+        check_assist_target(change_visibility, "$0fn foo() {}", "fn");
-        check_assist_target(change_visibility, "pub(crate)<|> fn foo() {}", "pub(crate)");
+        check_assist_target(change_visibility, "pub(crate)$0 fn foo() {}", "pub(crate)");
-        check_assist_target(change_visibility, "struct S { <|>field: u32 }", "field");
+        check_assist_target(change_visibility, "struct S { $0field: u32 }", "field");
    }
 }
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs
index 667115382..a8a819cfc 100644
--- a/crates/assists/src/handlers/convert_integer_literal.rs
+++ b/crates/assists/src/handlers/convert_integer_literal.rs
@@ -7,7 +7,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel};
 // Converts the base of integer literals to other bases.
 //
 // ```
-// const _: i32 = 10<|>;
+// const _: i32 = 10$0;
 // ```
 // ->
 // ```
@@ -65,47 +65,47 @@ mod tests {
    #[test]
    fn binary_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0b1010<|>;", "0b1010");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0b1010$0;", "0b1010");
    }
    #[test]
    fn octal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0o12<|>;", "0o12");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0o12$0;", "0o12");
    }
    #[test]
    fn decimal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 10<|>;", "10");
+        check_assist_target(convert_integer_literal, "const _: i32 = 10$0;", "10");
    }
    #[test]
    fn hexadecimal_target() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0xA<|>;", "0xA");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0xA$0;", "0xA");
    }
    #[test]
    fn binary_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0b10_10<|>;", "0b10_10");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0b10_10$0;", "0b10_10");
    }
    #[test]
    fn octal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0o1_2<|>;", "0o1_2");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0o1_2$0;", "0o1_2");
    }
    #[test]
    fn decimal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 1_0<|>;", "1_0");
+        check_assist_target(convert_integer_literal, "const _: i32 = 1_0$0;", "1_0");
    }
    #[test]
    fn hexadecimal_target_with_underscores() {
-        check_assist_target(convert_integer_literal, "const _: i32 = 0x_A<|>;", "0x_A");
+        check_assist_target(convert_integer_literal, "const _: i32 = 0x_A$0;", "0x_A");
    }
    #[test]
    fn convert_decimal_integer() {
-        let before = "const _: i32 = 1000<|>;";
+        let before = "const _: i32 = 1000$0;";
        check_assist_by_label(
            convert_integer_literal,
@@ -131,7 +131,7 @@ mod tests {
    #[test]
    fn convert_hexadecimal_integer() {
-        let before = "const _: i32 = 0xFF<|>;";
+        let before = "const _: i32 = 0xFF$0;";
        check_assist_by_label(
            convert_integer_literal,
@@ -157,7 +157,7 @@ mod tests {
    #[test]
    fn convert_binary_integer() {
-        let before = "const _: i32 = 0b11111111<|>;";
+        let before = "const _: i32 = 0b11111111$0;";
        check_assist_by_label(
            convert_integer_literal,
@@ -183,7 +183,7 @@ mod tests {
    #[test]
    fn convert_octal_integer() {
-        let before = "const _: i32 = 0o377<|>;";
+        let before = "const _: i32 = 0o377$0;";
        check_assist_by_label(
            convert_integer_literal,
@@ -209,7 +209,7 @@ mod tests {
    #[test]
    fn convert_integer_with_underscores() {
-        let before = "const _: i32 = 1_00_0<|>;";
+        let before = "const _: i32 = 1_00_0$0;";
        check_assist_by_label(
            convert_integer_literal,
@@ -235,7 +235,7 @@ mod tests {
    #[test]
    fn convert_integer_with_suffix() {
-        let before = "const _: i32 = 1000i32<|>;";
+        let before = "const _: i32 = 1000i32$0;";
        check_assist_by_label(
            convert_integer_literal,
@@ -262,7 +262,7 @@ mod tests {
    #[test]
    fn convert_overflowing_literal() {
        let before = "const _: i32 =
-            111111111111111111111111111111111111111111111111111111111111111111111111<|>;";
+            111111111111111111111111111111111111111111111111111111111111111111111111$0;";
        check_assist_not_applicable(convert_integer_literal, before);
    }
 }
diff --git a/crates/assists/src/handlers/early_return.rs b/crates/assists/src/handlers/early_return.rs
index 7bcc318a9..8bbbb7ed5 100644
--- a/crates/assists/src/handlers/early_return.rs
+++ b/crates/assists/src/handlers/early_return.rs
@@ -24,7 +24,7 @@ use crate::{
 //
 // ```
 // fn main() {
-//     <|>if cond {
+//     $0if cond {
 //         foo();
 //         bar();
 //     }
@@ -69,7 +69,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
    let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::BlockExpr::cast)?;
-    if parent_block.expr()? != if_expr.clone().into() {
+    if parent_block.tail_expr()? != if_expr.clone().into() {
        return None;
    }
@@ -200,7 +200,7 @@ mod tests {
            r#"
            fn main() {
                bar();
-                if<|> true {
+                if$0 true {
                    foo();
                    //comment
@@ -230,7 +230,7 @@ mod tests {
            r#"
            fn main(n: Option<String>) {
                bar();
-                if<|> let Some(n) = n {
+                if$0 let Some(n) = n {
                    foo(n);
                    //comment
@@ -260,7 +260,7 @@ mod tests {
            convert_to_guarded_return,
            r#"
            fn main() {
-                if<|> let Ok(x) = Err(92) {
+                if$0 let Ok(x) = Err(92) {
                    foo(x);
                }
            }
@@ -284,7 +284,7 @@ mod tests {
            r#"
            fn main(n: Option<String>) {
                bar();
-                if<|> let Ok(n) = n {
+                if$0 let Ok(n) = n {
                    foo(n);
                    //comment
@@ -315,7 +315,7 @@ mod tests {
            r#"
            fn main() {
                while true {
-                    if<|> true {
+                    if$0 true {
                        foo();
                        bar();
                    }
@@ -343,7 +343,7 @@ mod tests {
            r#"
            fn main() {
                while true {
-                    if<|> let Some(n) = n {
+                    if$0 let Some(n) = n {
                        foo(n);
                        bar();
                    }
@@ -372,7 +372,7 @@ mod tests {
            r#"
            fn main() {
                loop {
-                    if<|> true {
+                    if$0 true {
                        foo();
                        bar();
                    }
@@ -400,7 +400,7 @@ mod tests {
            r#"
            fn main() {
                loop {
-                    if<|> let Some(n) = n {
+                    if$0 let Some(n) = n {
                        foo(n);
                        bar();
                    }
@@ -428,7 +428,7 @@ mod tests {
            convert_to_guarded_return,
            r#"
            fn main() {
-                if<|> true {
+                if$0 true {
                    return;
                }
            }
@@ -443,7 +443,7 @@ mod tests {
            r#"
            fn main() {
                loop {
-                    if<|> true {
+                    if$0 true {
                        continue;
                    }
                }
@@ -458,7 +458,7 @@ mod tests {
            convert_to_guarded_return,
            r#"
            fn main() {
-                if<|> true {
+                if$0 true {
                    return
                }
            }
@@ -472,7 +472,7 @@ mod tests {
            convert_to_guarded_return,
            r#"
            fn main() {
-                if<|> true {
+                if$0 true {
                    foo();
                } else {
                    bar()
@@ -488,7 +488,7 @@ mod tests {
            convert_to_guarded_return,
            r#"
            fn main() {
-                if<|> true {
+                if$0 true {
                    foo();
                }
                bar();
@@ -504,7 +504,7 @@ mod tests {
            r#"
            fn main() {
                if false {
-                    if<|> true {
+                    if$0 true {
                        foo();
                    }
                }
diff --git a/crates/assists/src/handlers/expand_glob_import.rs b/crates/assists/src/handlers/expand_glob_import.rs
index f51a9a4ad..5fe617ba4 100644
--- a/crates/assists/src/handlers/expand_glob_import.rs
+++ b/crates/assists/src/handlers/expand_glob_import.rs
@@ -25,7 +25,7 @@ use crate::{
 //     pub struct Baz;
 // }
 //
-// use foo::*<|>;
+// use foo::*$0;
 //
 // fn qux(bar: Bar, baz: Baz) {}
 // ```
@@ -201,7 +201,7 @@ fn is_mod_visible_from(ctx: &AssistContext, module: Module, from: Module) -> boo
 // }
 //
 // ↓ ---------------
-// use foo::*<|>;
+// use foo::*$0;
 // use baz::Baz;
 // ↑ ---------------
 fn find_imported_defs(ctx: &AssistContext, star: SyntaxToken) -> Option<Vec<Def>> {
@@ -303,7 +303,7 @@ mod foo {
    pub fn f() {}
 }
-use foo::*<|>;
+use foo::*$0;
 fn qux(bar: Bar, baz: Baz) {
    f();
@@ -340,7 +340,7 @@ mod foo {
    pub fn f() {}
 }
-use foo::{*<|>, f};
+use foo::{*$0, f};
 fn qux(bar: Bar, baz: Baz) {
    f();
@@ -378,7 +378,7 @@ mod foo {
 }
 use foo::Bar;
-use foo::{*<|>, f};
+use foo::{*$0, f};
 fn qux(bar: Bar, baz: Baz) {
    f();
@@ -422,7 +422,7 @@ mod foo {
    }
 }
-use foo::{bar::{*<|>, f}, baz::*};
+use foo::{bar::{*$0, f}, baz::*};
 fn qux(bar: Bar, baz: Baz) {
    f();
@@ -470,7 +470,7 @@ mod foo {
    }
 }
-use foo::{bar::{Bar, Baz, f}, baz::*<|>};
+use foo::{bar::{Bar, Baz, f}, baz::*$0};
 fn qux(bar: Bar, baz: Baz) {
    f();
@@ -529,7 +529,7 @@ mod foo {
 use foo::{
    bar::{*, f},
-    baz::{g, qux::*<|>}
+    baz::{g, qux::*$0}
 };
 fn qux(bar: Bar, baz: Baz) {
@@ -605,7 +605,7 @@ mod foo {
 use foo::{
    bar::{*, f},
-    baz::{g, qux::{h, q::*<|>}}
+    baz::{g, qux::{h, q::*$0}}
 };
 fn qux(bar: Bar, baz: Baz) {
@@ -681,7 +681,7 @@ mod foo {
 use foo::{
    bar::{*, f},
-    baz::{g, qux::{q::j, *<|>}}
+    baz::{g, qux::{q::j, *$0}}
 };
 fn qux(bar: Bar, baz: Baz) {
@@ -747,7 +747,7 @@ fn qux(bar: Bar, baz: Baz) {
        // pub fn baz() {}
        // //- /main.rs crate:main deps:foo
-        // use foo::*<|>;
+        // use foo::*$0;
        // fn main() {
        //     bar!();
@@ -777,7 +777,7 @@ pub trait Tr {
 impl Tr for () {}
 //- /main.rs crate:main deps:foo
-use foo::*<|>;
+use foo::*$0;
 fn main() {
    ().method();
@@ -807,7 +807,7 @@ pub trait Tr2 {
 impl Tr2 for () {}
 //- /main.rs crate:main deps:foo
-use foo::*<|>;
+use foo::*$0;
 fn main() {
    ().method();
@@ -834,7 +834,7 @@ mod foo {
    }
 }
-use foo::bar::*<|>;
+use foo::bar::*$0;
 fn baz(bar: Bar) {}
 ",
@@ -851,7 +851,7 @@ mod foo {
    }
 }
-use foo::bar::baz::*<|>;
+use foo::bar::baz::*$0;
 fn qux(baz: Baz) {}
 ",
@@ -869,7 +869,7 @@ fn qux(baz: Baz) {}
        pub struct Qux;
    }
-    use foo::Bar<|>;
+    use foo::Bar$0;
    fn qux(bar: Bar, baz: Baz) {}
    ",
@@ -885,7 +885,7 @@ mod foo {
    pub struct Bar;
 }
-use foo::{*<|>};
+use foo::{*$0};
 struct Baz {
    bar: Bar
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
index 030b9cd0c..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::{
+use ide_db::{
-    insert_use::{insert_use, ImportScope},
+    defs::Definition,
-    mod_path_to_ast,
+    helpers::{
+        insert_use::{insert_use, ImportScope},
+        mod_path_to_ast,
+    },
+    search::FileReference,
+    RootDatabase,
 };
-use ide_db::{defs::Definition, search::Reference, RootDatabase};
+use rustc_hash::FxHashSet;
-use rustc_hash::{FxHashMap, 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();
+            let mut def_rewriter = None;
-            for reference in usages {
+            for (file_id, references) in usages {
-                let rewriter = rewriters
+                let mut rewriter = SyntaxRewriter::default();
-                    .entry(reference.file_range.file_id)
+                let source_file = ctx.sema.parse(file_id);
-                    .or_insert_with(SyntaxRewriter::default);
+                for reference in references {
-                let source_file = ctx.sema.parse(reference.file_range.file_id);
+                    update_reference(
-                update_reference(
+                        ctx,
-                    ctx,
+                        &mut rewriter,
-                    rewriter,
+                        reference,
-                    reference,
+                        &source_file,
-                    &source_file,
+                        &enum_module_def,
-                    &enum_module_def,
+                        &variant_hir_name,
-                    &variant_hir_name,
+                        &mut visited_modules_set,
-                    &mut visited_modules_set,
+                    );
-                );
+                }
-            }
+                if file_id == ctx.frange.file_id {
-            let mut rewriter =
+                    def_rewriter = Some(rewriter);
-                rewriters.remove(&ctx.frange.file_id).unwrap_or_else(SyntaxRewriter::default);
+                    continue;
-            for (file_id, rewriter) in rewriters {
+                }
                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,
+            hir::ScopeDef::ModuleDef(def) => matches!(
-                ModuleDef::Module(_) | ModuleDef::Adt(_) |
+                def,
-                ModuleDef::Variant(_) | ModuleDef::Trait(_) |
+                ModuleDef::Module(_)
-                ModuleDef::TypeAlias(_) | ModuleDef::BuiltinType(_)
+                    | ModuleDef::Adt(_)
+                    | ModuleDef::Variant(_)
+                    | ModuleDef::Trait(_)
+                    | ModuleDef::TypeAlias(_)
+                    | ModuleDef::BuiltinType(_)
            ),
            _ => false,
        })
@@ -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::Struct(s) => offset_target_and_file_id(db, s)?,
-                hir::Adt::Union(u) => offset_target_and_file_id(db, u),
+                hir::Adt::Union(u) => offset_target_and_file_id(db, u)?,
-                hir::Adt::Enum(e) => offset_target_and_file_id(db, e),
+                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(
+        check_assist(flip_binexpr, "fn f() { let res = 1 ==$0 2; }", "fn f() { let res = 2 == 1; }")
-            flip_binexpr,
-            "fn f() { let res = 1 ==<|> 2; }",
-            "fn f() { let res = 2 == 1; }",
-        )
    }
    #[test]
    fn flip_binexpr_works_for_gt() {
-        check_assist(flip_binexpr, "fn f() { let res = 1 ><|> 2; }", "fn f() { let res = 2 < 1; }")
+        check_assist(flip_binexpr, "fn f() { let res = 1 >$0 2; }", "fn f() { let res = 2 < 1; }")
    }
    #[test]
    fn flip_binexpr_works_for_lteq() {
-        check_assist(
+        check_assist(flip_binexpr, "fn f() { let res = 1 <=$0 2; }", "fn f() { let res = 2 >= 1; }")
-            flip_binexpr,
-            "fn f() { let res = 1 <=<|> 2; }",
-            "fn f() { let res = 2 >= 1; }",
-        )
    }
    #[test]
    fn flip_binexpr_works_for_complex_expr() {
        check_assist(
            flip_binexpr,
-            "fn f() { let res = (1 + 1) ==<|> (2 + 2); }",
+            "fn f() { let res = (1 + 1) ==$0 (2 + 2); }",
            "fn f() { let res = (2 + 2) == (1 + 1); }",
        )
    }
@@ -125,7 +117,7 @@ mod tests {
            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
                match other.downcast_ref::<Self>() {
                    None => false,
-                    Some(it) => it ==<|> self,
+                    Some(it) => it ==$0 self,
                }
            }
            "#,
diff --git a/crates/assists/src/handlers/flip_comma.rs b/crates/assists/src/handlers/flip_comma.rs
index 64b4b1a76..18cf64a34 100644
--- a/crates/assists/src/handlers/flip_comma.rs
+++ b/crates/assists/src/handlers/flip_comma.rs
@@ -8,7 +8,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // ```
 // fn main() {
-//     ((1, 2),<|> (3, 4));
+//     ((1, 2),$0 (3, 4));
 // }
 // ```
 // ->
@@ -49,14 +49,14 @@ mod tests {
    fn flip_comma_works_for_function_parameters() {
        check_assist(
            flip_comma,
-            "fn foo(x: i32,<|> y: Result<(), ()>) {}",
+            r#"fn foo(x: i32,$0 y: Result<(), ()>) {}"#,
-            "fn foo(y: Result<(), ()>, x: i32) {}",
+            r#"fn foo(y: Result<(), ()>, x: i32) {}"#,
        )
    }
    #[test]
    fn flip_comma_target() {
-        check_assist_target(flip_comma, "fn foo(x: i32,<|> y: Result<(), ()>) {}", ",")
+        check_assist_target(flip_comma, r#"fn foo(x: i32,$0 y: Result<(), ()>) {}"#, ",")
    }
    #[test]
@@ -68,7 +68,7 @@ mod tests {
        check_assist_target(
            flip_comma,
            "pub enum Test { \
-             A,<|> \
+             A,$0 \
             }",
            ",",
        );
@@ -76,7 +76,7 @@ mod tests {
        check_assist_target(
            flip_comma,
            "pub struct Test { \
-             foo: usize,<|> \
+             foo: usize,$0 \
             }",
            ",",
        );
diff --git a/crates/assists/src/handlers/flip_trait_bound.rs b/crates/assists/src/handlers/flip_trait_bound.rs
index 92ee42181..d419d263e 100644
--- a/crates/assists/src/handlers/flip_trait_bound.rs
+++ b/crates/assists/src/handlers/flip_trait_bound.rs
@@ -11,7 +11,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Flips two trait bounds.
 //
 // ```
-// fn foo<T: Clone +<|> Copy>() { }
+// fn foo<T: Clone +$0 Copy>() { }
 // ```
 // ->
 // ```
@@ -52,19 +52,19 @@ mod tests {
    #[test]
    fn flip_trait_bound_assist_available() {
-        check_assist_target(flip_trait_bound, "struct S<T> where T: A <|>+ B + C { }", "+")
+        check_assist_target(flip_trait_bound, "struct S<T> where T: A $0+ B + C { }", "+")
    }
    #[test]
    fn flip_trait_bound_not_applicable_for_single_trait_bound() {
-        check_assist_not_applicable(flip_trait_bound, "struct S<T> where T: <|>A { }")
+        check_assist_not_applicable(flip_trait_bound, "struct S<T> where T: $0A { }")
    }
    #[test]
    fn flip_trait_bound_works_for_struct() {
        check_assist(
            flip_trait_bound,
-            "struct S<T> where T: A <|>+ B { }",
+            "struct S<T> where T: A $0+ B { }",
            "struct S<T> where T: B + A { }",
        )
    }
@@ -73,21 +73,21 @@ mod tests {
    fn flip_trait_bound_works_for_trait_impl() {
        check_assist(
            flip_trait_bound,
-            "impl X for S<T> where T: A +<|> B { }",
+            "impl X for S<T> where T: A +$0 B { }",
            "impl X for S<T> where T: B + A { }",
        )
    }
    #[test]
    fn flip_trait_bound_works_for_fn() {
-        check_assist(flip_trait_bound, "fn f<T: A <|>+ B>(t: T) { }", "fn f<T: B + A>(t: T) { }")
+        check_assist(flip_trait_bound, "fn f<T: A $0+ B>(t: T) { }", "fn f<T: B + A>(t: T) { }")
    }
    #[test]
    fn flip_trait_bound_works_for_fn_where_clause() {
        check_assist(
            flip_trait_bound,
-            "fn f<T>(t: T) where T: A +<|> B { }",
+            "fn f<T>(t: T) where T: A +$0 B { }",
            "fn f<T>(t: T) where T: B + A { }",
        )
    }
@@ -96,7 +96,7 @@ mod tests {
    fn flip_trait_bound_works_for_lifetime() {
        check_assist(
            flip_trait_bound,
-            "fn f<T>(t: T) where T: A <|>+ 'static { }",
+            "fn f<T>(t: T) where T: A $0+ 'static { }",
            "fn f<T>(t: T) where T: 'static + A { }",
        )
    }
@@ -105,7 +105,7 @@ mod tests {
    fn flip_trait_bound_works_for_complex_bounds() {
        check_assist(
            flip_trait_bound,
-            "struct S<T> where T: A<T> <|>+ b_mod::B<T> + C<T> { }",
+            "struct S<T> where T: A<T> $0+ b_mod::B<T> + C<T> { }",
            "struct S<T> where T: b_mod::B<T> + A<T> + C<T> { }",
        )
    }
@@ -114,7 +114,7 @@ mod tests {
    fn flip_trait_bound_works_for_long_bounds() {
        check_assist(
            flip_trait_bound,
-            "struct S<T> where T: A + B + C + D + E + F +<|> G + H + I + J { }",
+            "struct S<T> where T: A + B + C + D + E + F +$0 G + H + I + J { }",
            "struct S<T> where T: A + B + C + D + E + G + F + H + I + J { }",
        )
    }
diff --git a/crates/assists/src/handlers/generate_default_from_enum_variant.rs b/crates/assists/src/handlers/generate_default_from_enum_variant.rs
index bcea46735..6a2ab9596 100644
--- a/crates/assists/src/handlers/generate_default_from_enum_variant.rs
+++ b/crates/assists/src/handlers/generate_default_from_enum_variant.rs
@@ -12,7 +12,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // enum Version {
 //  Undefined,
-//  Minor<|>,
+//  Minor$0,
 //  Major,
 // }
 // ```
@@ -108,7 +108,7 @@ mod tests {
            r#"
 enum Variant {
    Undefined,
-    Minor<|>,
+    Minor$0,
    Major,
 }"#,
            r#"enum Variant {
@@ -132,7 +132,7 @@ impl Default for Variant {
            r#"
 enum Variant {
    Undefined,
-    Minor<|>,
+    Minor$0,
    Major,
 }
@@ -151,7 +151,7 @@ impl Default for Variant {
            r#"
 enum Variant {
    Undefined,
-    Minor(u32)<|>,
+    Minor(u32)$0,
    Major,
 }"#,
        );
@@ -161,7 +161,7 @@ enum Variant {
    fn test_generate_default_from_variant_with_one_variant() {
        check_assist(
            generate_default_from_enum_variant,
-            r#"enum Variant { Undefi<|>ned }"#,
+            r#"enum Variant { Undefi$0ned }"#,
            r#"
 enum Variant { Undefined }
diff --git a/crates/assists/src/handlers/generate_derive.rs b/crates/assists/src/handlers/generate_derive.rs
index 314504e15..f876b7684 100644
--- a/crates/assists/src/handlers/generate_derive.rs
+++ b/crates/assists/src/handlers/generate_derive.rs
@@ -13,7 +13,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // struct Point {
 //     x: u32,
-//     y: u32,<|>
+//     y: u32,$0
 // }
 // ```
 // ->
@@ -76,12 +76,12 @@ mod tests {
    fn add_derive_new() {
        check_assist(
            generate_derive,
-            "struct Foo { a: i32, <|>}",
+            "struct Foo { a: i32, $0}",
            "#[derive($0)]\nstruct Foo { a: i32, }",
        );
        check_assist(
            generate_derive,
-            "struct Foo { <|> a: i32, }",
+            "struct Foo { $0 a: i32, }",
            "#[derive($0)]\nstruct Foo {  a: i32, }",
        );
    }
@@ -90,7 +90,7 @@ mod tests {
    fn add_derive_existing() {
        check_assist(
            generate_derive,
-            "#[derive(Clone)]\nstruct Foo { a: i32<|>, }",
+            "#[derive(Clone)]\nstruct Foo { a: i32$0, }",
            "#[derive(Clone$0)]\nstruct Foo { a: i32, }",
        );
    }
@@ -102,7 +102,7 @@ mod tests {
            "
 /// `Foo` is a pretty important struct.
 /// It does stuff.
-struct Foo { a: i32<|>, }
+struct Foo { a: i32$0, }
            ",
            "
 /// `Foo` is a pretty important struct.
@@ -121,7 +121,7 @@ struct Foo { a: i32, }
 struct SomeThingIrrelevant;
 /// `Foo` is a pretty important struct.
 /// It does stuff.
-struct Foo { a: i32<|>, }
+struct Foo { a: i32$0, }
 struct EvenMoreIrrelevant;
            ",
            "/// `Foo` is a pretty important struct.
diff --git a/crates/assists/src/handlers/generate_from_impl_for_enum.rs b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
index 3c374e5d9..d9af6ab11 100644
--- a/crates/assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
@@ -10,7 +10,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Adds a From impl for an enum variant with one tuple field.
 //
 // ```
-// enum A { <|>One(u32) }
+// enum A { $0One(u32) }
 // ```
 // ->
 // ```
@@ -101,7 +101,7 @@ mod tests {
    fn test_generate_from_impl_for_enum() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum A { <|>One(u32) }",
+            "enum A { $0One(u32) }",
            r#"enum A { One(u32) }
 impl From<u32> for A {
@@ -116,7 +116,7 @@ impl From<u32> for A {
    fn test_generate_from_impl_for_enum_complicated_path() {
        check_assist(
            generate_from_impl_for_enum,
-            r#"enum A { <|>One(foo::bar::baz::Boo) }"#,
+            r#"enum A { $0One(foo::bar::baz::Boo) }"#,
            r#"enum A { One(foo::bar::baz::Boo) }
 impl From<foo::bar::baz::Boo> for A {
@@ -135,17 +135,17 @@ impl From<foo::bar::baz::Boo> for A {
    #[test]
    fn test_add_from_impl_no_element() {
-        check_not_applicable("enum A { <|>One }");
+        check_not_applicable("enum A { $0One }");
    }
    #[test]
    fn test_add_from_impl_more_than_one_element_in_tuple() {
-        check_not_applicable("enum A { <|>One(u32, String) }");
+        check_not_applicable("enum A { $0One(u32, String) }");
    }
    #[test]
    fn test_add_from_impl_struct_variant() {
-        check_not_applicable("enum A { <|>One { x: u32 } }");
+        check_not_applicable("enum A { $0One { x: u32 } }");
    }
    #[test]
@@ -153,7 +153,7 @@ impl From<foo::bar::baz::Boo> for A {
        mark::check!(test_add_from_impl_already_exists);
        check_not_applicable(
            r#"
-enum A { <|>One(u32), }
+enum A { $0One(u32), }
 impl From<u32> for A {
    fn from(v: u32) -> Self {
@@ -168,7 +168,7 @@ impl From<u32> for A {
    fn test_add_from_impl_different_variant_impl_exists() {
        check_assist(
            generate_from_impl_for_enum,
-            r#"enum A { <|>One(u32), Two(String), }
+            r#"enum A { $0One(u32), Two(String), }
 impl From<String> for A {
    fn from(v: String) -> Self {
diff --git a/crates/assists/src/handlers/generate_function.rs b/crates/assists/src/handlers/generate_function.rs
index f4cf155b6..06ac85f67 100644
--- a/crates/assists/src/handlers/generate_function.rs
+++ b/crates/assists/src/handlers/generate_function.rs
@@ -1,5 +1,5 @@
 use hir::HirDisplay;
-use ide_db::base_db::FileId;
+use ide_db::{base_db::FileId, helpers::SnippetCap};
 use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::{
    ast::{
@@ -11,7 +11,6 @@ use syntax::{
 };
 use crate::{
-    assist_config::SnippetCap,
    utils::{render_snippet, Cursor},
    AssistContext, AssistId, AssistKind, Assists,
 };
@@ -24,7 +23,7 @@ use crate::{
 // struct Baz;
 // fn baz() -> Baz { Baz }
 // fn foo() {
-//     bar<|>("", baz());
+//     bar$0("", baz());
 // }
 //
 // ```
@@ -343,7 +342,7 @@ mod tests {
            generate_function,
            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();
+    let usages = def.usages(&ctx.sema).all();
-    if refs.is_empty() {
+    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()];
+    let wrap_in_parens = usages
+        .references
-    for (i, desc) in refs.iter().enumerate() {
+        .values()
-        let usage_node = ctx
+        .flatten()
-            .covering_node_for_range(desc.file_range.range)
+        .map(|&FileReference { range, .. }| {
-            .ancestors()
+            let usage_node =
-            .find_map(ast::PathExpr::cast)?;
+                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_option = usage_node.syntax().parent().and_then(ast::Expr::cast);
-        let usage_parent = match usage_parent_option {
+            let usage_parent = match usage_parent_option {
-            Some(u) => u,
+                Some(u) => u,
-            None => {
+                None => return Ok(false),
-                wrap_in_parens[i] = false;
+            };
-                continue;
-            }
+            Ok(!matches!((&initializer_expr, usage_parent),
-        };
+                (ast::Expr::CallExpr(_), _)
+                | (ast::Expr::IndexExpr(_), _)
-        wrap_in_parens[i] = match (&initializer_expr, usage_parent) {
+                | (ast::Expr::MethodCallExpr(_), _)
-            (ast::Expr::CallExpr(_), _)
+                | (ast::Expr::FieldExpr(_), _)
-            | (ast::Expr::IndexExpr(_), _)
+                | (ast::Expr::TryExpr(_), _)
-            | (ast::Expr::MethodCallExpr(_), _)
+                | (ast::Expr::RefExpr(_), _)
-            | (ast::Expr::FieldExpr(_), _)
+                | (ast::Expr::Literal(_), _)
-            | (ast::Expr::TryExpr(_), _)
+                | (ast::Expr::TupleExpr(_), _)
-            | (ast::Expr::RefExpr(_), _)
+                | (ast::Expr::ArrayExpr(_), _)
-            | (ast::Expr::Literal(_), _)
+                | (ast::Expr::ParenExpr(_), _)
-            | (ast::Expr::TupleExpr(_), _)
+                | (ast::Expr::PathExpr(_), _)
-            | (ast::Expr::ArrayExpr(_), _)
+                | (ast::Expr::BlockExpr(_), _)
-            | (ast::Expr::ParenExpr(_), _)
+                | (ast::Expr::EffectExpr(_), _)
-            | (ast::Expr::PathExpr(_), _)
+                | (_, ast::Expr::CallExpr(_))
-            | (ast::Expr::BlockExpr(_), _)
+                | (_, ast::Expr::TupleExpr(_))
-            | (ast::Expr::EffectExpr(_), _)
+                | (_, ast::Expr::ArrayExpr(_))
-            | (_, ast::Expr::CallExpr(_))
+                | (_, ast::Expr::ParenExpr(_))
-            | (_, ast::Expr::TupleExpr(_))
+                | (_, ast::Expr::ForExpr(_))
-            | (_, ast::Expr::ArrayExpr(_))
+                | (_, ast::Expr::WhileExpr(_))
-            | (_, ast::Expr::ParenExpr(_))
+                | (_, ast::Expr::BreakExpr(_))
-            | (_, ast::Expr::ForExpr(_))
+                | (_, ast::Expr::ReturnExpr(_))
-            | (_, ast::Expr::WhileExpr(_))
+                | (_, ast::Expr::MatchExpr(_))
-            | (_, ast::Expr::BreakExpr(_))
+            ))
-            | (_, ast::Expr::ReturnExpr(_))
+        })
-            | (_, ast::Expr::MatchExpr(_)) => false,
+        .collect::<Result<Vec<_>, _>>()?;
-            _ => true,
-        };
-    }
    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<'_>$0 {"#);
-        check_assist_not_applicable(introduce_named_lifetime, r#"impl Cursor<|><'_> {"#);
+        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#"impl Cursor<'a$0> {"#);
-        check_assist_not_applicable(introduce_named_lifetime, r#"fn my_fun<'a>() -> X<'a<|>>"#);
+        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 != T![:] // paths
-                    && (symbol_kind != SyntaxKind::DOT // field/method access
+                    && (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 != T![?] // try operator
-                    && (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW)
+                    && (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![$01 + 1]", "1 + 1");
-        check_assist(remove_dbg, "dbg!{<|>1 + 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, "$0vec![1, 2, 3]");
-        check_assist_not_applicable(remove_dbg, "<|>dbg(5, 6, 7)");
+        check_assist_not_applicable(remove_dbg, "$0dbg(5, 6, 7)");
-        check_assist_not_applicable(remove_dbg, "<|>dbg!(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 = $0dbg!(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"#);
    }
    #[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() {
+            for (file_id, references) in fn_def.usages(&ctx.sema).all() {
-                process_usage(ctx, builder, usage, param_position);
+                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 source_file = ctx.sema.parse(file_id);
-    let call_expr: ast::CallExpr =
+    builder.edit_file(file_id);
-        find_node_at_range(source_file.syntax(), usage.file_range.range)?;
+    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)?;
+    Some(range_to_remove(arg.syntax()))
-    builder.edit_file(usage.file_range.file_id);
-    builder.delete(range_to_remove(arg.syntax()));
-    Some(())
 }
 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::{
-use ide_db::source_change::FileSystemEdit;
+    base_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt},
-use ide_db::RootDatabase;
+    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::{
+use crate::ast_transform::{self, AstTransform, QualifyPaths, SubstituteTypeParams};
-    assist_config::SnippetCap,
-    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 {
+        // Note: This throws away items with no source.
-            hir::AssocItem::Function(i) => ast::AssocItem::Fn(i.source(db).value),
+        .filter_map(|i| {
-            hir::AssocItem::TypeAlias(i) => ast::AssocItem::TypeAlias(i.source(db).value),
+            let item = match i {
-            hir::AssocItem::Const(i) => ast::AssocItem::Const(i.source(db).value),
+                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 {