48 files changed, 2992 insertions, 2362 deletions
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 4d483580d..bb28cca4d 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 [dependencies]
 either = "1.5.3"
 indexmap = "1.4.0"
-itertools = "0.9.0"
+itertools = "0.10.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 oorandom = "11.1.2"
@@ -36,4 +36,4 @@ completion = { path = "../completion", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 [dev-dependencies]
-expect-test = "1.0"
+expect-test = "1.1"
diff --git a/crates/ide/src/call_hierarchy.rs b/crates/ide/src/call_hierarchy.rs
index 60e0cd4ad..e8999a7f3 100644
--- a/crates/ide/src/call_hierarchy.rs
+++ b/crates/ide/src/call_hierarchy.rs
@@ -5,10 +5,10 @@ use indexmap::IndexMap;
 use hir::Semantics;
 use ide_db::call_info::FnCallNode;
 use ide_db::RootDatabase;
-use syntax::{ast, match_ast, AstNode, TextRange};
+use syntax::{ast, AstNode, TextRange};
 use crate::{
-    display::ToNav, goto_definition, references, FilePosition, NavigationTarget, RangeInfo,
+    display::TryToNav, goto_definition, references, FilePosition, NavigationTarget, RangeInfo,
 };
 #[derive(Debug, Clone)]
@@ -47,28 +47,23 @@ pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Optio
    let mut calls = CallLocations::default();
-    for reference in refs.info.references() {
+    for (&file_id, references) in refs.info.references().iter() {
-        let file_id = reference.file_range.file_id;
        let file = sema.parse(file_id);
        let file = file.syntax();
-        let token = file.token_at_offset(reference.file_range.range.start()).next()?;
+        for reference in references {
-        let token = sema.descend_into_macros(token);
+            let token = file.token_at_offset(reference.range.start()).next()?;
-        let syntax = token.parent();
+            let token = sema.descend_into_macros(token);
+            let syntax = token.parent();
-        // This target is the containing function
-        if let Some(nav) = syntax.ancestors().find_map(|node| {
+            // This target is the containing function
-            match_ast! {
+            if let Some(nav) = syntax.ancestors().find_map(|node| {
-                match node {
+                let fn_ = ast::Fn::cast(node)?;
-                    ast::Fn(it) => {
+                let def = sema.to_def(&fn_)?;
-                        let def = sema.to_def(&it)?;
+                def.try_to_nav(sema.db)
-                        Some(def.to_nav(sema.db))
+            }) {
-                    },
+                let relative_range = reference.range;
-                    _ => None,
+                calls.add(&nav, relative_range);
-                }
            }
-        }) {
-            let relative_range = reference.file_range.range;
-            calls.add(&nav, relative_range);
        }
    }
@@ -91,29 +86,21 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio
        .filter_map(|node| FnCallNode::with_node_exact(&node))
        .filter_map(|call_node| {
            let name_ref = call_node.name_ref()?;
+            let func_target = match call_node {
-            if let Some(func_target) = match &call_node {
                FnCallNode::CallExpr(expr) => {
                    //FIXME: Type::as_callable is broken
                    let callable = sema.type_of_expr(&expr.expr()?)?.as_callable(db)?;
                    match callable.kind() {
-                        hir::CallableKind::Function(it) => {
+                        hir::CallableKind::Function(it) => it.try_to_nav(db),
-                            let fn_def: hir::Function = it.into();
-                            let nav = fn_def.to_nav(db);
-                            Some(nav)
-                        }
                        _ => None,
                    }
                }
                FnCallNode::MethodCallExpr(expr) => {
                    let function = sema.resolve_method_call(&expr)?;
-                    Some(function.to_nav(db))
+                    function.try_to_nav(db)
                }
-            } {
+            }?;
-                Some((func_target, name_ref.syntax().text_range()))
+            Some((func_target, name_ref.syntax().text_range()))
-            } else {
-                None
-            }
        })
        .for_each(|(nav, range)| calls.add(&nav, range));
@@ -178,7 +165,7 @@ mod tests {
 //- /lib.rs
 fn callee() {}
 fn caller() {
-    call<|>ee();
+    call$0ee();
 }
 "#,
            "callee Function FileId(0) 0..14 3..9",
@@ -192,7 +179,7 @@ fn caller() {
        check_hierarchy(
            r#"
 //- /lib.rs
-fn call<|>ee() {}
+fn call$0ee() {}
 fn caller() {
    callee();
 }
@@ -210,7 +197,7 @@ fn caller() {
 //- /lib.rs
 fn callee() {}
 fn caller() {
-    call<|>ee();
+    call$0ee();
    callee();
 }
 "#,
@@ -227,7 +214,7 @@ fn caller() {
 //- /lib.rs
 fn callee() {}
 fn caller1() {
-    call<|>ee();
+    call$0ee();
 }
 fn caller2() {
@@ -250,7 +237,7 @@ fn caller2() {
 //- /lib.rs cfg:test
 fn callee() {}
 fn caller1() {
-    call<|>ee();
+    call$0ee();
 }
 #[cfg(test)]
@@ -281,7 +268,7 @@ mod foo;
 use foo::callee;
 fn caller() {
-    call<|>ee();
+    call$0ee();
 }
 //- /foo/mod.rs
@@ -299,7 +286,7 @@ pub fn callee() {}
            r#"
 //- /lib.rs
 fn callee() {}
-fn call<|>er() {
+fn call$0er() {
    callee();
    callee();
 }
@@ -318,7 +305,7 @@ fn call<|>er() {
 mod foo;
 use foo::callee;
-fn call<|>er() {
+fn call$0er() {
    callee();
 }
@@ -337,7 +324,7 @@ pub fn callee() {}
            r#"
 //- /lib.rs
 fn caller1() {
-    call<|>er2();
+    call$0er2();
 }
 fn caller2() {
@@ -365,7 +352,7 @@ fn a() {
 fn b() {}
 fn main() {
-    a<|>()
+    a$0()
 }
 "#,
            "a Function FileId(0) 0..18 3..4",
@@ -376,7 +363,7 @@ fn main() {
        check_hierarchy(
            r#"
 fn a() {
-    b<|>()
+    b$0()
 }
 fn b() {}
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 79d126ff2..055c0a79c 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -125,7 +125,7 @@ pub(crate) fn diagnostics(
        .on::<hir::diagnostics::MissingFields, _>(|d| {
            res.borrow_mut().push(diagnostic_with_fix(d, &sema));
        })
-        .on::<hir::diagnostics::MissingOkInTailExpr, _>(|d| {
+        .on::<hir::diagnostics::MissingOkOrSomeInTailExpr, _>(|d| {
            res.borrow_mut().push(diagnostic_with_fix(d, &sema));
        })
        .on::<hir::diagnostics::NoSuchField, _>(|d| {
@@ -305,6 +305,40 @@ mod tests {
    }
    #[test]
+    fn test_wrap_return_type_option() {
+        check_fix(
+            r#"
+//- /main.rs crate:main deps:core
+use core::option::Option::{self, Some, None};
+fn div(x: i32, y: i32) -> Option<i32> {
+    if y == 0 {
+        return None;
+    }
+    x / y$0
+}
+//- /core/lib.rs crate:core
+pub mod result {
+    pub enum Result<T, E> { Ok(T), Err(E) }
+}
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
+"#,
+            r#"
+use core::option::Option::{self, Some, None};
+fn div(x: i32, y: i32) -> Option<i32> {
+    if y == 0 {
+        return None;
+    }
+    Some(x / y)
+}
+"#,
+        );
+    }
+    #[test]
    fn test_wrap_return_type() {
        check_fix(
            r#"
@@ -315,12 +349,15 @@ fn div(x: i32, y: i32) -> Result<i32, ()> {
    if y == 0 {
        return Err(());
    }
-    x / y<|>
+    x / y$0
 }
 //- /core/lib.rs crate:core
 pub mod result {
    pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
            r#"
 use core::result::Result::{self, Ok, Err};
@@ -346,12 +383,15 @@ fn div<T>(x: T) -> Result<T, i32> {
    if x == 0 {
        return Err(7);
    }
-    <|>x
+    $0x
 }
 //- /core/lib.rs crate:core
 pub mod result {
    pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
            r#"
 use core::result::Result::{self, Ok, Err};
@@ -379,12 +419,15 @@ fn div(x: i32, y: i32) -> MyResult<i32> {
    if y == 0 {
        return Err(());
    }
-    x <|>/ y
+    x $0/ y
 }
 //- /core/lib.rs crate:core
 pub mod result {
    pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
            r#"
 use core::result::Result::{self, Ok, Err};
@@ -414,12 +457,15 @@ fn foo() -> Result<(), i32> { 0 }
 pub mod result {
    pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
        );
    }
    #[test]
-    fn test_wrap_return_type_not_applicable_when_return_type_is_not_result() {
+    fn test_wrap_return_type_not_applicable_when_return_type_is_not_result_or_option() {
        check_no_diagnostics(
            r#"
 //- /main.rs crate:main deps:core
@@ -433,6 +479,9 @@ fn foo() -> SomeOtherEnum { 0 }
 pub mod result {
    pub enum Result<T, E> { Ok(T), Err(E) }
 }
+pub mod option {
+    pub enum Option<T> { Some(T), None }
+}
 "#,
        );
    }
@@ -444,7 +493,7 @@ pub mod result {
 struct TestStruct { one: i32, two: i64 }
 fn test_fn() {
-    let s = TestStruct {<|>};
+    let s = TestStruct {$0};
 }
 "#,
            r#"
@@ -464,7 +513,7 @@ fn test_fn() {
 struct TestStruct { one: i32 }
 impl TestStruct {
-    fn test_fn() { let s = Self {<|>}; }
+    fn test_fn() { let s = Self {$0}; }
 }
 "#,
            r#"
@@ -487,7 +536,7 @@ enum Expr {
 impl Expr {
    fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-        Expr::Bin {<|> }
+        Expr::Bin {$0 }
    }
 }
 "#,
@@ -512,7 +561,7 @@ impl Expr {
 struct TestStruct { one: i32, two: i64 }
 fn test_fn() {
-    let s = TestStruct{ two: 2<|> };
+    let s = TestStruct{ two: 2$0 };
 }
 "#,
            r"
@@ -608,7 +657,7 @@ fn here() {}
 macro_rules! id { ($($tt:tt)*) => { $($tt)*}; }
 fn main() {
-    let _x = id![Foo { a: <|>42 }];
+    let _x = id![Foo { a: $042 }];
 }
 pub struct Foo { pub a: i32, pub b: i32 }
@@ -663,7 +712,7 @@ mod a {
        check_fix(
            r"
            mod b {}
-            use {<|>b};
+            use {$0b};
            ",
            r"
            mod b {}
@@ -673,7 +722,7 @@ mod a {
        check_fix(
            r"
            mod b {}
-            use {b<|>};
+            use {b$0};
            ",
            r"
            mod b {}
@@ -683,7 +732,7 @@ mod a {
        check_fix(
            r"
            mod a { mod c {} }
-            use a::{c<|>};
+            use a::{c$0};
            ",
            r"
            mod a { mod c {} }
@@ -693,7 +742,7 @@ mod a {
        check_fix(
            r"
            mod a {}
-            use a::{self<|>};
+            use a::{self$0};
            ",
            r"
            mod a {}
@@ -703,7 +752,7 @@ mod a {
        check_fix(
            r"
            mod a { mod c {} mod d { mod e {} } }
-            use a::{c, d::{e<|>}};
+            use a::{c, d::{e$0}};
            ",
            r"
            mod a { mod c {} mod d { mod e {} } }
@@ -717,7 +766,7 @@ mod a {
        check_fix(
            r"
 fn main() {
-    Foo { bar: 3, baz<|>: false};
+    Foo { bar: 3, baz$0: false};
 }
 struct Foo {
    bar: i32
@@ -743,7 +792,7 @@ struct Foo {
 mod foo;
 fn main() {
-    foo::Foo { bar: 3, <|>baz: false};
+    foo::Foo { bar: 3, $0baz: false};
 }
 //- /foo.rs
 struct Foo {
@@ -777,7 +826,7 @@ struct Foo {
    fn test_rename_incorrect_case() {
        check_fix(
            r#"
-pub struct test_struct<|> { one: i32 }
+pub struct test_struct$0 { one: i32 }
 pub fn some_fn(val: test_struct) -> test_struct {
    test_struct { one: val.one + 1 }
@@ -794,7 +843,7 @@ pub fn some_fn(val: TestStruct) -> TestStruct {
        check_fix(
            r#"
-pub fn some_fn(NonSnakeCase<|>: u8) -> u8 {
+pub fn some_fn(NonSnakeCase$0: u8) -> u8 {
    NonSnakeCase
 }
 "#,
@@ -807,7 +856,7 @@ pub fn some_fn(non_snake_case: u8) -> u8 {
        check_fix(
            r#"
-pub fn SomeFn<|>(val: u8) -> u8 {
+pub fn SomeFn$0(val: u8) -> u8 {
    if val != 0 { SomeFn(val - 1) } else { val }
 }
 "#,
@@ -821,7 +870,7 @@ pub fn some_fn(val: u8) -> u8 {
        check_fix(
            r#"
 fn some_fn() {
-    let whatAWeird_Formatting<|> = 10;
+    let whatAWeird_Formatting$0 = 10;
    another_func(whatAWeird_Formatting);
 }
 "#,
@@ -839,7 +888,7 @@ fn some_fn() {
        check_no_diagnostics(
            r#"
 fn foo() {
-    const ANOTHER_ITEM<|>: &str = "some_item";
+    const ANOTHER_ITEM$0: &str = "some_item";
 }
 "#,
        );
@@ -852,7 +901,7 @@ fn foo() {
 pub struct TestStruct;
 impl TestStruct {
-    pub fn SomeFn<|>() -> TestStruct {
+    pub fn SomeFn$0() -> TestStruct {
        TestStruct
    }
 }
@@ -871,7 +920,7 @@ impl TestStruct {
    #[test]
    fn test_single_incorrect_case_diagnostic_in_function_name_issue_6970() {
-        let input = r#"fn FOO<|>() {}"#;
+        let input = r#"fn FOO$0() {}"#;
        let expected = r#"fn foo() {}"#;
        let (analysis, file_position) = fixture::position(input);
diff --git a/crates/ide/src/diagnostics/field_shorthand.rs b/crates/ide/src/diagnostics/field_shorthand.rs
index f41bcd619..16c6ea827 100644
--- a/crates/ide/src/diagnostics/field_shorthand.rs
+++ b/crates/ide/src/diagnostics/field_shorthand.rs
@@ -120,7 +120,7 @@ fn main() { A { 0: 0 } }
 struct A { a: &'static str }
 fn main() {
    let a = "haha";
-    A { a<|>: a }
+    A { a$0: a }
 }
 "#,
            r#"
@@ -138,7 +138,7 @@ struct A { a: &'static str, b: &'static str }
 fn main() {
    let a = "haha";
    let b = "bb";
-    A { a<|>: a, b }
+    A { a$0: a, b }
 }
 "#,
            r#"
@@ -171,7 +171,7 @@ fn f(a: A) { let A { 0: 0 } = a; }
            r#"
 struct A { a: &'static str }
 fn f(a: A) {
-    let A { a<|>: a } = a;
+    let A { a$0: a } = a;
 }
 "#,
            r#"
@@ -186,7 +186,7 @@ fn f(a: A) {
            r#"
 struct A { a: &'static str, b: &'static str }
 fn f(a: A) {
-    let A { a<|>: a, b } = a;
+    let A { a$0: a, b } = a;
 }
 "#,
            r#"
diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs
index d79f5c170..d7ad88ed5 100644
--- a/crates/ide/src/diagnostics/fixes.rs
+++ b/crates/ide/src/diagnostics/fixes.rs
@@ -3,7 +3,7 @@
 use hir::{
    db::AstDatabase,
    diagnostics::{
-        Diagnostic, IncorrectCase, MissingFields, MissingOkInTailExpr, NoSuchField,
+        Diagnostic, IncorrectCase, MissingFields, MissingOkOrSomeInTailExpr, NoSuchField,
        RemoveThisSemicolon, UnresolvedModule,
    },
    HasSource, HirDisplay, InFile, Semantics, VariantDef,
@@ -94,15 +94,17 @@ impl DiagnosticWithFix for MissingFields {
    }
 }
-impl DiagnosticWithFix for MissingOkInTailExpr {
+impl DiagnosticWithFix for MissingOkOrSomeInTailExpr {
    fn fix(&self, sema: &Semantics<RootDatabase>) -> Option<Fix> {
        let root = sema.db.parse_or_expand(self.file)?;
        let tail_expr = self.expr.to_node(&root);
        let tail_expr_range = tail_expr.syntax().text_range();
-        let edit = TextEdit::replace(tail_expr_range, format!("Ok({})", tail_expr.syntax()));
+        let replacement = format!("{}({})", self.required, tail_expr.syntax());
+        let edit = TextEdit::replace(tail_expr_range, replacement);
        let source_change =
            SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into();
-        Some(Fix::new("Wrap with ok", source_change, tail_expr_range))
+        let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" };
+        Some(Fix::new(name, source_change, tail_expr_range))
    }
 }
@@ -156,20 +158,20 @@ fn missing_record_expr_field_fix(
    let record_fields = match VariantDef::from(def_id) {
        VariantDef::Struct(s) => {
            module = s.module(sema.db);
-            let source = s.source(sema.db);
+            let source = s.source(sema.db)?;
            def_file_id = source.file_id;
            let fields = source.value.field_list()?;
            record_field_list(fields)?
        }
        VariantDef::Union(u) => {
            module = u.module(sema.db);
-            let source = u.source(sema.db);
+            let source = u.source(sema.db)?;
            def_file_id = source.file_id;
            source.value.record_field_list()?
        }
        VariantDef::Variant(e) => {
            module = e.module(sema.db);
-            let source = e.source(sema.db);
+            let source = e.source(sema.db)?;
            def_file_id = source.file_id;
            let fields = source.value.field_list()?;
            record_field_list(fields)?
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs
index 6431e7d6d..4eecae697 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/display/navigation_target.rs
@@ -24,6 +24,7 @@ pub enum SymbolKind {
    Impl,
    Field,
    TypeParam,
+    ConstParam,
    LifetimeParam,
    ValueParam,
    SelfParam,
@@ -209,21 +210,12 @@ impl ToNav for FileSymbol {
 impl TryToNav for Definition {
    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
        match self {
-            Definition::Macro(it) => {
+            Definition::Macro(it) => it.try_to_nav(db),
-                // FIXME: Currently proc-macro do not have ast-node,
+            Definition::Field(it) => it.try_to_nav(db),
-                // such that it does not have source
-                // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
-                if it.is_proc_macro() {
-                    return None;
-                }
-                Some(it.to_nav(db))
-            }
-            Definition::Field(it) => Some(it.to_nav(db)),
            Definition::ModuleDef(it) => it.try_to_nav(db),
-            Definition::SelfType(it) => Some(it.to_nav(db)),
+            Definition::SelfType(it) => it.try_to_nav(db),
            Definition::Local(it) => Some(it.to_nav(db)),
-            Definition::TypeParam(it) => Some(it.to_nav(db)),
+            Definition::GenericParam(it) => it.try_to_nav(db),
-            Definition::LifetimeParam(it) => Some(it.to_nav(db)),
            Definition::Label(it) => Some(it.to_nav(db)),
        }
    }
@@ -231,18 +223,17 @@ impl TryToNav for Definition {
 impl TryToNav for hir::ModuleDef {
    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let res = match self {
+        match self {
-            hir::ModuleDef::Module(it) => it.to_nav(db),
+            hir::ModuleDef::Module(it) => Some(it.to_nav(db)),
-            hir::ModuleDef::Function(it) => it.to_nav(db),
+            hir::ModuleDef::Function(it) => it.try_to_nav(db),
-            hir::ModuleDef::Adt(it) => it.to_nav(db),
+            hir::ModuleDef::Adt(it) => it.try_to_nav(db),
-            hir::ModuleDef::Variant(it) => it.to_nav(db),
+            hir::ModuleDef::Variant(it) => it.try_to_nav(db),
-            hir::ModuleDef::Const(it) => it.to_nav(db),
+            hir::ModuleDef::Const(it) => it.try_to_nav(db),
-            hir::ModuleDef::Static(it) => it.to_nav(db),
+            hir::ModuleDef::Static(it) => it.try_to_nav(db),
-            hir::ModuleDef::Trait(it) => it.to_nav(db),
+            hir::ModuleDef::Trait(it) => it.try_to_nav(db),
-            hir::ModuleDef::TypeAlias(it) => it.to_nav(db),
+            hir::ModuleDef::TypeAlias(it) => it.try_to_nav(db),
-            hir::ModuleDef::BuiltinType(_) => return None,
+            hir::ModuleDef::BuiltinType(_) => None,
-        };
+        }
-        Some(res)
    }
 }
@@ -277,13 +268,13 @@ impl ToNavFromAst for hir::Trait {
    const KIND: SymbolKind = SymbolKind::Trait;
 }
-impl<D> ToNav for D
+impl<D> TryToNav for D
 where
    D: HasSource + ToNavFromAst + Copy + HasAttrs,
    D::Ast: ast::NameOwner + ShortLabel,
 {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let src = self.source(db);
+        let src = self.source(db)?;
        let mut res = NavigationTarget::from_named(
            db,
            src.as_ref().map(|it| it as &dyn ast::NameOwner),
@@ -291,7 +282,7 @@ where
        );
        res.docs = self.docs(db);
        res.description = src.value.short_label();
-        res
+        Some(res)
    }
 }
@@ -310,9 +301,9 @@ impl ToNav for hir::Module {
    }
 }
-impl ToNav for hir::Impl {
+impl TryToNav for hir::Impl {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let src = self.source(db);
+        let src = self.source(db)?;
        let derive_attr = self.is_builtin_derive(db);
        let frange = if let Some(item) = &derive_attr {
            item.syntax().original_file_range(db)
@@ -325,21 +316,21 @@ impl ToNav for hir::Impl {
            src.value.self_ty().map(|ty| src.with_value(ty.syntax()).original_file_range(db).range)
        };
-        NavigationTarget::from_syntax(
+        Some(NavigationTarget::from_syntax(
            frange.file_id,
            "impl".into(),
            focus_range,
            frange.range,
            SymbolKind::Impl,
-        )
+        ))
    }
 }
-impl ToNav for hir::Field {
+impl TryToNav for hir::Field {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let src = self.source(db);
+        let src = self.source(db)?;
-        match &src.value {
+        let field_source = match &src.value {
            FieldSource::Named(it) => {
                let mut res =
                    NavigationTarget::from_named(db, src.with_value(it), SymbolKind::Field);
@@ -357,13 +348,14 @@ impl ToNav for hir::Field {
                    SymbolKind::Field,
                )
            }
-        }
+        };
+        Some(field_source)
    }
 }
-impl ToNav for hir::MacroDef {
+impl TryToNav for hir::MacroDef {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let src = self.source(db);
+        let src = self.source(db)?;
        log::debug!("nav target {:#?}", src.value.syntax());
        let mut res = NavigationTarget::from_named(
            db,
@@ -371,26 +363,36 @@ impl ToNav for hir::MacroDef {
            SymbolKind::Macro,
        );
        res.docs = self.docs(db);
-        res
+        Some(res)
    }
 }
-impl ToNav for hir::Adt {
+impl TryToNav for hir::Adt {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
        match self {
-            hir::Adt::Struct(it) => it.to_nav(db),
+            hir::Adt::Struct(it) => it.try_to_nav(db),
-            hir::Adt::Union(it) => it.to_nav(db),
+            hir::Adt::Union(it) => it.try_to_nav(db),
-            hir::Adt::Enum(it) => it.to_nav(db),
+            hir::Adt::Enum(it) => it.try_to_nav(db),
        }
    }
 }
-impl ToNav for hir::AssocItem {
+impl TryToNav for hir::AssocItem {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
        match self {
-            AssocItem::Function(it) => it.to_nav(db),
+            AssocItem::Function(it) => it.try_to_nav(db),
-            AssocItem::Const(it) => it.to_nav(db),
+            AssocItem::Const(it) => it.try_to_nav(db),
-            AssocItem::TypeAlias(it) => it.to_nav(db),
+            AssocItem::TypeAlias(it) => it.try_to_nav(db),
+        }
+    }
+}
+impl TryToNav for hir::GenericParam {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        match self {
+            hir::GenericParam::TypeParam(it) => it.try_to_nav(db),
+            hir::GenericParam::ConstParam(it) => it.try_to_nav(db),
+            hir::GenericParam::LifetimeParam(it) => it.try_to_nav(db),
        }
    }
 }
@@ -444,9 +446,9 @@ impl ToNav for hir::Label {
    }
 }
-impl ToNav for hir::TypeParam {
+impl TryToNav for hir::TypeParam {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let src = self.source(db);
+        let src = self.source(db)?;
        let full_range = match &src.value {
            Either::Left(it) => it.syntax().text_range(),
            Either::Right(it) => it.syntax().text_range(),
@@ -455,7 +457,7 @@ impl ToNav for hir::TypeParam {
            Either::Left(_) => None,
            Either::Right(it) => it.name().map(|it| it.syntax().text_range()),
        };
-        NavigationTarget {
+        Some(NavigationTarget {
            file_id: src.file_id.original_file(db),
            name: self.name(db).to_string().into(),
            kind: Some(SymbolKind::TypeParam),
@@ -464,15 +466,15 @@ impl ToNav for hir::TypeParam {
            container_name: None,
            description: None,
            docs: None,
-        }
+        })
    }
 }
-impl ToNav for hir::LifetimeParam {
+impl TryToNav for hir::LifetimeParam {
-    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
-        let src = self.source(db);
+        let src = self.source(db)?;
        let full_range = src.value.syntax().text_range();
-        NavigationTarget {
+        Some(NavigationTarget {
            file_id: src.file_id.original_file(db),
            name: self.name(db).to_string().into(),
            kind: Some(SymbolKind::LifetimeParam),
@@ -481,7 +483,24 @@ impl ToNav for hir::LifetimeParam {
            container_name: None,
            description: None,
            docs: None,
-        }
+        })
+    }
+}
+impl TryToNav for hir::ConstParam {
+    fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
+        let src = self.source(db)?;
+        let full_range = src.value.syntax().text_range();
+        Some(NavigationTarget {
+            file_id: src.file_id.original_file(db),
+            name: self.name(db).to_string().into(),
+            kind: Some(SymbolKind::ConstParam),
+            full_range,
+            focus_range: src.value.name().map(|n| n.syntax().text_range()),
+            container_name: None,
+            description: None,
+            docs: None,
+        })
    }
 }
diff --git a/crates/ide/src/display/short_label.rs b/crates/ide/src/display/short_label.rs
index ea49d9f97..990f740b8 100644
--- a/crates/ide/src/display/short_label.rs
+++ b/crates/ide/src/display/short_label.rs
@@ -87,6 +87,17 @@ impl ShortLabel for ast::Variant {
    }
 }
+impl ShortLabel for ast::ConstParam {
+    fn short_label(&self) -> Option<String> {
+        let mut buf = "const ".to_owned();
+        buf.push_str(self.name()?.text().as_str());
+        if let Some(type_ref) = self.ty() {
+            format_to!(buf, ": {}", type_ref.syntax());
+        }
+        Some(buf)
+    }
+}
 fn short_label_from_ty<T>(node: &T, ty: Option<ast::Type>, prefix: &str) -> Option<String>
 where
    T: NameOwner + VisibilityOwner,
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index e10516f43..de10406bc 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -1,6 +1,6 @@
 //! Resolves and rewrites links in markdown documentation.
-use std::{convert::TryFrom, iter::once};
+use std::{convert::TryFrom, iter::once, ops::Range};
 use itertools::Itertools;
 use pulldown_cmark::{BrokenLink, CowStr, Event, InlineStr, LinkType, Options, Parser, Tag};
@@ -39,7 +39,7 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Defi
        if target.contains("://") {
            (target.to_string(), title.to_string())
        } else {
-            // Two posibilities:
+            // Two possibilities:
            // * path-based links: `../../module/struct.MyStruct.html`
            // * module-based links (AKA intra-doc links): `super::super::module::MyStruct`
            if let Some(rewritten) = rewrite_intra_doc_link(db, *definition, target, title) {
@@ -61,6 +61,30 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Defi
    out
 }
+pub(crate) fn extract_definitions_from_markdown(
+    markdown: &str,
+) -> Vec<(String, Option<hir::Namespace>, Range<usize>)> {
+    let mut res = vec![];
+    let mut cb = |link: BrokenLink| {
+        Some((
+            /*url*/ link.reference.to_owned().into(),
+            /*title*/ link.reference.to_owned().into(),
+        ))
+    };
+    let doc = Parser::new_with_broken_link_callback(markdown, Options::empty(), Some(&mut cb));
+    for (event, range) in doc.into_offset_iter() {
+        match event {
+            Event::Start(Tag::Link(_link_type, ref target, ref title)) => {
+                let link = if target.is_empty() { title } else { target };
+                let (link, ns) = parse_link(link);
+                res.push((link.to_string(), ns, range));
+            }
+            _ => {}
+        }
+    }
+    res
+}
 /// Remove all links in markdown documentation.
 pub(crate) fn remove_links(markdown: &str) -> String {
    let mut drop_link = false;
@@ -192,8 +216,7 @@ fn rewrite_intra_doc_link(
        Definition::Field(it) => it.resolve_doc_path(db, link, ns),
        Definition::SelfType(_)
        | Definition::Local(_)
-        | Definition::TypeParam(_)
+        | Definition::GenericParam(_)
-        | Definition::LifetimeParam(_)
        | Definition::Label(_) => return None,
    }?;
    let krate = resolved.module(db)?.krate();
@@ -419,7 +442,7 @@ fn get_symbol_fragment(db: &dyn HirDatabase, field_or_assoc: &FieldOrAssocItem)
                    function.as_assoc_item(db).map(|assoc| assoc.container(db)),
                    Some(AssocItemContainer::Trait(..))
                );
-                // This distinction may get more complicated when specialisation is available.
+                // This distinction may get more complicated when specialization is available.
                // Rustdoc makes this decision based on whether a method 'has defaultness'.
                // Currently this is only the case for provided trait methods.
                if is_trait_method && !function.has_body(db) {
@@ -463,7 +486,7 @@ mod tests {
    fn test_doc_url_struct() {
        check(
            r#"
-pub struct Fo<|>o;
+pub struct Fo$0o;
 "#,
            expect![[r#"https://docs.rs/test/*/test/struct.Foo.html"#]],
        );
@@ -473,7 +496,7 @@ pub struct Fo<|>o;
    fn test_doc_url_fn() {
        check(
            r#"
-pub fn fo<|>o() {}
+pub fn fo$0o() {}
 "#,
            expect![[r##"https://docs.rs/test/*/test/fn.foo.html#method.foo"##]],
        );
@@ -486,7 +509,7 @@ pub fn fo<|>o() {}
 pub struct Foo;
 impl Foo {
-    pub fn met<|>hod() {}
+    pub fn met$0hod() {}
 }
 "#,
@@ -499,7 +522,7 @@ impl Foo {
        check(
            r#"
 pub trait Bar {
-    fn met<|>hod() {}
+    fn met$0hod() {}
 }
 "#,
@@ -512,7 +535,7 @@ pub trait Bar {
        check(
            r#"
 pub trait Foo {
-    fn met<|>hod();
+    fn met$0hod();
 }
 "#,
@@ -525,7 +548,7 @@ pub trait Foo {
        check(
            r#"
 pub struct Foo {
-    pub fie<|>ld: ()
+    pub fie$0ld: ()
 }
 "#,
@@ -538,7 +561,7 @@ pub struct Foo {
        check(
            r#"
 pub mod foo {
-    pub mod ba<|>r {}
+    pub mod ba$0r {}
 }
        "#,
            expect![[r#"https://docs.rs/test/*/test/foo/bar/index.html"#]],
@@ -563,7 +586,7 @@ pub mod wrapper {
 }
 fn foo() {
-    let bar: wrapper::It<|>em;
+    let bar: wrapper::It$0em;
 }
        "#,
            expect![[r#"https://docs.rs/test/*/test/wrapper/module/struct.Item.html"#]],
diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs
index 8d75e0f05..ffb3a6f7d 100644
--- a/crates/ide/src/expand_macro.rs
+++ b/crates/ide/src/expand_macro.rs
@@ -144,7 +144,7 @@ macro_rules! foo {
 macro_rules! baz {
    () => { foo!(); }
 }
-f<|>oo!();
+f$0oo!();
 "#,
            expect![[r#"
                foo
@@ -165,7 +165,7 @@ macro_rules! foo {
        }
    }
 }
-f<|>oo!();
+f$0oo!();
        "#,
            expect![[r#"
            foo
@@ -192,7 +192,7 @@ macro_rules! match_ast {
 }
 fn main() {
-    mat<|>ch_ast! {
+    mat$0ch_ast! {
        match container {
            ast::TraitDef(it) => {},
            ast::ImplDef(it) => {},
@@ -226,7 +226,7 @@ macro_rules! match_ast {
 fn main() {
    let p = f(|it| {
-        let res = mat<|>ch_ast! { match c {}};
+        let res = mat$0ch_ast! { match c {}};
        Some(res)
    })?;
 }
@@ -250,7 +250,7 @@ macro_rules! foo {
 }
 fn main() {
-    let res = fo<|>o!();
+    let res = fo$0o!();
 }
 "#,
            expect![[r#"
@@ -272,7 +272,7 @@ macro_rules! foo {
 }
 fn main() {
-    let res = fo<|>o!();
+    let res = fo$0o!();
 }
 "#,
            expect![[r#"
diff --git a/crates/ide/src/extend_selection.rs b/crates/ide/src/extend_selection.rs
index 6f3022dfd..56418c960 100644
--- a/crates/ide/src/extend_selection.rs
+++ b/crates/ide/src/extend_selection.rs
@@ -334,29 +334,29 @@ mod tests {
    #[test]
    fn test_extend_selection_arith() {
-        do_check(r#"fn foo() { <|>1 + 1 }"#, &["1", "1 + 1", "{ 1 + 1 }"]);
+        do_check(r#"fn foo() { $01 + 1 }"#, &["1", "1 + 1", "{ 1 + 1 }"]);
    }
    #[test]
    fn test_extend_selection_list() {
-        do_check(r#"fn foo(<|>x: i32) {}"#, &["x", "x: i32"]);
+        do_check(r#"fn foo($0x: i32) {}"#, &["x", "x: i32"]);
-        do_check(r#"fn foo(<|>x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
+        do_check(r#"fn foo($0x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
-        do_check(r#"fn foo(<|>x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,", "(x: i32,y: i32)"]);
+        do_check(r#"fn foo($0x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,", "(x: i32,y: i32)"]);
-        do_check(r#"fn foo(x: i32, <|>y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
+        do_check(r#"fn foo(x: i32, $0y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
-        do_check(r#"fn foo(x: i32, <|>y: i32, ) {}"#, &["y", "y: i32", "y: i32, "]);
+        do_check(r#"fn foo(x: i32, $0y: i32, ) {}"#, &["y", "y: i32", "y: i32, "]);
-        do_check(r#"fn foo(x: i32,<|>y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
+        do_check(r#"fn foo(x: i32,$0y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
-        do_check(r#"const FOO: [usize; 2] = [ 22<|> , 33];"#, &["22", "22 , "]);
+        do_check(r#"const FOO: [usize; 2] = [ 22$0 , 33];"#, &["22", "22 , "]);
-        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|>];"#, &["33", ", 33"]);
+        do_check(r#"const FOO: [usize; 2] = [ 22 , 33$0];"#, &["33", ", 33"]);
-        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#, &["33", "33 ,", "[ 22 , 33 ,]"]);
+        do_check(r#"const FOO: [usize; 2] = [ 22 , 33$0 ,];"#, &["33", "33 ,", "[ 22 , 33 ,]"]);
-        do_check(r#"fn main() { (1, 2<|>) }"#, &["2", ", 2", "(1, 2)"]);
+        do_check(r#"fn main() { (1, 2$0) }"#, &["2", ", 2", "(1, 2)"]);
        do_check(
            r#"
 const FOO: [usize; 2] = [
    22,
-    <|>33,
+    $033,
 ]"#,
            &["33", "33,"],
        );
@@ -365,7 +365,7 @@ const FOO: [usize; 2] = [
            r#"
 const FOO: [usize; 2] = [
    22
-    , 33<|>,
+    , 33$0,
 ]"#,
            &["33", "33,"],
        );
@@ -376,7 +376,7 @@ const FOO: [usize; 2] = [
        do_check(
            r#"
 impl S {
-<|>    fn foo() {
+$0    fn foo() {
    }
 }"#,
@@ -393,7 +393,7 @@ struct A;
 /// bla
 /// bla
 struct B {
-    <|>
+    $0
 }
            "#,
            &["\n    \n", "{\n    \n}", "/// bla\n/// bla\nstruct B {\n    \n}"],
@@ -407,7 +407,7 @@ struct B {
 fn bar(){}
 // fn foo() {
-// 1 + <|>1
+// 1 + $01
 // }
 // fn foo(){}
@@ -419,7 +419,7 @@ fn bar(){}
            r#"
 // #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 // pub enum Direction {
-//  <|>   Next,
+//  $0   Next,
 //     Prev
 // }
 "#,
@@ -433,27 +433,27 @@ fn bar(){}
            r#"
 /*
 foo
-_bar1<|>*/
+_bar1$0*/
 "#,
            &["_bar1", "/*\nfoo\n_bar1*/"],
        );
-        do_check(r#"//!<|>foo_2 bar"#, &["foo_2", "//!foo_2 bar"]);
+        do_check(r#"//!$0foo_2 bar"#, &["foo_2", "//!foo_2 bar"]);
-        do_check(r#"/<|>/foo bar"#, &["//foo bar"]);
+        do_check(r#"/$0/foo bar"#, &["//foo bar"]);
    }
    #[test]
    fn test_extend_selection_prefer_idents() {
        do_check(
            r#"
-fn main() { foo<|>+bar;}
+fn main() { foo$0+bar;}
 "#,
            &["foo", "foo+bar"],
        );
        do_check(
            r#"
-fn main() { foo+<|>bar;}
+fn main() { foo+$0bar;}
 "#,
            &["bar", "foo+bar"],
        );
@@ -461,18 +461,18 @@ fn main() { foo+<|>bar;}
    #[test]
    fn test_extend_selection_prefer_lifetimes() {
-        do_check(r#"fn foo<<|>'a>() {}"#, &["'a", "<'a>"]);
+        do_check(r#"fn foo<$0'a>() {}"#, &["'a", "<'a>"]);
-        do_check(r#"fn foo<'a<|>>() {}"#, &["'a", "<'a>"]);
+        do_check(r#"fn foo<'a$0>() {}"#, &["'a", "<'a>"]);
    }
    #[test]
    fn test_extend_selection_select_first_word() {
-        do_check(r#"// foo bar b<|>az quxx"#, &["baz", "// foo bar baz quxx"]);
+        do_check(r#"// foo bar b$0az quxx"#, &["baz", "// foo bar baz quxx"]);
        do_check(
            r#"
 impl S {
 fn foo() {
-// hel<|>lo world
+// hel$0lo world
 }
 }
 "#,
@@ -486,7 +486,7 @@ fn foo() {
            r#"
 fn bar(){}
-" fn f<|>oo() {"
+" fn f$0oo() {"
 "#,
            &["foo", "\" fn foo() {\""],
        );
@@ -499,7 +499,7 @@ fn bar(){}
 fn foo<R>()
    where
        R: req::Request + 'static,
-        R::Params: DeserializeOwned<|> + panic::UnwindSafe + 'static,
+        R::Params: DeserializeOwned$0 + panic::UnwindSafe + 'static,
        R::Result: Serialize + 'static,
 "#,
            &[
@@ -510,26 +510,26 @@ fn foo<R>()
                "R::Params: DeserializeOwned + panic::UnwindSafe + 'static,",
            ],
        );
-        do_check(r#"fn foo<T>() where T: <|>Copy"#, &["Copy"]);
+        do_check(r#"fn foo<T>() where T: $0Copy"#, &["Copy"]);
-        do_check(r#"fn foo<T>() where T: <|>Copy + Display"#, &["Copy", "Copy + "]);
+        do_check(r#"fn foo<T>() where T: $0Copy + Display"#, &["Copy", "Copy + "]);
-        do_check(r#"fn foo<T>() where T: <|>Copy +Display"#, &["Copy", "Copy +"]);
+        do_check(r#"fn foo<T>() where T: $0Copy +Display"#, &["Copy", "Copy +"]);
-        do_check(r#"fn foo<T>() where T: <|>Copy+Display"#, &["Copy", "Copy+"]);
+        do_check(r#"fn foo<T>() where T: $0Copy+Display"#, &["Copy", "Copy+"]);
-        do_check(r#"fn foo<T>() where T: Copy + <|>Display"#, &["Display", "+ Display"]);
+        do_check(r#"fn foo<T>() where T: Copy + $0Display"#, &["Display", "+ Display"]);
-        do_check(r#"fn foo<T>() where T: Copy + <|>Display + Sync"#, &["Display", "Display + "]);
+        do_check(r#"fn foo<T>() where T: Copy + $0Display + Sync"#, &["Display", "Display + "]);
-        do_check(r#"fn foo<T>() where T: Copy +<|>Display"#, &["Display", "+Display"]);
+        do_check(r#"fn foo<T>() where T: Copy +$0Display"#, &["Display", "+Display"]);
    }
    #[test]
    fn test_extend_trait_bounds_list_inline() {
-        do_check(r#"fn foo<T: <|>Copy>() {}"#, &["Copy"]);
+        do_check(r#"fn foo<T: $0Copy>() {}"#, &["Copy"]);
-        do_check(r#"fn foo<T: <|>Copy + Display>() {}"#, &["Copy", "Copy + "]);
+        do_check(r#"fn foo<T: $0Copy + Display>() {}"#, &["Copy", "Copy + "]);
-        do_check(r#"fn foo<T: <|>Copy +Display>() {}"#, &["Copy", "Copy +"]);
+        do_check(r#"fn foo<T: $0Copy +Display>() {}"#, &["Copy", "Copy +"]);
-        do_check(r#"fn foo<T: <|>Copy+Display>() {}"#, &["Copy", "Copy+"]);
+        do_check(r#"fn foo<T: $0Copy+Display>() {}"#, &["Copy", "Copy+"]);
-        do_check(r#"fn foo<T: Copy + <|>Display>() {}"#, &["Display", "+ Display"]);
+        do_check(r#"fn foo<T: Copy + $0Display>() {}"#, &["Display", "+ Display"]);
-        do_check(r#"fn foo<T: Copy + <|>Display + Sync>() {}"#, &["Display", "Display + "]);
+        do_check(r#"fn foo<T: Copy + $0Display + Sync>() {}"#, &["Display", "Display + "]);
-        do_check(r#"fn foo<T: Copy +<|>Display>() {}"#, &["Display", "+Display"]);
+        do_check(r#"fn foo<T: Copy +$0Display>() {}"#, &["Display", "+Display"]);
        do_check(
-            r#"fn foo<T: Copy<|> + Display, U: Copy>() {}"#,
+            r#"fn foo<T: Copy$0 + Display, U: Copy>() {}"#,
            &[
                "Copy",
                "Copy + ",
@@ -544,19 +544,19 @@ fn foo<R>()
    #[test]
    fn test_extend_selection_on_tuple_in_type() {
        do_check(
-            r#"fn main() { let _: (krate, <|>_crate_def_map, module_id) = (); }"#,
+            r#"fn main() { let _: (krate, $0_crate_def_map, module_id) = (); }"#,
            &["_crate_def_map", "_crate_def_map, ", "(krate, _crate_def_map, module_id)"],
        );
        // white space variations
        do_check(
-            r#"fn main() { let _: (krate,<|>_crate_def_map,module_id) = (); }"#,
+            r#"fn main() { let _: (krate,$0_crate_def_map,module_id) = (); }"#,
            &["_crate_def_map", "_crate_def_map,", "(krate,_crate_def_map,module_id)"],
        );
        do_check(
            r#"
 fn main() { let _: (
    krate,
-    _crate<|>_def_map,
+    _crate$0_def_map,
    module_id
 ) = (); }"#,
            &[
@@ -570,19 +570,19 @@ fn main() { let _: (
    #[test]
    fn test_extend_selection_on_tuple_in_rvalue() {
        do_check(
-            r#"fn main() { let var = (krate, _crate_def_map<|>, module_id); }"#,
+            r#"fn main() { let var = (krate, _crate_def_map$0, module_id); }"#,
            &["_crate_def_map", "_crate_def_map, ", "(krate, _crate_def_map, module_id)"],
        );
        // white space variations
        do_check(
-            r#"fn main() { let var = (krate,_crate<|>_def_map,module_id); }"#,
+            r#"fn main() { let var = (krate,_crate$0_def_map,module_id); }"#,
            &["_crate_def_map", "_crate_def_map,", "(krate,_crate_def_map,module_id)"],
        );
        do_check(
            r#"
 fn main() { let var = (
    krate,
-    _crate_def_map<|>,
+    _crate_def_map$0,
    module_id
 ); }"#,
            &[
@@ -596,19 +596,19 @@ fn main() { let var = (
    #[test]
    fn test_extend_selection_on_tuple_pat() {
        do_check(
-            r#"fn main() { let (krate, _crate_def_map<|>, module_id) = var; }"#,
+            r#"fn main() { let (krate, _crate_def_map$0, module_id) = var; }"#,
            &["_crate_def_map", "_crate_def_map, ", "(krate, _crate_def_map, module_id)"],
        );
        // white space variations
        do_check(
-            r#"fn main() { let (krate,_crate<|>_def_map,module_id) = var; }"#,
+            r#"fn main() { let (krate,_crate$0_def_map,module_id) = var; }"#,
            &["_crate_def_map", "_crate_def_map,", "(krate,_crate_def_map,module_id)"],
        );
        do_check(
            r#"
 fn main() { let (
    krate,
-    _crate_def_map<|>,
+    _crate_def_map$0,
    module_id
 ) = var; }"#,
            &[
@@ -623,7 +623,7 @@ fn main() { let (
    fn extend_selection_inside_macros() {
        do_check(
            r#"macro_rules! foo { ($item:item) => {$item} }
-                foo!{fn hello(na<|>me:usize){}}"#,
+                foo!{fn hello(na$0me:usize){}}"#,
            &[
                "name",
                "name:usize",
@@ -640,7 +640,7 @@ fn main() { let (
        do_check(
            r#" macro_rules! foo2 { ($item:item) => {$item} }
                macro_rules! foo { ($item:item) => {foo2!($item);} }
-                foo!{fn hello(na<|>me:usize){}}"#,
+                foo!{fn hello(na$0me:usize){}}"#,
            &[
                "name",
                "name:usize",
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index eb57f9224..cc8218885 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -20,12 +20,12 @@ pub(crate) fn files(ra_fixture: &str) -> (Analysis, Vec<FileId>) {
    (host.analysis(), change_fixture.files)
 }
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) {
    let mut host = AnalysisHost::default();
    let change_fixture = ChangeFixture::parse(ra_fixture);
    host.db.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
    let offset = match range_or_offset {
        RangeOrOffset::Range(_) => panic!(),
        RangeOrOffset::Offset(it) => it,
@@ -33,12 +33,12 @@ pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) {
    (host.analysis(), FilePosition { file_id, offset })
 }
-/// Creates analysis for a single file, returns range marked with a pair of <|>.
+/// Creates analysis for a single file, returns range marked with a pair of $0.
 pub(crate) fn range(ra_fixture: &str) -> (Analysis, FileRange) {
    let mut host = AnalysisHost::default();
    let change_fixture = ChangeFixture::parse(ra_fixture);
    host.db.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
    let range = match range_or_offset {
        RangeOrOffset::Range(it) => it,
        RangeOrOffset::Offset(_) => panic!(),
@@ -46,12 +46,12 @@ pub(crate) fn range(ra_fixture: &str) -> (Analysis, FileRange) {
    (host.analysis(), FileRange { file_id, range })
 }
-/// Creates analysis from a multi-file fixture, returns positions marked with <|>.
+/// Creates analysis from a multi-file fixture, returns positions marked with $0.
 pub(crate) fn annotations(ra_fixture: &str) -> (Analysis, FilePosition, Vec<(FileRange, String)>) {
    let mut host = AnalysisHost::default();
    let change_fixture = ChangeFixture::parse(ra_fixture);
    host.db.apply_change(change_fixture.change);
-    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker (<|>)");
+    let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
    let offset = match range_or_offset {
        RangeOrOffset::Range(_) => panic!(),
        RangeOrOffset::Offset(it) => it,
diff --git a/crates/ide/src/fn_references.rs b/crates/ide/src/fn_references.rs
index 5cbbe306e..f6e5a522b 100644
--- a/crates/ide/src/fn_references.rs
+++ b/crates/ide/src/fn_references.rs
@@ -34,7 +34,7 @@ mod tests {
    fn test_find_all_methods() {
        let (analysis, pos) = fixture::position(
            r#"
-            fn private_fn() {<|>}
+            fn private_fn() {$0}
            pub fn pub_fn() {}
@@ -51,7 +51,7 @@ mod tests {
        let (analysis, pos) = fixture::position(
            r#"
            trait Foo {
-                fn bar() {<|>}
+                fn bar() {$0}
                fn baz() {}
            }
        "#,
@@ -67,7 +67,7 @@ mod tests {
            r#"
            //- /lib.rs
            #[test]
-            fn foo() {<|>}
+            fn foo() {$0}
            pub fn pub_fn() {}
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs
index 912144f8b..cd4afc804 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/crates/ide/src/goto_definition.rs
@@ -1,14 +1,18 @@
 use either::Either;
-use hir::Semantics;
+use hir::{HasAttrs, ModuleDef, Semantics};
 use ide_db::{
    base_db::FileId,
-    defs::{NameClass, NameRefClass},
+    defs::{Definition, NameClass, NameRefClass},
    symbol_index, RootDatabase,
 };
-use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
+use syntax::{
+    ast, match_ast, AstNode, AstToken, SyntaxKind::*, SyntaxToken, TextSize, TokenAtOffset, T,
+};
 use crate::{
    display::{ToNav, TryToNav},
+    doc_links::extract_definitions_from_markdown,
+    runnables::doc_owner_to_def,
    FilePosition, NavigationTarget, RangeInfo, SymbolKind,
 };
@@ -30,6 +34,10 @@ pub(crate) fn goto_definition(
    let original_token = pick_best(file.token_at_offset(position.offset))?;
    let token = sema.descend_into_macros(original_token.clone());
    let parent = token.parent();
+    if let Some(comment) = ast::Comment::cast(token.clone()) {
+        let nav = def_for_doc_comment(&sema, position, &comment)?.try_to_nav(db)?;
+        return Some(RangeInfo::new(original_token.text_range(), vec![nav]));
+    }
    let nav_targets = match_ast! {
        match parent {
@@ -68,11 +76,58 @@ pub(crate) fn goto_definition(
    Some(RangeInfo::new(original_token.text_range(), nav_targets))
 }
+fn def_for_doc_comment(
+    sema: &Semantics<RootDatabase>,
+    position: FilePosition,
+    doc_comment: &ast::Comment,
+) -> Option<hir::ModuleDef> {
+    let parent = doc_comment.syntax().parent();
+    let (link, ns) = extract_positioned_link_from_comment(position, doc_comment)?;
+    let def = doc_owner_to_def(sema, parent)?;
+    match def {
+        Definition::ModuleDef(def) => match def {
+            ModuleDef::Module(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Function(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Adt(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Variant(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Const(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Static(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::Trait(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::TypeAlias(it) => it.resolve_doc_path(sema.db, &link, ns),
+            ModuleDef::BuiltinType(_) => return None,
+        },
+        Definition::Macro(it) => it.resolve_doc_path(sema.db, &link, ns),
+        Definition::Field(it) => it.resolve_doc_path(sema.db, &link, ns),
+        Definition::SelfType(_)
+        | Definition::Local(_)
+        | Definition::GenericParam(_)
+        | Definition::Label(_) => return None,
+    }
+}
+fn extract_positioned_link_from_comment(
+    position: FilePosition,
+    comment: &ast::Comment,
+) -> Option<(String, Option<hir::Namespace>)> {
+    let comment_range = comment.syntax().text_range();
+    let doc_comment = comment.doc_comment()?;
+    let def_links = extract_definitions_from_markdown(doc_comment);
+    let (def_link, ns, _) = def_links.iter().min_by_key(|(_, _, def_link_range)| {
+        let matched_position = comment_range.start() + TextSize::from(def_link_range.start as u32);
+        match position.offset.checked_sub(matched_position) {
+            Some(distance) => distance,
+            None => comment_range.end(),
+        }
+    })?;
+    Some((def_link.to_string(), ns.clone()))
+}
 fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
    return tokens.max_by_key(priority);
    fn priority(n: &SyntaxToken) -> usize {
        match n.kind() {
-            IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] => 2,
+            IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] | COMMENT => 2,
            kind if kind.is_trivia() => 0,
            _ => 1,
        }
@@ -166,7 +221,7 @@ mod tests {
        check(
            r#"
            //- /main.rs crate:main deps:std
-            extern crate std<|>;
+            extern crate std$0;
            //- /std/lib.rs crate:std
            // empty
            //^ file
@@ -179,7 +234,7 @@ mod tests {
        check(
            r#"
            //- /main.rs crate:main deps:std
-            extern crate std as abc<|>;
+            extern crate std as abc$0;
            //- /std/lib.rs crate:std
            // empty
            //^ file
@@ -193,7 +248,7 @@ mod tests {
            r#"
 struct Foo;
     //^^^
-enum E { X(Foo<|>) }
+enum E { X(Foo$0) }
 "#,
        );
    }
@@ -204,7 +259,7 @@ enum E { X(Foo<|>) }
            r#"
 struct Foo;
     //^^^
-enum E { X(<|>Foo) }
+enum E { X($0Foo) }
 "#,
        );
    }
@@ -217,7 +272,7 @@ enum E { X(<|>Foo) }
 use a::Foo;
 mod a;
 mod b;
-enum E { X(Foo<|>) }
+enum E { X(Foo$0) }
 //- /a.rs
 struct Foo;
@@ -233,7 +288,7 @@ struct Foo;
        check(
            r#"
 //- /lib.rs
-mod <|>foo;
+mod $0foo;
 //- /foo.rs
 // empty
@@ -244,7 +299,7 @@ mod <|>foo;
        check(
            r#"
 //- /lib.rs
-mod <|>foo;
+mod $0foo;
 //- /foo/mod.rs
 // empty
@@ -260,7 +315,7 @@ mod <|>foo;
 macro_rules! foo { () => { () } }
           //^^^
 fn bar() {
-    <|>foo!();
+    $0foo!();
 }
 "#,
        );
@@ -273,7 +328,7 @@ fn bar() {
 //- /lib.rs
 use foo::foo;
 fn bar() {
-    <|>foo!();
+    $0foo!();
 }
 //- /foo/lib.rs
@@ -289,7 +344,7 @@ macro_rules! foo { () => { () } }
        check(
            r#"
 //- /lib.rs
-use foo::foo<|>;
+use foo::foo$0;
 //- /foo/lib.rs
 #[macro_export]
@@ -312,7 +367,7 @@ define_fn!(foo);
         //^^^
 fn bar() {
-   <|>foo();
+   $0foo();
 }
 "#,
        );
@@ -331,7 +386,7 @@ macro_rules! define_fn {
 //^^^^^^^^^^^^^
 fn bar() {
-   <|>foo();
+   $0foo();
 }
 "#,
        );
@@ -347,7 +402,7 @@ macro_rules! foo {() => {0}}
 fn bar() {
    match (0,1) {
-        (<|>foo!(), _) => {}
+        ($0foo!(), _) => {}
    }
 }
 "#,
@@ -363,7 +418,7 @@ macro_rules! foo {() => {0}}
           //^^^
 fn bar() {
    match 0 {
-        <|>foo!() => {}
+        $0foo!() => {}
    }
 }
 "#,
@@ -375,7 +430,7 @@ fn bar() {
        check(
            r#"
 //- /lib.rs crate:main deps:foo
-use foo as bar<|>;
+use foo as bar$0;
 //- /foo/lib.rs crate:foo
 // empty
@@ -389,7 +444,7 @@ use foo as bar<|>;
        check(
            r#"
 //- /lib.rs crate:main deps:foo
-use foo::foo as bar<|>;
+use foo::foo as bar$0;
 //- /foo/lib.rs crate:foo
 #[macro_export]
@@ -410,7 +465,7 @@ impl Foo {
 }
 fn bar(foo: &Foo) {
-    foo.frobnicate<|>();
+    foo.frobnicate$0();
 }
 "#,
        );
@@ -425,7 +480,7 @@ struct Foo {
 } //^^^^
 fn bar(foo: &Foo) {
-    foo.spam<|>;
+    foo.spam$0;
 }
 "#,
        );
@@ -442,7 +497,7 @@ struct Foo {
 fn bar() -> Foo {
    Foo {
-        spam<|>: 0,
+        spam$0: 0,
    }
 }
 "#,
@@ -459,7 +514,7 @@ struct Foo {
 } //^^^^
 fn bar(foo: Foo) -> Foo {
-    let Foo { spam<|>: _, } = foo
+    let Foo { spam$0: _, } = foo
 }
 "#,
        );
@@ -474,7 +529,7 @@ struct Foo { spam: u32 }
           //^^^^
 fn bar() -> Foo {
-    Foo { spam<|>: m!() }
+    Foo { spam$0: m!() }
 }
 ",
        );
@@ -489,7 +544,7 @@ struct Foo(u32);
 fn bar() {
    let foo = Foo(0);
-    foo.<|>0;
+    foo.$00;
 }
 "#,
        );
@@ -505,7 +560,7 @@ impl Foo {
 }    //^^^^^^^^^^
 fn bar(foo: &Foo) {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
        );
@@ -520,7 +575,7 @@ trait Foo {
 }    //^^^^^^^^^^
 fn bar() {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
        );
@@ -537,7 +592,7 @@ trait Trait {
 impl Trait for Foo {}
 fn bar() {
-    Foo::frobnicate<|>();
+    Foo::frobnicate$0();
 }
 "#,
        );
@@ -551,7 +606,7 @@ struct Foo;
 impl Foo {
   //^^^
    pub fn new() -> Self {
-        Self<|> {}
+        Self$0 {}
    }
 }
 "#,
@@ -561,7 +616,7 @@ impl Foo {
 struct Foo;
 impl Foo {
   //^^^
-    pub fn new() -> Self<|> {
+    pub fn new() -> Self$0 {
        Self {}
    }
 }
@@ -573,7 +628,7 @@ impl Foo {
 enum Foo { A }
 impl Foo {
   //^^^
-    pub fn new() -> Self<|> {
+    pub fn new() -> Self$0 {
        Foo::A
    }
 }
@@ -585,7 +640,7 @@ impl Foo {
 enum Foo { A }
 impl Foo {
   //^^^
-    pub fn thing(a: &Self<|>) {
+    pub fn thing(a: &Self$0) {
    }
 }
 "#,
@@ -603,7 +658,7 @@ trait Make {
 impl Make for Foo {
            //^^^
    fn new() -> Self {
-        Self<|> {}
+        Self$0 {}
    }
 }
 "#,
@@ -617,7 +672,7 @@ trait Make {
 }
 impl Make for Foo {
            //^^^
-    fn new() -> Self<|> {
+    fn new() -> Self$0 {
        Self {}
    }
 }
@@ -629,7 +684,7 @@ impl Make for Foo {
    fn goto_def_when_used_on_definition_name_itself() {
        check(
            r#"
-struct Foo<|> { value: u32 }
+struct Foo$0 { value: u32 }
     //^^^
            "#,
        );
@@ -637,21 +692,21 @@ struct Foo<|> { value: u32 }
        check(
            r#"
 struct Foo {
-    field<|>: string,
+    field$0: string,
 } //^^^^^
 "#,
        );
        check(
            r#"
-fn foo_test<|>() { }
+fn foo_test$0() { }
 //^^^^^^^^
 "#,
        );
        check(
            r#"
-enum Foo<|> { Variant }
+enum Foo$0 { Variant }
   //^^^
 "#,
        );
@@ -660,7 +715,7 @@ enum Foo<|> { Variant }
            r#"
 enum Foo {
    Variant1,
-    Variant2<|>,
+    Variant2$0,
  //^^^^^^^^
    Variant3,
 }
@@ -669,35 +724,35 @@ enum Foo {
        check(
            r#"
-static INNER<|>: &str = "";
+static INNER$0: &str = "";
     //^^^^^
 "#,
        );
        check(
            r#"
-const INNER<|>: &str = "";
+const INNER$0: &str = "";
    //^^^^^
 "#,
        );
        check(
            r#"
-type Thing<|> = Option<()>;
+type Thing$0 = Option<()>;
   //^^^^^
 "#,
        );
        check(
            r#"
-trait Foo<|> { }
+trait Foo$0 { }
    //^^^
 "#,
        );
        check(
            r#"
-mod bar<|> { }
+mod bar$0 { }
  //^^^
 "#,
        );
@@ -714,7 +769,7 @@ fn foo() {}
 //^^^
 id! {
    fn bar() {
-        fo<|>o();
+        fo$0o();
    }
 }
 mod confuse_index { fn foo(); }
@@ -743,7 +798,7 @@ pub mod __export {
 fn foo() -> i8 {}
 //^^^
 fn test() {
-    format!("{}", fo<|>o())
+    format!("{}", fo$0o())
 }
 "#,
        );
@@ -761,7 +816,7 @@ macro_rules! include {}
 //^^^^^^^^^^^^^^^^^^^
 fn f() {
-    foo<|>();
+    foo$0();
 }
 mod confuse_index {
@@ -778,7 +833,7 @@ fn foo() {}
    fn goto_for_type_param() {
        check(
            r#"
-struct Foo<T: Clone> { t: <|>T }
+struct Foo<T: Clone> { t: $0T }
         //^
 "#,
        );
@@ -796,7 +851,7 @@ fn foo() {
    let x = 1;
      //^
    id!({
-        let y = <|>x;
+        let y = $0x;
        let z = y;
    });
 }
@@ -814,7 +869,7 @@ fn foo() {
    id!({
        let y = x;
          //^
-        let z = <|>y;
+        let z = $0y;
    });
 }
 "#,
@@ -829,7 +884,7 @@ fn main() {
    fn foo() {
        let x = 92;
          //^
-        <|>x;
+        $0x;
    }
 }
 "#,
@@ -843,7 +898,7 @@ fn main() {
 fn bar() {
    macro_rules! foo { () => { () } }
               //^^^
-    <|>foo!();
+    $0foo!();
 }
 "#,
        );
@@ -857,7 +912,7 @@ struct Foo { x: i32 }
 fn main() {
    let x = 92;
      //^
-    Foo { x<|> };
+    Foo { x$0 };
 }
 "#,
        )
@@ -872,7 +927,7 @@ enum Foo {
 }       //^
 fn baz(foo: Foo) {
    match foo {
-        Foo::Bar { x<|> } => x
+        Foo::Bar { x$0 } => x
    };
 }
 "#,
@@ -887,7 +942,7 @@ enum Foo { Bar }
         //^^^
 impl Foo {
    fn baz(self) {
-        match self { Self::Bar<|> => {} }
+        match self { Self::Bar$0 => {} }
    }
 }
 "#,
@@ -902,7 +957,7 @@ enum Foo { Bar { val: i32 } }
         //^^^
 impl Foo {
    fn baz(self) -> i32 {
-        match self { Self::Bar<|> { val } => {} }
+        match self { Self::Bar$0 { val } => {} }
    }
 }
 "#,
@@ -916,7 +971,7 @@ impl Foo {
 enum Foo { Bar }
         //^^^
 impl Foo {
-    fn baz(self) { Self::Bar<|>; }
+    fn baz(self) { Self::Bar$0; }
 }
 "#,
        );
@@ -929,7 +984,7 @@ impl Foo {
 enum Foo { Bar { val: i32 } }
         //^^^
 impl Foo {
-    fn baz(self) { Self::Bar<|> {val: 4}; }
+    fn baz(self) { Self::Bar$0 {val: 4}; }
 }
 "#,
        );
@@ -939,7 +994,7 @@ impl Foo {
    fn goto_def_for_type_alias_generic_parameter() {
        check(
            r#"
-type Alias<T> = T<|>;
+type Alias<T> = T$0;
         //^
 "#,
        )
@@ -950,7 +1005,7 @@ type Alias<T> = T<|>;
        check(
            r#"
 //- /lib.rs
-foo::module<|>::mac!();
+foo::module$0::mac!();
 //- /foo/lib.rs
 pub mod module {
@@ -972,7 +1027,7 @@ trait Iterator {
       //^^^^
 }
-fn f() -> impl Iterator<Item<|> = u8> {}
+fn f() -> impl Iterator<Item$0 = u8> {}
 "#,
        );
    }
@@ -987,7 +1042,7 @@ trait Iterator {
    type B;
 }
-fn f() -> impl Iterator<A<|> = u8, B = ()> {}
+fn f() -> impl Iterator<A$0 = u8, B = ()> {}
 "#,
        );
        check(
@@ -998,7 +1053,7 @@ trait Iterator {
       //^
 }
-fn f() -> impl Iterator<A = u8, B<|> = ()> {}
+fn f() -> impl Iterator<A = u8, B$0 = ()> {}
 "#,
        );
    }
@@ -1012,7 +1067,7 @@ trait Iterator {
       //^^^^
 }
-fn g() -> <() as Iterator<Item<|> = ()>>::Item {}
+fn g() -> <() as Iterator<Item$0 = ()>>::Item {}
 "#,
        );
    }
@@ -1027,7 +1082,7 @@ trait Iterator {
    type B;
 }
-fn g() -> <() as Iterator<A<|> = (), B = u8>>::B {}
+fn g() -> <() as Iterator<A$0 = (), B = u8>>::B {}
 "#,
        );
        check(
@@ -1038,7 +1093,7 @@ trait Iterator {
       //^
 }
-fn g() -> <() as Iterator<A = (), B<|> = u8>>::A {}
+fn g() -> <() as Iterator<A = (), B$0 = u8>>::A {}
 "#,
        );
    }
@@ -1052,7 +1107,7 @@ struct Foo {}
 impl Foo {
    fn bar(self: &Foo) {
         //^^^^
-        let foo = sel<|>f;
+        let foo = sel$0f;
    }
 }"#,
        )
@@ -1065,7 +1120,7 @@ impl Foo {
 struct Foo {}
 impl Foo {
-    fn bar(&self<|>) {
+    fn bar(&self$0) {
          //^^^^
    }
 }"#,
@@ -1076,7 +1131,7 @@ impl Foo {
    fn goto_lifetime_param_on_decl() {
        check(
            r#"
-fn foo<'foobar<|>>(_: &'foobar ()) {
+fn foo<'foobar$0>(_: &'foobar ()) {
     //^^^^^^^
 }"#,
        )
@@ -1086,7 +1141,7 @@ fn foo<'foobar<|>>(_: &'foobar ()) {
    fn goto_lifetime_param_decl() {
        check(
            r#"
-fn foo<'foobar>(_: &'foobar<|> ()) {
+fn foo<'foobar>(_: &'foobar$0 ()) {
     //^^^^^^^
 }"#,
        )
@@ -1097,7 +1152,7 @@ fn foo<'foobar>(_: &'foobar<|> ()) {
        check(
            r#"
 fn foo<'foobar>(_: &'foobar ()) {
-    fn foo<'foobar>(_: &'foobar<|> ()) {}
+    fn foo<'foobar>(_: &'foobar$0 ()) {}
         //^^^^^^^
 }"#,
        )
@@ -1108,13 +1163,13 @@ fn foo<'foobar>(_: &'foobar ()) {
    fn goto_lifetime_hrtb() {
        check(
            r#"trait Foo<T> {}
-fn foo<T>() where for<'a> T: Foo<&'a<|> (u8, u16)>, {}
+fn foo<T>() where for<'a> T: Foo<&'a$0 (u8, u16)>, {}
                    //^^
 "#,
        );
        check(
            r#"trait Foo<T> {}
-fn foo<T>() where for<'a<|>> T: Foo<&'a (u8, u16)>, {}
+fn foo<T>() where for<'a$0> T: Foo<&'a (u8, u16)>, {}
                    //^^
 "#,
        );
@@ -1125,7 +1180,7 @@ fn foo<T>() where for<'a<|>> T: Foo<&'a (u8, u16)>, {}
    fn goto_lifetime_hrtb_for_type() {
        check(
            r#"trait Foo<T> {}
-fn foo<T>() where T: for<'a> Foo<&'a<|> (u8, u16)>, {}
+fn foo<T>() where T: for<'a> Foo<&'a$0 (u8, u16)>, {}
                       //^^
 "#,
        );
@@ -1139,10 +1194,40 @@ fn foo<'foo>(_: &'foo ()) {
    'foo: {
  //^^^^
        'bar: loop {
-            break 'foo<|>;
+            break 'foo$0;
        }
    }
 }"#,
        )
    }
+    #[test]
+    fn goto_def_for_intra_doc_link_same_file() {
+        check(
+            r#"
+/// Blah, [`bar`](bar) .. [`foo`](foo)$0 has [`bar`](bar)
+pub fn bar() { }
+/// You might want to see [`std::fs::read()`] too.
+pub fn foo() { }
+     //^^^
+}"#,
+        )
+    }
+    #[test]
+    fn goto_def_for_intra_doc_link_inner() {
+        check(
+            r#"
+//- /main.rs
+mod m;
+struct S;
+     //^
+//- /m.rs
+//! [`super::S$0`]
+"#,
+        )
+    }
 }
diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs
index 6eac39639..761a98b2c 100644
--- a/crates/ide/src/goto_implementation.rs
+++ b/crates/ide/src/goto_implementation.rs
@@ -2,7 +2,7 @@ use hir::{Crate, Impl, Semantics};
 use ide_db::RootDatabase;
 use syntax::{algo::find_node_at_offset, ast, AstNode};
-use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
+use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
 // Feature: Go to Implementation
 //
@@ -55,7 +55,7 @@ fn impls_for_def(
        impls
            .into_iter()
            .filter(|impl_def| ty.is_equal_for_find_impls(&impl_def.target_ty(sema.db)))
-            .map(|imp| imp.to_nav(sema.db))
+            .filter_map(|imp| imp.try_to_nav(sema.db))
            .collect(),
    )
 }
@@ -69,7 +69,7 @@ fn impls_for_trait(
    let impls = Impl::for_trait(sema.db, krate, tr);
-    Some(impls.into_iter().map(|imp| imp.to_nav(sema.db)).collect())
+    Some(impls.into_iter().filter_map(|imp| imp.try_to_nav(sema.db)).collect())
 }
 #[cfg(test)]
@@ -107,7 +107,7 @@ mod tests {
    fn goto_implementation_works() {
        check(
            r#"
-struct Foo<|>;
+struct Foo$0;
 impl Foo {}
   //^^^
 "#,
@@ -118,7 +118,7 @@ impl Foo {}
    fn goto_implementation_works_multiple_blocks() {
        check(
            r#"
-struct Foo<|>;
+struct Foo$0;
 impl Foo {}
   //^^^
 impl Foo {}
@@ -131,7 +131,7 @@ impl Foo {}
    fn goto_implementation_works_multiple_mods() {
        check(
            r#"
-struct Foo<|>;
+struct Foo$0;
 mod a {
    impl super::Foo {}
       //^^^^^^^^^^
@@ -149,7 +149,7 @@ mod b {
        check(
            r#"
 //- /lib.rs
-struct Foo<|>;
+struct Foo$0;
 mod a;
 mod b;
 //- /a.rs
@@ -166,7 +166,7 @@ impl crate::Foo {}
    fn goto_implementation_for_trait() {
        check(
            r#"
-trait T<|> {}
+trait T$0 {}
 struct Foo;
 impl T for Foo {}
         //^^^
@@ -179,7 +179,7 @@ impl T for Foo {}
        check(
            r#"
 //- /lib.rs
-trait T<|> {};
+trait T$0 {};
 struct Foo;
 mod a;
 mod b;
@@ -199,7 +199,7 @@ impl crate::T for crate::Foo {}
            r#"
 //- /lib.rs
 trait T {}
-struct Foo<|>;
+struct Foo$0;
 impl Foo {}
   //^^^
 impl T for Foo {}
@@ -216,7 +216,7 @@ impl T for &Foo {}
            r#"
  #[derive(Copy)]
 //^^^^^^^^^^^^^^^
-struct Foo<|>;
+struct Foo$0;
 mod marker {
    trait Copy {}
diff --git a/crates/ide/src/goto_type_definition.rs b/crates/ide/src/goto_type_definition.rs
index aba6bf5dc..369a59820 100644
--- a/crates/ide/src/goto_type_definition.rs
+++ b/crates/ide/src/goto_type_definition.rs
@@ -1,7 +1,7 @@
 use ide_db::RootDatabase;
 use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
-use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
+use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
 // Feature: Go to Type Definition
 //
@@ -37,7 +37,7 @@ pub(crate) fn goto_type_definition(
    let adt_def = ty.autoderef(db).filter_map(|ty| ty.as_adt()).last()?;
-    let nav = adt_def.to_nav(db);
+    let nav = adt_def.try_to_nav(db)?;
    Some(RangeInfo::new(node.text_range(), vec![nav]))
 }
@@ -76,7 +76,7 @@ mod tests {
 struct Foo;
     //^^^
 fn foo() {
-    let f: Foo; f<|>
+    let f: Foo; f$0
 }
 "#,
        );
@@ -89,7 +89,7 @@ fn foo() {
 struct Foo;
     //^^^
 fn foo() {
-    let f: &Foo; f<|>
+    let f: &Foo; f$0
 }
 "#,
        );
@@ -103,7 +103,7 @@ macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
 struct Foo {}
     //^^^
 id! {
-    fn bar() { let f<|> = Foo {}; }
+    fn bar() { let f$0 = Foo {}; }
 }
 "#,
        );
@@ -115,7 +115,7 @@ id! {
            r#"
 struct Foo;
     //^^^
-fn foo(<|>f: Foo) {}
+fn foo($0f: Foo) {}
 "#,
        );
    }
@@ -129,7 +129,7 @@ struct Foo;
 struct Bar(Foo);
 fn foo() {
    let bar = Bar(Foo);
-    bar.<|>0;
+    bar.$00;
 }
 "#,
        );
@@ -142,7 +142,7 @@ fn foo() {
 struct Foo;
     //^^^
 impl Foo {
-    fn f(&self<|>) {}
+    fn f(&self$0) {}
 }
 "#,
        )
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 73245fbe7..317b6f011 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -1,6 +1,6 @@
 use hir::{
-    Adt, AsAssocItem, AssocItemContainer, FieldSource, HasAttrs, HasSource, HirDisplay, Module,
+    Adt, AsAssocItem, AssocItemContainer, FieldSource, GenericParam, HasAttrs, HasSource,
-    ModuleDef, ModuleSource, Semantics,
+    HirDisplay, Module, ModuleDef, ModuleSource, Semantics,
 };
 use ide_db::base_db::SourceDatabase;
 use ide_db::{
@@ -13,11 +13,11 @@ use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset,
 use test_utils::mark;
 use crate::{
-    display::{macro_label, ShortLabel, ToNav, TryToNav},
+    display::{macro_label, ShortLabel, TryToNav},
    doc_links::{remove_links, rewrite_links},
    markdown_remove::remove_markdown,
    markup::Markup,
-    runnables::runnable,
+    runnables::{runnable_fn, runnable_mod},
    FileId, FilePosition, NavigationTarget, RangeInfo, Runnable,
 };
@@ -31,19 +31,6 @@ pub struct HoverConfig {
    pub markdown: bool,
 }
-impl Default for HoverConfig {
-    fn default() -> Self {
-        Self {
-            implementations: true,
-            run: true,
-            debug: true,
-            goto_type_def: true,
-            links_in_hover: true,
-            markdown: true,
-        }
-    }
-}
 impl HoverConfig {
    pub const NO_ACTIONS: Self = Self {
        implementations: false,
@@ -70,7 +57,7 @@ impl HoverConfig {
 #[derive(Debug, Clone)]
 pub enum HoverAction {
    Runnable(Runnable),
-    Implementaion(FilePosition),
+    Implementation(FilePosition),
    GoToType(Vec<HoverGotoTypeData>),
 }
@@ -109,17 +96,20 @@ pub(crate) fn hover(
        match node {
            ast::Name(name) => NameClass::classify(&sema, &name).and_then(|d| d.defined(sema.db)),
            ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced(sema.db)),
+            ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime)
+                .map_or_else(|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced(sema.db)), |d| d.defined(sema.db)),
            _ => None,
        }
    };
    if let Some(definition) = definition {
        if let Some(markup) = hover_for_definition(db, definition) {
+            let markup = markup.as_str();
            let markup = if !markdown {
-                remove_markdown(&markup.as_str())
+                remove_markdown(markup)
            } else if links_in_hover {
-                rewrite_links(db, &markup.as_str(), &definition)
+                rewrite_links(db, markup, &definition)
            } else {
-                remove_links(&markup.as_str())
+                remove_links(markup)
            };
            res.markup = Markup::from(markup);
            if let Some(action) = show_implementations_action(db, definition) {
@@ -173,22 +163,19 @@ pub(crate) fn hover(
 fn show_implementations_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
    fn to_action(nav_target: NavigationTarget) -> HoverAction {
-        HoverAction::Implementaion(FilePosition {
+        HoverAction::Implementation(FilePosition {
            file_id: nav_target.file_id,
            offset: nav_target.focus_or_full_range().start(),
        })
    }
-    match def {
+    let adt = match def {
-        Definition::ModuleDef(it) => match it {
+        Definition::ModuleDef(ModuleDef::Trait(it)) => return it.try_to_nav(db).map(to_action),
-            ModuleDef::Adt(Adt::Struct(it)) => Some(to_action(it.to_nav(db))),
+        Definition::ModuleDef(ModuleDef::Adt(it)) => Some(it),
-            ModuleDef::Adt(Adt::Union(it)) => Some(to_action(it.to_nav(db))),
+        Definition::SelfType(it) => it.target_ty(db).as_adt(),
-            ModuleDef::Adt(Adt::Enum(it)) => Some(to_action(it.to_nav(db))),
-            ModuleDef::Trait(it) => Some(to_action(it.to_nav(db))),
-            _ => None,
-        },
        _ => None,
-    }
+    }?;
+    adt.try_to_nav(db).map(to_action)
 }
 fn runnable_action(
@@ -199,21 +186,20 @@ fn runnable_action(
    match def {
        Definition::ModuleDef(it) => match it {
            ModuleDef::Module(it) => match it.definition_source(sema.db).value {
-                ModuleSource::Module(it) => runnable(&sema, it.syntax().clone(), file_id)
+                ModuleSource::Module(it) => {
-                    .map(|it| HoverAction::Runnable(it)),
+                    runnable_mod(&sema, it).map(|it| HoverAction::Runnable(it))
+                }
                _ => None,
            },
-            ModuleDef::Function(it) => {
+            ModuleDef::Function(func) => {
-                let src = it.source(sema.db);
+                let src = func.source(sema.db)?;
                if src.file_id != file_id.into() {
                    mark::hit!(hover_macro_generated_struct_fn_doc_comment);
                    mark::hit!(hover_macro_generated_struct_fn_doc_attr);
                    return None;
                }
-                runnable(&sema, src.value.syntax().clone(), file_id)
+                runnable_fn(&sema, func).map(HoverAction::Runnable)
-                    .map(|it| HoverAction::Runnable(it))
            }
            _ => None,
        },
@@ -222,45 +208,46 @@ fn runnable_action(
 }
 fn goto_type_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
-    match def {
+    let mut targets: Vec<ModuleDef> = Vec::new();
-        Definition::Local(it) => {
+    let mut push_new_def = |item: ModuleDef| {
-            let mut targets: Vec<ModuleDef> = Vec::new();
+        if !targets.contains(&item) {
-            let mut push_new_def = |item: ModuleDef| {
+            targets.push(item);
-                if !targets.contains(&item) {
-                    targets.push(item);
-                }
-            };
-            it.ty(db).walk(db, |t| {
-                if let Some(adt) = t.as_adt() {
-                    push_new_def(adt.into());
-                } else if let Some(trait_) = t.as_dyn_trait() {
-                    push_new_def(trait_.into());
-                } else if let Some(traits) = t.as_impl_traits(db) {
-                    traits.into_iter().for_each(|it| push_new_def(it.into()));
-                } else if let Some(trait_) = t.as_associated_type_parent_trait(db) {
-                    push_new_def(trait_.into());
-                }
-            });
-            let targets = targets
-                .into_iter()
-                .filter_map(|it| {
-                    Some(HoverGotoTypeData {
-                        mod_path: render_path(
-                            db,
-                            it.module(db)?,
-                            it.name(db).map(|name| name.to_string()),
-                        ),
-                        nav: it.try_to_nav(db)?,
-                    })
-                })
-                .collect();
-            Some(HoverAction::GoToType(targets))
        }
-        _ => None,
+    };
+    if let Definition::GenericParam(GenericParam::TypeParam(it)) = def {
+        it.trait_bounds(db).into_iter().for_each(|it| push_new_def(it.into()));
+    } else {
+        let ty = match def {
+            Definition::Local(it) => it.ty(db),
+            Definition::GenericParam(GenericParam::ConstParam(it)) => it.ty(db),
+            _ => return None,
+        };
+        ty.walk(db, |t| {
+            if let Some(adt) = t.as_adt() {
+                push_new_def(adt.into());
+            } else if let Some(trait_) = t.as_dyn_trait() {
+                push_new_def(trait_.into());
+            } else if let Some(traits) = t.as_impl_traits(db) {
+                traits.into_iter().for_each(|it| push_new_def(it.into()));
+            } else if let Some(trait_) = t.as_associated_type_parent_trait(db) {
+                push_new_def(trait_.into());
+            }
+        });
    }
+    let targets = targets
+        .into_iter()
+        .filter_map(|it| {
+            Some(HoverGotoTypeData {
+                mod_path: render_path(db, it.module(db)?, it.name(db).map(|name| name.to_string())),
+                nav: it.try_to_nav(db)?,
+            })
+        })
+        .collect();
+    Some(HoverAction::GoToType(targets))
 }
 fn hover_markup(
@@ -324,17 +311,11 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
    let mod_path = definition_mod_path(db, &def);
    return match def {
        Definition::Macro(it) => {
-            // FIXME: Currently proc-macro do not have ast-node,
+            let label = macro_label(&it.source(db)?.value);
-            // such that it does not have source
-            // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
-            if it.is_proc_macro() {
-                return None;
-            }
-            let label = macro_label(&it.source(db).value);
            from_def_source_labeled(db, it, Some(label), mod_path)
        }
        Definition::Field(def) => {
-            let src = def.source(db).value;
+            let src = def.source(db)?.value;
            if let FieldSource::Named(it) = src {
                from_def_source_labeled(db, def, it.short_label(), mod_path)
            } else {
@@ -360,9 +341,9 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
            ModuleDef::Static(it) => from_def_source(db, it, mod_path),
            ModuleDef::Trait(it) => from_def_source(db, it, mod_path),
            ModuleDef::TypeAlias(it) => from_def_source(db, it, mod_path),
-            ModuleDef::BuiltinType(it) => return Some(it.to_string().into()),
+            ModuleDef::BuiltinType(it) => Some(Markup::fenced_block(&it)),
        },
-        Definition::Local(it) => return Some(Markup::fenced_block(&it.ty(db).display(db))),
+        Definition::Local(it) => Some(Markup::fenced_block(&it.ty(db).display(db))),
        Definition::SelfType(impl_def) => {
            impl_def.target_ty(db).as_adt().and_then(|adt| match adt {
                Adt::Struct(it) => from_def_source(db, it, mod_path),
@@ -370,10 +351,12 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
                Adt::Enum(it) => from_def_source(db, it, mod_path),
            })
        }
-        Definition::TypeParam(_) | Definition::LifetimeParam(_) | Definition::Label(_) => {
+        Definition::Label(it) => Some(Markup::fenced_block(&it.name(db))),
-            // FIXME: Hover for generic param
+        Definition::GenericParam(it) => match it {
-            None
+            GenericParam::TypeParam(it) => Some(Markup::fenced_block(&it.display(db))),
-        }
+            GenericParam::LifetimeParam(it) => Some(Markup::fenced_block(&it.name(db))),
+            GenericParam::ConstParam(it) => from_def_source(db, it, None),
+        },
    };
    fn from_def_source<A, D>(db: &RootDatabase, def: D, mod_path: Option<String>) -> Option<Markup>
@@ -381,7 +364,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
        D: HasSource<Ast = A> + HasAttrs + Copy,
        A: ShortLabel,
    {
-        let short_label = def.source(db).value.short_label();
+        let short_label = def.source(db)?.value.short_label();
        from_def_source_labeled(db, def, short_label, mod_path)
    }
@@ -403,7 +386,7 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
    return tokens.max_by_key(priority);
    fn priority(n: &SyntaxToken) -> usize {
        match n.kind() {
-            IDENT | INT_NUMBER => 3,
+            IDENT | INT_NUMBER | LIFETIME_IDENT => 3,
            T!['('] | T![')'] => 2,
            kind if kind.is_trivia() => 0,
            _ => 1,
@@ -471,7 +454,7 @@ mod tests {
 pub fn foo() -> u32 { 1 }
 fn main() {
-    let foo_test = foo()<|>;
+    let foo_test = foo()$0;
 }
 "#,
            expect![[r#"
@@ -490,7 +473,7 @@ fn main() {
 pub fn foo() -> u32 { 1 }
 fn main() {
-    let foo_test = foo()<|>;
+    let foo_test = foo()$0;
 }
 "#,
            expect![[r#"
@@ -520,7 +503,7 @@ fn main() {
        Option::Some(*memo + value)
    };
    let number = 5u32;
-    let mut iter<|> = scan(OtherStruct { i: num }, closure, number);
+    let mut iter$0 = scan(OtherStruct { i: num }, closure, number);
 }
 "#,
            expect![[r#"
@@ -540,7 +523,7 @@ fn main() {
            r#"
 pub fn foo() -> u32 { 1 }
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
 "#,
            expect![[r#"
                *foo*
@@ -572,7 +555,7 @@ mod a;
 mod b;
 mod c;
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
        "#,
            expect![[r#"
                *foo*
@@ -589,7 +572,7 @@ fn main() { let foo_test = fo<|>o(); }
            r#"
 pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str { }
-fn main() { let foo_test = fo<|>o(); }
+fn main() { let foo_test = fo$0o(); }
        "#,
            expect![[r#"
                *foo*
@@ -609,7 +592,7 @@ fn main() { let foo_test = fo<|>o(); }
    fn hover_shows_fn_signature_on_fn_name() {
        check(
            r#"
-pub fn foo<|>(a: u32, b: u32) -> u32 {}
+pub fn foo$0(a: u32, b: u32) -> u32 {}
 fn main() { }
 "#,
@@ -637,7 +620,7 @@ fn main() { }
 /// #
 /// foo(Path::new("hello, world!"))
 /// ```
-pub fn foo<|>(_: &Path) {}
+pub fn foo$0(_: &Path) {}
 fn main() { }
 "#,
@@ -670,7 +653,7 @@ fn main() { }
        check(
            r##"
 #[doc = r#"Raw string doc attr"#]
-pub fn foo<|>(_: &Path) {}
+pub fn foo$0(_: &Path) {}
 fn main() { }
 "##,
@@ -700,7 +683,7 @@ fn main() { }
 struct Foo { field_a: u32 }
 fn main() {
-    let foo = Foo { field_a<|>: 0, };
+    let foo = Foo { field_a$0: 0, };
 }
 "#,
            expect![[r#"
@@ -719,7 +702,7 @@ fn main() {
        // Hovering over the field in the definition
        check(
            r#"
-struct Foo { field_a<|>: u32 }
+struct Foo { field_a$0: u32 }
 fn main() {
    let foo = Foo { field_a: 0 };
@@ -742,7 +725,7 @@ fn main() {
    #[test]
    fn hover_const_static() {
        check(
-            r#"const foo<|>: u32 = 123;"#,
+            r#"const foo$0: u32 = 123;"#,
            expect![[r#"
                *foo*
@@ -756,7 +739,7 @@ fn main() {
            "#]],
        );
        check(
-            r#"static foo<|>: u32 = 456;"#,
+            r#"static foo$0: u32 = 456;"#,
            expect![[r#"
                *foo*
@@ -778,7 +761,7 @@ fn main() {
 struct Test<K, T = u8> { k: K, t: T }
 fn main() {
-    let zz<|> = Test { t: 23u8, k: 33 };
+    let zz$0 = Test { t: 23u8, k: 33 };
 }"#,
            expect![[r#"
                *zz*
@@ -797,7 +780,7 @@ fn main() {
 enum Option<T> { Some(T) }
 use Option::Some;
-fn main() { So<|>me(12); }
+fn main() { So$0me(12); }
 "#,
            expect![[r#"
                *Some*
@@ -817,7 +800,7 @@ fn main() { So<|>me(12); }
 enum Option<T> { Some(T) }
 use Option::Some;
-fn main() { let b<|>ar = Some(12); }
+fn main() { let b$0ar = Some(12); }
 "#,
            expect![[r#"
                *bar*
@@ -835,7 +818,7 @@ fn main() { let b<|>ar = Some(12); }
            r#"
 enum Option<T> {
    /// The None variant
-    Non<|>e
+    Non$0e
 }
 "#,
            expect![[r#"
@@ -862,7 +845,7 @@ enum Option<T> {
    Some(T)
 }
 fn main() {
-    let s = Option::Som<|>e(12);
+    let s = Option::Som$0e(12);
 }
 "#,
            expect![[r#"
@@ -886,7 +869,7 @@ fn main() {
    #[test]
    fn hover_for_local_variable() {
        check(
-            r#"fn func(foo: i32) { fo<|>o; }"#,
+            r#"fn func(foo: i32) { fo$0o; }"#,
            expect![[r#"
                *foo*
@@ -900,7 +883,7 @@ fn main() {
    #[test]
    fn hover_for_local_variable_pat() {
        check(
-            r#"fn func(fo<|>o: i32) {}"#,
+            r#"fn func(fo$0o: i32) {}"#,
            expect![[r#"
                *foo*
@@ -914,7 +897,7 @@ fn main() {
    #[test]
    fn hover_local_var_edge() {
        check(
-            r#"fn func(foo: i32) { if true { <|>foo; }; }"#,
+            r#"fn func(foo: i32) { if true { $0foo; }; }"#,
            expect![[r#"
                *foo*
@@ -928,7 +911,7 @@ fn main() {
    #[test]
    fn hover_for_param_edge() {
        check(
-            r#"fn func(<|>foo: i32) {}"#,
+            r#"fn func($0foo: i32) {}"#,
            expect![[r#"
                *foo*
@@ -948,7 +931,7 @@ fn main() {
            trait DerefMut {
                type Target: ?Sized;
            }
-            fn f(_x<|>: impl Deref<Target=u8> + DerefMut<Target=u8>) {}"#,
+            fn f(_x$0: impl Deref<Target=u8> + DerefMut<Target=u8>) {}"#,
            expect![[r#"
                *_x*
@@ -969,7 +952,7 @@ impl Thing {
    fn new() -> Thing { Thing { x: 0 } }
 }
-fn main() { let foo_<|>test = Thing::new(); }
+fn main() { let foo_$0test = Thing::new(); }
            "#,
            expect![[r#"
                *foo_test*
@@ -993,7 +976,7 @@ mod wrapper {
    }
 }
-fn main() { let foo_test = wrapper::Thing::new<|>(); }
+fn main() { let foo_test = wrapper::Thing::new$0(); }
 "#,
            expect![[r#"
                *new*
@@ -1020,7 +1003,7 @@ impl X {
 fn main() {
    match 1 {
-        X::C<|> => {},
+        X::C$0 => {},
        2 => {},
        _ => {}
    };
@@ -1046,7 +1029,7 @@ fn main() {
            r#"
 struct Thing { x: u32 }
 impl Thing {
-    fn new() -> Self { Self<|> { x: 0 } }
+    fn new() -> Self { Self$0 { x: 0 } }
 }
 "#,
            expect![[r#"
@@ -1065,7 +1048,7 @@ impl Thing {
            r#"
 struct Thing { x: u32 }
 impl Thing {
-    fn new() -> Self<|> { Self { x: 0 } }
+    fn new() -> Self$0 { Self { x: 0 } }
 }
 "#,
            expect![[r#"
@@ -1084,7 +1067,7 @@ impl Thing {
            r#"
 enum Thing { A }
 impl Thing {
-    pub fn new() -> Self<|> { Thing::A }
+    pub fn new() -> Self$0 { Thing::A }
 }
 "#,
            expect![[r#"
@@ -1103,7 +1086,7 @@ impl Thing {
            r#"
        enum Thing { A }
        impl Thing {
-            pub fn thing(a: Self<|>) {}
+            pub fn thing(a: Self$0) {}
        }
        "#,
            expect![[r#"
@@ -1128,7 +1111,7 @@ fn x() {}
 fn y() {
    let x = 0i32;
-    x<|>;
+    x$0;
 }
 "#,
            expect![[r#"
@@ -1147,7 +1130,7 @@ fn y() {
            r#"
 macro_rules! foo { () => {} }
-fn f() { fo<|>o!(); }
+fn f() { fo$0o!(); }
 "#,
            expect![[r#"
                *foo*
@@ -1166,10 +1149,13 @@ fn f() { fo<|>o!(); }
    #[test]
    fn test_hover_tuple_field() {
        check(
-            r#"struct TS(String, i32<|>);"#,
+            r#"struct TS(String, i32$0);"#,
            expect![[r#"
                *i32*
+                ```rust
                i32
+                ```
            "#]],
        )
    }
@@ -1181,7 +1167,7 @@ fn f() { fo<|>o!(); }
 macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
 fn foo() {}
 id! {
-    fn bar() { fo<|>o(); }
+    fn bar() { fo$0o(); }
 }
 "#,
            expect![[r#"
@@ -1203,7 +1189,7 @@ id! {
        check(
            r#"
 macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
-fn foo(bar:u32) { let a = id!(ba<|>r); }
+fn foo(bar:u32) { let a = id!(ba$0r); }
 "#,
            expect![[r#"
                *bar*
@@ -1221,7 +1207,7 @@ fn foo(bar:u32) { let a = id!(ba<|>r); }
            r#"
 macro_rules! id_deep { ($($tt:tt)*) => { $($tt)* } }
 macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
-fn foo(bar:u32) { let a = id!(ba<|>r); }
+fn foo(bar:u32) { let a = id!(ba$0r); }
 "#,
            expect![[r#"
                *bar*
@@ -1240,7 +1226,7 @@ fn foo(bar:u32) { let a = id!(ba<|>r); }
 macro_rules! id_deep { ($($tt:tt)*) => { $($tt)* } }
 macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
 fn bar() -> u32 { 0 }
-fn foo() { let a = id!([0u32, bar(<|>)] ); }
+fn foo() { let a = id!([0u32, bar($0)] ); }
 "#,
            expect![[r#"
                *bar()*
@@ -1258,7 +1244,7 @@ fn foo() { let a = id!([0u32, bar(<|>)] ); }
 macro_rules! arr { ($($tt:tt)*) => { [$($tt)*)] } }
 fn foo() {
    let mastered_for_itunes = "";
-    let _ = arr!("Tr<|>acks", &mastered_for_itunes);
+    let _ = arr!("Tr$0acks", &mastered_for_itunes);
 }
 "#,
            expect![[r#"
@@ -1279,7 +1265,7 @@ macro_rules! assert {}
 fn bar() -> bool { true }
 fn foo() {
-    assert!(ba<|>r());
+    assert!(ba$0r());
 }
 "#,
            expect![[r#"
@@ -1304,7 +1290,7 @@ fn foo() {
            macro_rules! format {}
            fn foo() {
-                format!("hel<|>lo {}", 0);
+                format!("hel$0lo {}", 0);
            }
            "#,
        );
@@ -1317,7 +1303,7 @@ fn foo() {
 ///　<- `\u{3000}` here
 fn foo() { }
-fn bar() { fo<|>o(); }
+fn bar() { fo$0o(); }
 ",
            expect![[r#"
                *foo*
@@ -1340,7 +1326,7 @@ fn bar() { fo<|>o(); }
    #[test]
    fn test_hover_function_show_qualifiers() {
        check(
-            r#"async fn foo<|>() {}"#,
+            r#"async fn foo$0() {}"#,
            expect![[r#"
                *foo*
@@ -1354,7 +1340,7 @@ fn bar() { fo<|>o(); }
            "#]],
        );
        check(
-            r#"pub const unsafe fn foo<|>() {}"#,
+            r#"pub const unsafe fn foo$0() {}"#,
            expect![[r#"
                *foo*
@@ -1368,7 +1354,7 @@ fn bar() { fo<|>o(); }
            "#]],
        );
        check(
-            r#"pub(crate) async unsafe extern "C" fn foo<|>() {}"#,
+            r#"pub(crate) async unsafe extern "C" fn foo$0() {}"#,
            expect![[r#"
                *foo*
@@ -1386,10 +1372,10 @@ fn bar() { fo<|>o(); }
    #[test]
    fn test_hover_trait_show_qualifiers() {
        check_actions(
-            r"unsafe trait foo<|>() {}",
+            r"unsafe trait foo$0() {}",
            expect![[r#"
                [
-                    Implementaion(
+                    Implementation(
                        FilePosition {
                            file_id: FileId(
                                0,
@@ -1407,7 +1393,7 @@ fn bar() { fo<|>o(); }
        check(
            r#"
 //- /main.rs crate:main deps:std
-extern crate st<|>d;
+extern crate st$0d;
 //- /std/lib.rs crate:std
 //! Standard library for this test
 //!
@@ -1425,7 +1411,7 @@ extern crate st<|>d;
        check(
            r#"
 //- /main.rs crate:main deps:std
-extern crate std as ab<|>c;
+extern crate std as ab$0c;
 //- /std/lib.rs crate:std
 //! Standard library for this test
 //!
@@ -1446,7 +1432,7 @@ extern crate std as ab<|>c;
    fn test_hover_mod_with_same_name_as_function() {
        check(
            r#"
-use self::m<|>y::Bar;
+use self::m$0y::Bar;
 mod my { pub struct Bar; }
 fn my() {}
@@ -1472,7 +1458,7 @@ fn my() {}
 /// bar docs
 struct Bar;
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
            expect![[r#"
                *Bar*
@@ -1499,7 +1485,7 @@ fn foo() { let bar = Ba<|>r; }
 #[doc = "bar docs"]
 struct Bar;
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
            expect![[r#"
                *Bar*
@@ -1528,7 +1514,7 @@ fn foo() { let bar = Ba<|>r; }
 #[doc = "bar docs 2"]
 struct Bar;
-fn foo() { let bar = Ba<|>r; }
+fn foo() { let bar = Ba$0r; }
 "#,
            expect![[r#"
                *Bar*
@@ -1556,7 +1542,7 @@ fn foo() { let bar = Ba<|>r; }
            r#"
 pub struct Foo;
 /// [Foo](struct.Foo.html)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1582,7 +1568,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [struct Foo](struct.Foo.html)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1610,7 +1596,7 @@ pub struct B<|>ar
 pub struct Foo;
 pub struct Bar {
    /// [Foo](struct.Foo.html)
-    fie<|>ld: ()
+    fie$0ld: ()
 }
 "#,
            expect![[r#"
@@ -1639,7 +1625,7 @@ pub mod foo {
    pub struct Foo;
 }
 /// [Foo](foo::Foo)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1669,7 +1655,7 @@ pub mod foo {
    pub struct Foo;
 }
 /// [Foo](foo::Foo)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1695,7 +1681,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [Foo]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1721,7 +1707,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [`Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1748,7 +1734,7 @@ pub struct B<|>ar
 pub struct Foo;
 fn Foo() {}
 /// [Foo()]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1774,7 +1760,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [`struct Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1800,7 +1786,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [`struct@Foo`]
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1828,7 +1814,7 @@ pub struct Foo;
 /// [my Foo][foo]
 ///
 /// [foo]: Foo
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1854,7 +1840,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [external](https://www.google.com)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1881,7 +1867,7 @@ pub struct B<|>ar
            r#"
 pub struct Foo;
 /// [baz](Baz)
-pub struct B<|>ar
+pub struct B$0ar
 "#,
            expect![[r#"
                *Bar*
@@ -1907,7 +1893,7 @@ pub struct B<|>ar
            r#"
 enum E {
    /// [E]
-    V<|> { field: i32 }
+    V$0 { field: i32 }
 }
 "#,
            expect![[r#"
@@ -1934,7 +1920,7 @@ enum E {
            r#"
 struct S {
    /// [`S`]
-    field<|>: i32
+    field$0: i32
 }
 "#,
            expect![[r#"
@@ -1962,16 +1948,16 @@ struct S {
 /// Test cases:
 /// case 1.  bare URL: https://www.example.com/
 /// case 2.  inline URL with title: [example](https://www.example.com/)
-/// case 3.  code refrence: [`Result`]
+/// case 3.  code reference: [`Result`]
-/// case 4.  code refrence but miss footnote: [`String`]
+/// case 4.  code reference but miss footnote: [`String`]
 /// case 5.  autolink: <http://www.example.com/>
 /// case 6.  email address: <[email protected]>
-/// case 7.  refrence: [example][example]
+/// case 7.  reference: [example][example]
 /// case 8.  collapsed link: [example][]
 /// case 9.  shortcut link: [example]
 /// case 10. inline without URL: [example]()
-/// case 11. refrence: [foo][foo]
+/// case 11. reference: [foo][foo]
-/// case 12. refrence: [foo][bar]
+/// case 12. reference: [foo][bar]
 /// case 13. collapsed link: [foo][]
 /// case 14. shortcut link: [foo]
 /// case 15. inline without URL: [foo]()
@@ -1980,7 +1966,7 @@ struct S {
 ///
 /// [`Result`]: ../../std/result/enum.Result.html
 /// [^example]: https://www.example.com/
-pub fn fo<|>o() {}
+pub fn fo$0o() {}
 "#,
            expect![[r#"
                *foo*
@@ -1998,16 +1984,16 @@ pub fn fo<|>o() {}
                Test cases:
                case 1.  bare URL: https://www.example.com/
                case 2.  inline URL with title: [example](https://www.example.com/)
-                case 3.  code refrence: `Result`
+                case 3.  code reference: `Result`
-                case 4.  code refrence but miss footnote: `String`
+                case 4.  code reference but miss footnote: `String`
                case 5.  autolink: http://www.example.com/
                case 6.  email address: [email protected]
-                case 7.  refrence: example
+                case 7.  reference: example
                case 8.  collapsed link: example
                case 9.  shortcut link: example
                case 10. inline without URL: example
-                case 11. refrence: foo
+                case 11. reference: foo
-                case 12. refrence: foo
+                case 12. reference: foo
                case 13. collapsed link: foo
                case 14. shortcut link: foo
                case 15. inline without URL: foo
@@ -2037,7 +2023,7 @@ macro_rules! bar {
 bar!();
-fn foo() { let bar = Bar; bar.fo<|>o(); }
+fn foo() { let bar = Bar; bar.fo$0o(); }
 "#,
            expect![[r#"
                *foo*
@@ -2075,7 +2061,7 @@ macro_rules! bar {
 bar!();
-fn foo() { let bar = Bar; bar.fo<|>o(); }
+fn foo() { let bar = Bar; bar.fo$0o(); }
 "#,
            expect![[r#"
                *foo*
@@ -2098,10 +2084,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
    #[test]
    fn test_hover_trait_has_impl_action() {
        check_actions(
-            r#"trait foo<|>() {}"#,
+            r#"trait foo$0() {}"#,
            expect![[r#"
                [
-                    Implementaion(
+                    Implementation(
                        FilePosition {
                            file_id: FileId(
                                0,
@@ -2117,10 +2103,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
    #[test]
    fn test_hover_struct_has_impl_action() {
        check_actions(
-            r"struct foo<|>() {}",
+            r"struct foo$0() {}",
            expect![[r#"
                [
-                    Implementaion(
+                    Implementation(
                        FilePosition {
                            file_id: FileId(
                                0,
@@ -2136,10 +2122,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
    #[test]
    fn test_hover_union_has_impl_action() {
        check_actions(
-            r#"union foo<|>() {}"#,
+            r#"union foo$0() {}"#,
            expect![[r#"
                [
-                    Implementaion(
+                    Implementation(
                        FilePosition {
                            file_id: FileId(
                                0,
@@ -2155,10 +2141,10 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
    #[test]
    fn test_hover_enum_has_impl_action() {
        check_actions(
-            r"enum foo<|>() { A, B }",
+            r"enum foo$0() { A, B }",
            expect![[r#"
                [
-                    Implementaion(
+                    Implementation(
                        FilePosition {
                            file_id: FileId(
                                0,
@@ -2172,11 +2158,30 @@ fn foo() { let bar = Bar; bar.fo<|>o(); }
    }
    #[test]
+    fn test_hover_self_has_impl_action() {
+        check_actions(
+            r#"struct foo where Self$0:;"#,
+            expect![[r#"
+                [
+                    Implementation(
+                        FilePosition {
+                            file_id: FileId(
+                                0,
+                            ),
+                            offset: 7,
+                        },
+                    ),
+                ]
+            "#]],
+        );
+    }
+    #[test]
    fn test_hover_test_has_action() {
        check_actions(
            r#"
 #[test]
-fn foo_<|>test() {}
+fn foo_$0test() {}
 "#,
            expect![[r#"
                [
@@ -2211,7 +2216,7 @@ fn foo_<|>test() {}
    fn test_hover_test_mod_has_action() {
        check_actions(
            r#"
-mod tests<|> {
+mod tests$0 {
    #[test]
    fn foo_test() {}
 }
@@ -2246,7 +2251,7 @@ mod tests<|> {
            r#"
 struct S{ f1: u32 }
-fn main() { let s<|>t = S{ f1:0 }; }
+fn main() { let s$0t = S{ f1:0 }; }
            "#,
            expect![[r#"
                [
@@ -2279,7 +2284,7 @@ fn main() { let s<|>t = S{ f1:0 }; }
 struct Arg(u32);
 struct S<T>{ f1: T }
-fn main() { let s<|>t = S{ f1:Arg(0) }; }
+fn main() { let s$0t = S{ f1:Arg(0) }; }
 "#,
            expect![[r#"
                [
@@ -2325,7 +2330,7 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
 struct Arg(u32);
 struct S<T>{ f1: T }
-fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
+fn main() { let s$0t = S{ f1: S{ f1: Arg(0) } }; }
            "#,
            expect![[r#"
                [
@@ -2374,7 +2379,7 @@ mod M {
    pub struct C(u32);
 }
-fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
+fn main() { let s$0t = (A(1), B(2), M::C(3) ); }
 "#,
            expect![[r#"
                [
@@ -2433,7 +2438,7 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
 trait Foo {}
 fn foo() -> impl Foo {}
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
            expect![[r#"
                [
@@ -2467,7 +2472,7 @@ trait Foo<T> {}
 struct S;
 fn foo() -> impl Foo<S> {}
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
            expect![[r#"
                [
@@ -2514,7 +2519,7 @@ trait Foo {}
 trait Bar {}
 fn foo() -> impl Foo + Bar {}
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
            "#,
            expect![[r#"
                [
@@ -2564,7 +2569,7 @@ struct S2 {}
 fn foo() -> impl Foo<S1> + Bar<S2> {}
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
            expect![[r#"
                [
@@ -2634,7 +2639,7 @@ fn main() { let s<|>t = foo(); }
        check_actions(
            r#"
 trait Foo {}
-fn foo(ar<|>g: &impl Foo) {}
+fn foo(ar$0g: &impl Foo) {}
 "#,
            expect![[r#"
                [
@@ -2668,7 +2673,7 @@ trait Foo {}
 trait Bar<T> {}
 struct S{}
-fn foo(ar<|>g: &impl Foo + Bar<S>) {}
+fn foo(ar$0g: &impl Foo + Bar<S>) {}
 "#,
            expect![[r#"
                [
@@ -2726,7 +2731,7 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
            r#"
 struct S;
 fn foo() {
-    let fo<|>o = async { S };
+    let fo$0o = async { S };
 }
 #[prelude_import] use future::*;
@@ -2778,7 +2783,7 @@ mod future {
            r#"
 trait Foo<T> {}
 struct S {}
-fn foo(ar<|>g: &impl Foo<S>) {}
+fn foo(ar$0g: &impl Foo<S>) {}
 "#,
            expect![[r#"
                [
@@ -2828,7 +2833,7 @@ impl Foo for S {}
 struct B<T>{}
 fn foo() -> B<dyn Foo> {}
-fn main() { let s<|>t = foo(); }
+fn main() { let s$0t = foo(); }
 "#,
            expect![[r#"
                [
@@ -2872,7 +2877,7 @@ fn main() { let s<|>t = foo(); }
        check_actions(
            r#"
 trait Foo {}
-fn foo(ar<|>g: &dyn Foo) {}
+fn foo(ar$0g: &dyn Foo) {}
 "#,
            expect![[r#"
                [
@@ -2904,7 +2909,7 @@ fn foo(ar<|>g: &dyn Foo) {}
            r#"
 trait Foo<T> {}
 struct S {}
-fn foo(ar<|>g: &dyn Foo<S>) {}
+fn foo(ar$0g: &dyn Foo<S>) {}
 "#,
            expect![[r#"
                [
@@ -2952,7 +2957,7 @@ trait DynTrait<T> {}
 struct B<T> {}
 struct S {}
-fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
+fn foo(a$0rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
            "#,
            expect![[r#"
                [
@@ -3033,7 +3038,7 @@ impl Foo for S { type Item = Bar; }
 fn test() -> impl Foo { S {} }
-fn main() { let s<|>t = test().get(); }
+fn main() { let s$0t = test().get(); }
 "#,
            expect![[r#"
                [
@@ -3060,6 +3065,71 @@ fn main() { let s<|>t = test().get(); }
    }
    #[test]
+    fn test_hover_const_param_has_goto_type_action() {
+        check_actions(
+            r#"
+struct Bar;
+struct Foo<const BAR: Bar>;
+impl<const BAR: Bar> Foo<BAR$0> {}
+"#,
+            expect![[r#"
+                [
+                    GoToType(
+                        [
+                            HoverGotoTypeData {
+                                mod_path: "test::Bar",
+                                nav: NavigationTarget {
+                                    file_id: FileId(
+                                        0,
+                                    ),
+                                    full_range: 0..11,
+                                    focus_range: 7..10,
+                                    name: "Bar",
+                                    kind: Struct,
+                                    description: "struct Bar",
+                                },
+                            },
+                        ],
+                    ),
+                ]
+            "#]],
+        );
+    }
+    #[test]
+    fn test_hover_type_param_has_goto_type_action() {
+        check_actions(
+            r#"
+trait Foo {}
+fn foo<T: Foo>(t: T$0){}
+"#,
+            expect![[r#"
+                [
+                    GoToType(
+                        [
+                            HoverGotoTypeData {
+                                mod_path: "test::Foo",
+                                nav: NavigationTarget {
+                                    file_id: FileId(
+                                        0,
+                                    ),
+                                    full_range: 0..12,
+                                    focus_range: 6..9,
+                                    name: "Foo",
+                                    kind: Trait,
+                                    description: "trait Foo",
+                                },
+                            },
+                        ],
+                    ),
+                ]
+            "#]],
+        );
+    }
+    #[test]
    fn hover_displays_normalized_crate_names() {
        check(
            r#"
@@ -3073,7 +3143,7 @@ pub mod wrapper {
 }
 //- /main.rs crate:main deps:name-with-dashes
-fn main() { let foo_test = name_with_dashes::wrapper::Thing::new<|>(); }
+fn main() { let foo_test = name_with_dashes::wrapper::Thing::new$0(); }
 "#,
            expect![[r#"
            *new*
@@ -3099,7 +3169,7 @@ struct S {
 fn main() {
    let s = S { f: 0 };
-    let S { f<|> } = &s;
+    let S { f$0 } = &s;
 }
 "#,
            expect![[r#"
@@ -3118,7 +3188,7 @@ fn main() {
            r#"
 struct Foo {}
 impl Foo {
-    fn bar(&sel<|>f) {}
+    fn bar(&sel$0f) {}
 }
 "#,
            expect![[r#"
@@ -3137,7 +3207,7 @@ impl Foo {
 struct Arc<T>(T);
 struct Foo {}
 impl Foo {
-    fn bar(sel<|>f: Arc<Foo>) {}
+    fn bar(sel$0f: Arc<Foo>) {}
 }
 "#,
            expect![[r#"
@@ -3154,7 +3224,7 @@ impl Foo {
        check(
            r#"
 /// Be quick;
-mod Foo<|> {
+mod Foo$0 {
    //! time is mana
    /// This comment belongs to the function
@@ -3185,7 +3255,7 @@ mod Foo<|> {
        check(
            r#"
 #[doc = "Be quick;"]
-mod Foo<|> {
+mod Foo$0 {
    #![doc = "time is mana"]
    #[doc = "This comment belongs to the function"]
@@ -3216,9 +3286,105 @@ mod Foo<|> {
        check_hover_no_result(
            r#"
 fn no_hover() {
-    // no<|>hover
+    // no$0hover
 }
 "#,
        );
    }
+    #[test]
+    fn hover_label() {
+        check(
+            r#"
+fn foo() {
+    'label$0: loop {}
+}
+"#,
+            expect![[r#"
+            *'label*
+            ```rust
+            'label
+            ```
+            "#]],
+        );
+    }
+    #[test]
+    fn hover_lifetime() {
+        check(
+            r#"fn foo<'lifetime>(_: &'lifetime$0 ()) {}"#,
+            expect![[r#"
+            *'lifetime*
+            ```rust
+            'lifetime
+            ```
+            "#]],
+        );
+    }
+    #[test]
+    fn hover_type_param() {
+        check(
+            r#"
+struct Foo<T>(T);
+trait Copy {}
+trait Clone {}
+trait Sized {}
+impl<T: Copy + Clone> Foo<T$0> where T: Sized {}
+"#,
+            expect![[r#"
+                *T*
+                ```rust
+                T: Copy + Clone + Sized
+                ```
+            "#]],
+        );
+        check(
+            r#"
+struct Foo<T>(T);
+impl<T> Foo<T$0> {}
+"#,
+            expect![[r#"
+                *T*
+                ```rust
+                T
+                ```
+                "#]],
+        );
+        // lifetimes aren't being substituted yet
+        check(
+            r#"
+struct Foo<T>(T);
+impl<T: 'static> Foo<T$0> {}
+"#,
+            expect![[r#"
+                *T*
+                ```rust
+                T: {error}
+                ```
+                "#]],
+        );
+    }
+    #[test]
+    fn hover_const_param() {
+        check(
+            r#"
+struct Foo<const LEN: usize>;
+impl<const LEN: usize> Foo<LEN$0> {}
+"#,
+            expect![[r#"
+                *LEN*
+                ```rust
+                const LEN: usize
+                ```
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 65df7979c..a2039fcc7 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -18,12 +18,6 @@ pub struct InlayHintsConfig {
    pub max_length: Option<usize>,
 }
-impl Default for InlayHintsConfig {
-    fn default() -> Self {
-        Self { type_hints: true, parameter_hints: true, chaining_hints: true, max_length: None }
-    }
-}
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum InlayKind {
    TypeHint,
@@ -359,9 +353,25 @@ fn is_argument_similar_to_param_name(
    }
    match get_string_representation(argument) {
        None => false,
-        Some(repr) => {
+        Some(argument_string) => {
-            let argument_string = repr.trim_start_matches('_');
+            let num_leading_underscores =
-            argument_string.starts_with(param_name) || argument_string.ends_with(param_name)
+                argument_string.bytes().take_while(|&c| c == b'_').count();
+            // Does the argument name begin with the parameter name? Ignore leading underscores.
+            let mut arg_bytes = argument_string.bytes().skip(num_leading_underscores);
+            let starts_with_pattern = param_name.bytes().all(
+                |expected| matches!(arg_bytes.next(), Some(actual) if expected.eq_ignore_ascii_case(&actual)),
+            );
+            if starts_with_pattern {
+                return true;
+            }
+            // Does the argument name end with the parameter name?
+            let mut arg_bytes = argument_string.bytes().skip(num_leading_underscores);
+            param_name.bytes().rev().all(
+                |expected| matches!(arg_bytes.next_back(), Some(actual) if expected.eq_ignore_ascii_case(&actual)),
+            )
        }
    }
 }
@@ -433,8 +443,15 @@ mod tests {
    use crate::{fixture, inlay_hints::InlayHintsConfig};
+    const TEST_CONFIG: InlayHintsConfig = InlayHintsConfig {
+        type_hints: true,
+        parameter_hints: true,
+        chaining_hints: true,
+        max_length: None,
+    };
    fn check(ra_fixture: &str) {
-        check_with_config(InlayHintsConfig::default(), ra_fixture);
+        check_with_config(TEST_CONFIG, ra_fixture);
    }
    fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) {
@@ -748,7 +765,7 @@ fn main() {
    #[test]
    fn hint_truncation() {
        check_with_config(
-            InlayHintsConfig { max_length: Some(8), ..Default::default() },
+            InlayHintsConfig { max_length: Some(8), ..TEST_CONFIG },
            r#"
 struct Smol<T>(T);
@@ -831,7 +848,7 @@ fn main() {
    #[test]
    fn omitted_parameters_hints_heuristics() {
        check_with_config(
-            InlayHintsConfig { max_length: Some(8), ..Default::default() },
+            InlayHintsConfig { max_length: Some(8), ..TEST_CONFIG },
            r#"
 fn map(f: i32) {}
 fn filter(predicate: i32) {}
@@ -900,6 +917,9 @@ fn main() {
    twiddle(true);
    doo(true);
+    const TWIDDLE_UPPERCASE: bool = true;
+    twiddle(TWIDDLE_UPPERCASE);
    let mut param_begin: Param = Param {};
    different_order(&param_begin);
    different_order(&mut param_begin);
@@ -924,7 +944,7 @@ fn main() {
    #[test]
    fn unit_structs_have_no_type_hints() {
        check_with_config(
-            InlayHintsConfig { max_length: Some(8), ..Default::default() },
+            InlayHintsConfig { max_length: Some(8), ..TEST_CONFIG },
            r#"
 enum Result<T, E> { Ok(T), Err(E) }
 use Result::*;
@@ -1381,4 +1401,41 @@ fn main() {
 "#,
        )
    }
+    #[test]
+    fn fn_hints() {
+        check(
+            r#"
+trait Sized {}
+fn foo() -> impl Fn() { loop {} }
+fn foo1() -> impl Fn(f64) { loop {} }
+fn foo2() -> impl Fn(f64, f64) { loop {} }
+fn foo3() -> impl Fn(f64, f64) -> u32 { loop {} }
+fn foo4() -> &'static dyn Fn(f64, f64) -> u32 { loop {} }
+fn foo5() -> &'static dyn Fn(&'static dyn Fn(f64, f64) -> u32, f64) -> u32 { loop {} }
+fn foo6() -> impl Fn(f64, f64) -> u32 + Sized { loop {} }
+fn foo7() -> *const (impl Fn(f64, f64) -> u32 + Sized) { loop {} }
+fn main() {
+    let foo = foo();
+     // ^^^ impl Fn()
+    let foo = foo1();
+     // ^^^ impl Fn(f64)
+    let foo = foo2();
+     // ^^^ impl Fn(f64, f64)
+    let foo = foo3();
+     // ^^^ impl Fn(f64, f64) -> u32
+    let foo = foo4();
+     // ^^^ &dyn Fn(f64, f64) -> u32
+    let foo = foo5();
+     // ^^^ &dyn Fn(&dyn Fn(f64, f64) -> u32, f64) -> u32
+    let foo = foo6();
+     // ^^^ impl Fn(f64, f64) -> u32 + Sized
+    let foo = foo7();
+     // ^^^ *const (impl Fn(f64, f64) -> u32 + Sized)
+}
+"#,
+        )
+    }
 }
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index b5a6f66fd..05380f2a1 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -104,7 +104,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextS
    // Special case that turns something like:
    //
    // ```
-    // my_function({<|>
+    // my_function({$0
    //    <some-expr>
    // })
    // ```
@@ -116,7 +116,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextS
    // ditto for
    //
    // ```
-    // use foo::{<|>
+    // use foo::{$0
    //    bar
    // };
    // ```
@@ -198,8 +198,8 @@ mod tests {
    use super::*;
-    fn check_join_lines(before: &str, after: &str) {
+    fn check_join_lines(ra_fixture_before: &str, ra_fixture_after: &str) {
-        let (before_cursor_pos, before) = extract_offset(before);
+        let (before_cursor_pos, before) = extract_offset(ra_fixture_before);
        let file = SourceFile::parse(&before).ok().unwrap();
        let range = TextRange::empty(before_cursor_pos);
@@ -214,7 +214,7 @@ mod tests {
            .apply_to_offset(before_cursor_pos)
            .expect("cursor position is affected by the edit");
        let actual = add_cursor(&actual, actual_cursor_pos);
-        assert_eq_text!(after, &actual);
+        assert_eq_text!(ra_fixture_after, &actual);
    }
    #[test]
@@ -222,13 +222,13 @@ mod tests {
        check_join_lines(
            r"
 fn foo() {
-    <|>foo(1,
+    $0foo(1,
    )
 }
 ",
            r"
 fn foo() {
-    <|>foo(1)
+    $0foo(1)
 }
 ",
        );
@@ -239,14 +239,14 @@ fn foo() {
        check_join_lines(
            r"
 pub fn reparse(&self, edit: &AtomTextEdit) -> File {
-    <|>self.incremental_reparse(edit).unwrap_or_else(|| {
+    $0self.incremental_reparse(edit).unwrap_or_else(|| {
        self.full_reparse(edit)
    })
 }
 ",
            r"
 pub fn reparse(&self, edit: &AtomTextEdit) -> File {
-    <|>self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
+    $0self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
 }
 ",
        );
@@ -257,13 +257,13 @@ pub fn reparse(&self, edit: &AtomTextEdit) -> File {
        check_join_lines(
            r"
 fn foo() {
-    foo(<|>{
+    foo($0{
        92
    })
 }",
            r"
 fn foo() {
-    foo(<|>92)
+    foo($092)
 }",
        );
    }
@@ -274,7 +274,7 @@ fn foo() {
            fn foo() {
                loop {
                    match x {
-                        92 => <|>{
+                        92 => $0{
                            continue;
                        }
                    }
@@ -285,7 +285,7 @@ fn foo() {
            fn foo() {
                loop {
                    match x {
-                        92 => <|>continue,
+                        92 => $0continue,
                    }
                }
            }
@@ -299,7 +299,7 @@ fn foo() {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
            u.foo()
        }
        Err(v) => v,
@@ -308,7 +308,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>u.foo(),
+        Ok(u) => $0u.foo(),
        Err(v) => v,
    }
 }",
@@ -321,7 +321,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo() {
    match ty {
-        <|> Some(ty) => {
+        $0 Some(ty) => {
            match ty {
                _ => false,
            }
@@ -333,7 +333,7 @@ fn foo() {
            r"
 fn foo() {
    match ty {
-        <|> Some(ty) => match ty {
+        $0 Some(ty) => match ty {
                _ => false,
            },
        _ => true,
@@ -350,7 +350,7 @@ fn foo() {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
            u.foo()
        },
        Err(v) => v,
@@ -359,7 +359,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>u.foo(),
+        Ok(u) => $0u.foo(),
        Err(v) => v,
    }
 }",
@@ -370,7 +370,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
            u.foo()
        }    ,
        Err(v) => v,
@@ -379,7 +379,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>u.foo()    ,
+        Ok(u) => $0u.foo()    ,
        Err(v) => v,
    }
 }",
@@ -390,7 +390,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>{
+        Ok(u) => $0{
            u.foo()
        }
        ,
@@ -400,7 +400,7 @@ fn foo(e: Result<U, V>) {
            r"
 fn foo(e: Result<U, V>) {
    match e {
-        Ok(u) => <|>u.foo()
+        Ok(u) => $0u.foo()
        ,
        Err(v) => v,
    }
@@ -414,13 +414,13 @@ fn foo(e: Result<U, V>) {
        check_join_lines(
            r"
 fn foo() {
-    let x = (<|>{
+    let x = ($0{
       4
    },);
 }",
            r"
 fn foo() {
-    let x = (<|>4,);
+    let x = ($04,);
 }",
        );
@@ -428,13 +428,13 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    let x = (<|>{
+    let x = ($0{
       4
    }   ,);
 }",
            r"
 fn foo() {
-    let x = (<|>4   ,);
+    let x = ($04   ,);
 }",
        );
@@ -442,14 +442,14 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    let x = (<|>{
+    let x = ($0{
       4
    }
    ,);
 }",
            r"
 fn foo() {
-    let x = (<|>4
+    let x = ($04
    ,);
 }",
        );
@@ -460,11 +460,11 @@ fn foo() {
        // No space after the '{'
        check_join_lines(
            r"
-<|>use syntax::{
+$0use syntax::{
    TextSize, TextRange,
 };",
            r"
-<|>use syntax::{TextSize, TextRange,
+$0use syntax::{TextSize, TextRange,
 };",
        );
    }
@@ -475,11 +475,11 @@ fn foo() {
        check_join_lines(
            r"
 use syntax::{
-<|>    TextSize, TextRange
+$0    TextSize, TextRange
 };",
            r"
 use syntax::{
-<|>    TextSize, TextRange};",
+$0    TextSize, TextRange};",
        );
    }
@@ -489,11 +489,11 @@ use syntax::{
        check_join_lines(
            r"
 use syntax::{
-<|>    TextSize, TextRange,
+$0    TextSize, TextRange,
 };",
            r"
 use syntax::{
-<|>    TextSize, TextRange};",
+$0    TextSize, TextRange};",
        );
    }
@@ -502,14 +502,14 @@ use syntax::{
        check_join_lines(
            r"
 use syntax::{
-    algo::<|>{
+    algo::$0{
        find_token_at_offset,
    },
    ast,
 };",
            r"
 use syntax::{
-    algo::<|>find_token_at_offset,
+    algo::$0find_token_at_offset,
    ast,
 };",
        );
@@ -520,13 +520,13 @@ use syntax::{
        check_join_lines(
            r"
 fn foo() {
-    // Hello<|>
+    // Hello$0
    // world!
 }
 ",
            r"
 fn foo() {
-    // Hello<|> world!
+    // Hello$0 world!
 }
 ",
        );
@@ -537,13 +537,13 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    /// Hello<|>
+    /// Hello$0
    /// world!
 }
 ",
            r"
 fn foo() {
-    /// Hello<|> world!
+    /// Hello$0 world!
 }
 ",
        );
@@ -554,13 +554,13 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    //! Hello<|>
+    //! Hello$0
    //! world!
 }
 ",
            r"
 fn foo() {
-    //! Hello<|> world!
+    //! Hello$0 world!
 }
 ",
        );
@@ -571,13 +571,13 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    // Hello<|>
+    // Hello$0
    /* world! */
 }
 ",
            r"
 fn foo() {
-    // Hello<|> world! */
+    // Hello$0 world! */
 }
 ",
        );
@@ -588,7 +588,7 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    // The<|>
+    // The$0
    /* quick
    brown
    fox! */
@@ -596,7 +596,7 @@ fn foo() {
 ",
            r"
 fn foo() {
-    // The<|> quick
+    // The$0 quick
    brown
    fox! */
 }
@@ -604,8 +604,8 @@ fn foo() {
        );
    }
-    fn check_join_lines_sel(before: &str, after: &str) {
+    fn check_join_lines_sel(ra_fixture_before: &str, ra_fixture_after: &str) {
-        let (sel, before) = extract_range(before);
+        let (sel, before) = extract_range(ra_fixture_before);
        let parse = SourceFile::parse(&before);
        let result = join_lines(&parse.tree(), sel);
        let actual = {
@@ -613,7 +613,7 @@ fn foo() {
            result.apply(&mut actual);
            actual
        };
-        assert_eq_text!(after, &actual);
+        assert_eq_text!(ra_fixture_after, &actual);
    }
    #[test]
@@ -621,10 +621,10 @@ fn foo() {
        check_join_lines_sel(
            r"
 fn foo() {
-    <|>foo(1,
+    $0foo(1,
        2,
        3,
-    <|>)
+    $0)
 }
    ",
            r"
@@ -639,9 +639,9 @@ fn foo() {
    fn test_join_lines_selection_struct() {
        check_join_lines_sel(
            r"
-struct Foo <|>{
+struct Foo $0{
    f: u32,
-}<|>
+}$0
    ",
            r"
 struct Foo { f: u32 }
@@ -654,9 +654,9 @@ struct Foo { f: u32 }
        check_join_lines_sel(
            r"
 fn foo() {
-    join(<|>type_params.type_params()
+    join($0type_params.type_params()
            .filter_map(|it| it.name())
-            .map(|it| it.text())<|>)
+            .map(|it| it.text())$0)
 }",
            r"
 fn foo() {
@@ -671,9 +671,9 @@ fn foo() {
            r"
 pub fn handle_find_matching_brace() {
    params.offsets
-        .map(|offset| <|>{
+        .map(|offset| $0{
            world.analysis().matching_brace(&file, offset).unwrap_or(offset)
-        }<|>)
+        }$0)
        .collect();
 }",
            r"
@@ -691,7 +691,7 @@ pub fn handle_find_matching_brace() {
            r"
 fn main() {
    let _ = {
-        // <|>foo
+        // $0foo
        // bar
        92
    };
@@ -700,7 +700,7 @@ fn main() {
            r"
 fn main() {
    let _ = {
-        // <|>foo bar
+        // $0foo bar
        92
    };
 }
@@ -712,12 +712,12 @@ fn main() {
    fn join_lines_mandatory_blocks_block() {
        check_join_lines(
            r"
-<|>fn foo() {
+$0fn foo() {
    92
 }
        ",
            r"
-<|>fn foo() { 92
+$0fn foo() { 92
 }
        ",
        );
@@ -725,14 +725,14 @@ fn main() {
        check_join_lines(
            r"
 fn foo() {
-    <|>if true {
+    $0if true {
        92
    }
 }
        ",
            r"
 fn foo() {
-    <|>if true { 92
+    $0if true { 92
    }
 }
        ",
@@ -741,14 +741,14 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    <|>loop {
+    $0loop {
        92
    }
 }
        ",
            r"
 fn foo() {
-    <|>loop { 92
+    $0loop { 92
    }
 }
        ",
@@ -757,14 +757,14 @@ fn foo() {
        check_join_lines(
            r"
 fn foo() {
-    <|>unsafe {
+    $0unsafe {
        92
    }
 }
        ",
            r"
 fn foo() {
-    <|>unsafe { 92
+    $0unsafe { 92
    }
 }
        ",
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index b3331f03f..1e03832ec 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -31,6 +31,7 @@ mod folding_ranges;
 mod goto_definition;
 mod goto_implementation;
 mod goto_type_definition;
+mod view_hir;
 mod hover;
 mod inlay_hints;
 mod join_lines;
@@ -75,14 +76,14 @@ pub use crate::{
    references::{rename::RenameError, Declaration, ReferenceSearchResult},
    runnables::{Runnable, RunnableKind, TestId},
    syntax_highlighting::{
-        tags::{Highlight, HighlightModifier, HighlightModifiers, HighlightTag},
+        tags::{Highlight, HlMod, HlMods, HlPunct, HlTag},
-        HighlightedRange,
+        HlRange,
    },
 };
-pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
+pub use assists::{Assist, AssistConfig, AssistId, AssistKind, InsertUseConfig};
 pub use completion::{
-    CompletionConfig, CompletionItem, CompletionItemKind, CompletionResolveCapability,
+    CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
-    CompletionScore, ImportEdit, InsertTextFormat,
+    InsertTextFormat,
 };
 pub use hir::{Documentation, Semantics};
 pub use ide_db::base_db::{
@@ -91,7 +92,7 @@ pub use ide_db::base_db::{
 };
 pub use ide_db::{
    call_info::CallInfo,
-    search::{Reference, ReferenceAccess, ReferenceKind},
+    search::{FileReference, ReferenceAccess, ReferenceKind},
 };
 pub use ide_db::{
    label::Label,
@@ -271,6 +272,10 @@ impl Analysis {
        self.with_db(|db| syntax_tree::syntax_tree(&db, file_id, text_range))
    }
+    pub fn view_hir(&self, position: FilePosition) -> Cancelable<String> {
+        self.with_db(|db| view_hir::view_hir(&db, position))
+    }
    pub fn expand_macro(&self, position: FilePosition) -> Cancelable<Option<ExpandedMacro>> {
        self.with_db(|db| expand_macro::expand_macro(db, position))
    }
@@ -444,12 +449,12 @@ impl Analysis {
    }
    /// Computes syntax highlighting for the given file
-    pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> {
+    pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HlRange>> {
        self.with_db(|db| syntax_highlighting::highlight(db, file_id, None, false))
    }
    /// Computes syntax highlighting for the given file range.
-    pub fn highlight_range(&self, frange: FileRange) -> Cancelable<Vec<HighlightedRange>> {
+    pub fn highlight_range(&self, frange: FileRange) -> Cancelable<Vec<HlRange>> {
        self.with_db(|db| {
            syntax_highlighting::highlight(db, frange.file_id, Some(frange.range), false)
        })
diff --git a/crates/ide/src/matching_brace.rs b/crates/ide/src/matching_brace.rs
index d70248afe..1bfa1439d 100644
--- a/crates/ide/src/matching_brace.rs
+++ b/crates/ide/src/matching_brace.rs
@@ -58,15 +58,15 @@ mod tests {
            assert_eq_text!(after, &actual);
        }
-        do_check("struct Foo { a: i32, }<|>", "struct Foo <|>{ a: i32, }");
+        do_check("struct Foo { a: i32, }$0", "struct Foo $0{ a: i32, }");
-        do_check("fn main() { |x: i32|<|> x * 2;}", "fn main() { <|>|x: i32| x * 2;}");
+        do_check("fn main() { |x: i32|$0 x * 2;}", "fn main() { $0|x: i32| x * 2;}");
-        do_check("fn main() { <|>|x: i32| x * 2;}", "fn main() { |x: i32<|>| x * 2;}");
+        do_check("fn main() { $0|x: i32| x * 2;}", "fn main() { |x: i32$0| x * 2;}");
        {
            mark::check!(pipes_not_braces);
            do_check(
-                "fn main() { match 92 { 1 | 2 |<|> 3 => 92 } }",
+                "fn main() { match 92 { 1 | 2 |$0 3 => 92 } }",
-                "fn main() { match 92 { 1 | 2 |<|> 3 => 92 } }",
+                "fn main() { match 92 { 1 | 2 |$0 3 => 92 } }",
            );
        }
    }
diff --git a/crates/ide/src/parent_module.rs b/crates/ide/src/parent_module.rs
index be344a09b..d343638fb 100644
--- a/crates/ide/src/parent_module.rs
+++ b/crates/ide/src/parent_module.rs
@@ -74,7 +74,7 @@ mod tests {
            //- /lib.rs
            mod foo;
            //- /foo.rs
-            <|>// empty
+            $0// empty
            ",
        );
        let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
@@ -90,7 +90,7 @@ mod tests {
            mod foo;
            //- /foo.rs
-            mod <|>bar;
+            mod $0bar;
            //- /foo/bar.rs
            // empty
@@ -107,7 +107,7 @@ mod tests {
            //- /lib.rs
            mod foo {
                mod bar {
-                    mod baz { <|> }
+                    mod baz { $0 }
                }
            }
            ",
@@ -123,7 +123,7 @@ mod tests {
 //- /main.rs
 mod foo;
 //- /foo.rs
-<|>
+$0
 "#,
        );
        assert_eq!(analysis.crate_for(file_id).unwrap().len(), 1);
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 21b2d7ca1..7d4757e02 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -3,7 +3,7 @@
 //! or `ast::NameRef`. If it's a `ast::NameRef`, at the classification step we
 //! try to resolve the direct tree parent of this element, otherwise we
 //! already have a definition and just need to get its HIR together with
-//! some information that is needed for futher steps of searching.
+//! some information that is needed for further steps of searching.
 //! After that, we collect files that might contain references and look
 //! for text occurrences of the identifier. If there's an `ast::NameRef`
 //! at the index that the match starts at and its tree parent is
@@ -13,15 +13,15 @@ pub(crate) mod rename;
 use hir::Semantics;
 use ide_db::{
+    base_db::FileId,
    defs::{Definition, NameClass, NameRefClass},
-    search::Reference,
+    search::{FileReference, ReferenceAccess, ReferenceKind, SearchScope, UsageSearchResult},
-    search::{ReferenceAccess, ReferenceKind, SearchScope},
    RootDatabase,
 };
 use syntax::{
    algo::find_node_at_offset,
    ast::{self, NameOwner},
-    match_ast, AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset,
+    match_ast, AstNode, SyntaxNode, TextRange, TokenAtOffset, T,
 };
 use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo, SymbolKind};
@@ -29,7 +29,7 @@ use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeI
 #[derive(Debug, Clone)]
 pub struct ReferenceSearchResult {
    declaration: Declaration,
-    references: Vec<Reference>,
+    references: UsageSearchResult,
 }
 #[derive(Debug, Clone)]
@@ -48,10 +48,21 @@ impl ReferenceSearchResult {
        &self.declaration.nav
    }
-    pub fn references(&self) -> &[Reference] {
+    pub fn references(&self) -> &UsageSearchResult {
        &self.references
    }
+    pub fn references_with_declaration(mut self) -> UsageSearchResult {
+        let decl_ref = FileReference {
+            range: self.declaration.nav.focus_or_full_range(),
+            kind: self.declaration.kind,
+            access: self.declaration.access,
+        };
+        let file_id = self.declaration.nav.file_id;
+        self.references.references.entry(file_id).or_default().push(decl_ref);
+        self.references
+    }
    /// Total number of references
    /// At least 1 since all valid references should
    /// Have a declaration
@@ -63,21 +74,11 @@ impl ReferenceSearchResult {
 // allow turning ReferenceSearchResult into an iterator
 // over References
 impl IntoIterator for ReferenceSearchResult {
-    type Item = Reference;
+    type Item = (FileId, Vec<FileReference>);
-    type IntoIter = std::vec::IntoIter<Reference>;
+    type IntoIter = std::collections::hash_map::IntoIter<FileId, Vec<FileReference>>;
-    fn into_iter(mut self) -> Self::IntoIter {
+    fn into_iter(self) -> Self::IntoIter {
-        let mut v = Vec::with_capacity(self.len());
+        self.references_with_declaration().into_iter()
-        v.push(Reference {
-            file_range: FileRange {
-                file_id: self.declaration.nav.file_id,
-                range: self.declaration.nav.focus_or_full_range(),
-            },
-            kind: self.declaration.kind,
-            access: self.declaration.access,
-        });
-        v.append(&mut self.references);
-        v.into_iter()
    }
 }
@@ -109,13 +110,12 @@ pub(crate) fn find_all_refs(
    let RangeInfo { range, info: def } = find_name(&sema, &syntax, position, opt_name)?;
-    let references = def
+    let mut usages = def.usages(sema).set_scope(search_scope).all();
-        .usages(sema)
+    usages
-        .set_scope(search_scope)
+        .references
-        .all()
+        .values_mut()
-        .into_iter()
+        .for_each(|it| it.retain(|r| search_kind == ReferenceKind::Other || search_kind == r.kind));
-        .filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind)
+    usages.references.retain(|_, it| !it.is_empty());
-        .collect();
    let nav = def.try_to_nav(sema.db)?;
    let decl_range = nav.focus_or_full_range();
@@ -130,13 +130,16 @@ pub(crate) fn find_all_refs(
                kind = ReferenceKind::FieldShorthandForLocal;
            }
        }
-    } else if matches!(def, Definition::LifetimeParam(_) | Definition::Label(_)) {
+    } else if matches!(
+        def,
+        Definition::GenericParam(hir::GenericParam::LifetimeParam(_)) | Definition::Label(_)
+    ) {
        kind = ReferenceKind::Lifetime;
    };
    let declaration = Declaration { nav, kind, access: decl_access(&def, &syntax, decl_range) };
-    Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }))
+    Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references: usages }))
 }
 fn find_name(
@@ -200,7 +203,7 @@ fn get_struct_def_name_for_struct_literal_search(
    position: FilePosition,
 ) -> Option<ast::Name> {
    if let TokenAtOffset::Between(ref left, ref right) = syntax.token_at_offset(position.offset) {
-        if right.kind() != SyntaxKind::L_CURLY && right.kind() != SyntaxKind::L_PAREN {
+        if right.kind() != T!['{'] && right.kind() != T!['('] {
            return None;
        }
        if let Some(name) =
@@ -227,7 +230,7 @@ fn get_enum_def_name_for_struct_literal_search(
    position: FilePosition,
 ) -> Option<ast::Name> {
    if let TokenAtOffset::Between(ref left, ref right) = syntax.token_at_offset(position.offset) {
-        if right.kind() != SyntaxKind::L_CURLY && right.kind() != SyntaxKind::L_PAREN {
+        if right.kind() != T!['{'] && right.kind() != T!['('] {
            return None;
        }
        if let Some(name) =
@@ -252,8 +255,8 @@ fn try_find_self_references(
    syntax: &SyntaxNode,
    position: FilePosition,
 ) -> Option<RangeInfo<ReferenceSearchResult>> {
-    let self_token =
+    let FilePosition { file_id, offset } = position;
-        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)?;
+    let self_token = syntax.token_at_offset(offset).find(|t| t.kind() == T![self])?;
    let parent = self_token.parent();
    match_ast! {
        match parent {
@@ -274,7 +277,7 @@ fn try_find_self_references(
    let declaration = Declaration {
        nav: NavigationTarget {
-            file_id: position.file_id,
+            file_id,
            full_range: self_param.syntax().text_range(),
            focus_range: Some(param_self_token.text_range()),
            name: param_self_token.text().clone(),
@@ -290,7 +293,7 @@ fn try_find_self_references(
            ReferenceAccess::Read
        }),
    };
-    let references = function
+    let refs = function
        .body()
        .map(|body| {
            body.syntax()
@@ -304,14 +307,16 @@ fn try_find_self_references(
                        None
                    }
                })
-                .map(|token| Reference {
+                .map(|token| FileReference {
-                    file_range: FileRange { file_id: position.file_id, range: token.text_range() },
+                    range: token.text_range(),
                    kind: ReferenceKind::SelfKw,
                    access: declaration.access, // FIXME: properly check access kind here instead of copying it from the declaration
                })
                .collect()
        })
        .unwrap_or_default();
+    let mut references = UsageSearchResult::default();
+    references.references.insert(file_id, refs);
    Some(RangeInfo::new(
        param_self_token.text_range(),
@@ -331,7 +336,7 @@ mod tests {
    fn test_struct_literal_after_space() {
        check(
            r#"
-struct Foo <|>{
+struct Foo $0{
    a: i32,
 }
 impl Foo {
@@ -354,7 +359,7 @@ fn main() {
    fn test_struct_literal_before_space() {
        check(
            r#"
-struct Foo<|> {}
+struct Foo$0 {}
    fn main() {
    let f: Foo;
    f = Foo {};
@@ -373,7 +378,7 @@ struct Foo<|> {}
    fn test_struct_literal_with_generic_type() {
        check(
            r#"
-struct Foo<T> <|>{}
+struct Foo<T> $0{}
    fn main() {
    let f: Foo::<i32>;
    f = Foo {};
@@ -391,7 +396,7 @@ struct Foo<T> <|>{}
    fn test_struct_literal_for_tuple() {
        check(
            r#"
-struct Foo<|>(i32);
+struct Foo$0(i32);
 fn main() {
    let f: Foo;
@@ -410,7 +415,7 @@ fn main() {
    fn test_enum_after_space() {
        check(
            r#"
-enum Foo <|>{
+enum Foo $0{
    A,
    B,
 }
@@ -431,7 +436,7 @@ fn main() {
    fn test_enum_before_space() {
        check(
            r#"
-enum Foo<|> {
+enum Foo$0 {
    A,
    B,
 }
@@ -453,7 +458,7 @@ fn main() {
    fn test_enum_with_generic_type() {
        check(
            r#"
-enum Foo<T> <|>{
+enum Foo<T> $0{
    A(T),
    B,
 }
@@ -474,7 +479,7 @@ fn main() {
    fn test_enum_for_tuple() {
        check(
            r#"
-enum Foo<|>{
+enum Foo$0{
    A(i8),
    B(i8),
 }
@@ -498,7 +503,7 @@ fn main() {
 fn main() {
    let mut i = 1;
    let j = 1;
-    i = i<|> + j;
+    i = i$0 + j;
    {
        i = 0;
@@ -522,7 +527,7 @@ fn main() {
        check(
            r#"
 fn foo() {
-    let spam<|> = 92;
+    let spam$0 = 92;
    spam + spam
 }
 fn bar() {
@@ -543,7 +548,7 @@ fn bar() {
    fn test_find_all_refs_for_param_inside() {
        check(
            r#"
-fn foo(i : u32) -> u32 { i<|> }
+fn foo(i : u32) -> u32 { i$0 }
 "#,
            expect![[r#"
                i ValueParam FileId(0) 7..8 Other
@@ -557,7 +562,7 @@ fn foo(i : u32) -> u32 { i<|> }
    fn test_find_all_refs_for_fn_param() {
        check(
            r#"
-fn foo(i<|> : u32) -> u32 { i }
+fn foo(i$0 : u32) -> u32 { i }
 "#,
            expect![[r#"
                i ValueParam FileId(0) 7..8 Other
@@ -573,7 +578,7 @@ fn foo(i<|> : u32) -> u32 { i }
            r#"
 //- /lib.rs
 struct Foo {
-    pub spam<|>: u32,
+    pub spam$0: u32,
 }
 fn main(s: Foo) {
@@ -594,7 +599,7 @@ fn main(s: Foo) {
            r#"
 struct Foo;
 impl Foo {
-    fn f<|>(&self) {  }
+    fn f$0(&self) {  }
 }
 "#,
            expect![[r#"
@@ -610,7 +615,7 @@ impl Foo {
            r#"
 enum Foo {
    A,
-    B<|>,
+    B$0,
    C,
 }
 "#,
@@ -627,7 +632,7 @@ enum Foo {
            r#"
 enum Foo {
    A,
-    B { field<|>: u8 },
+    B { field$0: u8 },
    C,
 }
 "#,
@@ -669,7 +674,7 @@ pub struct Bar {
 }
 fn f() {
-    let i = foo::Foo<|> { n: 5 };
+    let i = foo::Foo$0 { n: 5 };
 }
 "#,
            expect![[r#"
@@ -689,7 +694,7 @@ fn f() {
        check(
            r#"
 //- /lib.rs
-mod foo<|>;
+mod foo$0;
 use foo::Foo;
@@ -726,7 +731,7 @@ fn f() {
 }
 //- /foo/some.rs
-pub(super) struct Foo<|> {
+pub(super) struct Foo$0 {
    pub n: u32,
 }
 "#,
@@ -746,7 +751,7 @@ pub(super) struct Foo<|> {
            mod foo;
            mod bar;
-            pub fn quux<|>() {}
+            pub fn quux$0() {}
            //- /foo.rs
            fn f() { super::quux(); }
@@ -782,7 +787,7 @@ pub(super) struct Foo<|> {
        check(
            r#"
 #[macro_export]
-macro_rules! m1<|> { () => (()) }
+macro_rules! m1$0 { () => (()) }
 fn foo() {
    m1();
@@ -803,7 +808,7 @@ fn foo() {
        check(
            r#"
 fn foo() {
-    let mut i<|> = 0;
+    let mut i$0 = 0;
    i = i + 1;
 }
 "#,
@@ -826,7 +831,7 @@ struct S {
 fn foo() {
    let mut s = S{f: 0};
-    s.f<|> = 0;
+    s.f$0 = 0;
 }
 "#,
            expect![[r#"
@@ -843,7 +848,7 @@ fn foo() {
        check(
            r#"
 fn foo() {
-    let i<|>;
+    let i$0;
    i = 1;
 }
 "#,
@@ -863,7 +868,7 @@ mod foo {
    pub struct Foo;
    impl Foo {
-        pub fn new<|>() -> Foo { Foo }
+        pub fn new$0() -> Foo { Foo }
    }
 }
@@ -886,7 +891,7 @@ fn main() {
 //- /lib.rs
 mod foo { mod bar; }
-fn f<|>() {}
+fn f$0() {}
 //- /foo/bar.rs
 use crate::f;
@@ -907,7 +912,7 @@ fn g() { f(); }
        check(
            r#"
 struct S {
-    field<|>: u8,
+    field$0: u8,
 }
 fn f(s: S) {
@@ -930,7 +935,7 @@ fn f(s: S) {
            r#"
 enum En {
    Variant {
-        field<|>: u8,
+        field$0: u8,
    }
 }
@@ -955,7 +960,7 @@ fn f(e: En) {
 mod m {
    pub enum En {
        Variant {
-            field<|>: u8,
+            field$0: u8,
        }
    }
 }
@@ -980,7 +985,7 @@ struct Foo { bar: i32 }
 impl Foo {
    fn foo(self) {
-        let x = self<|>.bar;
+        let x = self$0.bar;
        if true {
            let _ = match () {
                () => self,
@@ -1016,12 +1021,14 @@ impl Foo {
            actual += "\n\n";
        }
-        for r in &refs.references {
+        for (file_id, references) in refs.references {
-            format_to!(actual, "{:?} {:?} {:?}", r.file_range.file_id, r.file_range.range, r.kind);
+            for r in references {
-            if let Some(access) = r.access {
+                format_to!(actual, "{:?} {:?} {:?}", file_id, r.range, r.kind);
-                format_to!(actual, " {:?}", access);
+                if let Some(access) = r.access {
+                    format_to!(actual, " {:?}", access);
+                }
+                actual += "\n";
            }
-            actual += "\n";
        }
        expect.assert_eq(&actual)
    }
@@ -1032,7 +1039,7 @@ impl Foo {
            r#"
 trait Foo<'a> {}
 impl<'a> Foo<'a> for &'a () {}
-fn foo<'a, 'b: 'a>(x: &'a<|> ()) -> &'a () where &'a (): Foo<'a> {
+fn foo<'a, 'b: 'a>(x: &'a$0 ()) -> &'a () where &'a (): Foo<'a> {
    fn bar<'a>(_: &'a ()) {}
    x
 }
@@ -1053,7 +1060,7 @@ fn foo<'a, 'b: 'a>(x: &'a<|> ()) -> &'a () where &'a (): Foo<'a> {
    fn test_find_lifetimes_type_alias() {
        check(
            r#"
-type Foo<'a, T> where T: 'a<|> = &'a T;
+type Foo<'a, T> where T: 'a$0 = &'a T;
 "#,
            expect![[r#"
                'a LifetimeParam FileId(0) 9..11 9..11 Lifetime
@@ -1072,7 +1079,7 @@ trait Foo<'a> {
    fn foo() -> &'a ();
 }
 impl<'a> Foo<'a> for &'a () {
-    fn foo() -> &'a<|> () {
+    fn foo() -> &'a$0 () {
        unimplemented!()
    }
 }
@@ -1093,7 +1100,7 @@ impl<'a> Foo<'a> for &'a () {
            r#"
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
-    let a<|> = "test";
+    let a$0 = "test";
    foo!(a);
 }
 "#,
@@ -1112,7 +1119,7 @@ fn main() {
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
    let a = "test";
-    foo!(a<|>);
+    foo!(a$0);
 }
 "#,
            expect![[r#"
@@ -1130,7 +1137,7 @@ fn main() {
 fn foo<'a>() -> &'a () {
    'a: loop {
        'b: loop {
-            continue 'a<|>;
+            continue 'a$0;
        }
        break 'a;
    }
@@ -1144,4 +1151,20 @@ fn foo<'a>() -> &'a () {
            "#]],
        );
    }
+    #[test]
+    fn test_find_const_param() {
+        check(
+            r#"
+fn foo<const FOO$0: usize>() -> usize {
+    FOO
+}
+"#,
+            expect![[r#"
+                FOO ConstParam FileId(0) 7..23 13..16 Other
+                FileId(0) 42..45 Other
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 854bf194e..c3ae568c2 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -1,29 +1,30 @@
 //! FIXME: write short doc here
 use std::{
    convert::TryInto,
-    error::Error,
    fmt::{self, Display},
 };
 use hir::{Module, ModuleDef, ModuleSource, Semantics};
-use ide_db::base_db::{AnchoredPathBuf, FileId, FileRange, SourceDatabaseExt};
 use ide_db::{
+    base_db::{AnchoredPathBuf, FileId, FileRange, SourceDatabaseExt},
    defs::{Definition, NameClass, NameRefClass},
+    search::FileReference,
    RootDatabase,
 };
 use syntax::{
    algo::find_node_at_offset,
    ast::{self, NameOwner},
-    lex_single_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken,
+    lex_single_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken, T,
 };
 use test_utils::mark;
 use text_edit::TextEdit;
 use crate::{
-    references::find_all_refs, FilePosition, FileSystemEdit, RangeInfo, Reference, ReferenceKind,
+    FilePosition, FileSystemEdit, RangeInfo, ReferenceKind, ReferenceSearchResult, SourceChange,
-    SourceChange, SourceFileEdit, TextRange, TextSize,
+    SourceFileEdit, TextRange, TextSize,
 };
+type RenameResult<T> = Result<T, RenameError>;
 #[derive(Debug)]
 pub struct RenameError(pub(crate) String);
@@ -33,26 +34,30 @@ impl fmt::Display for RenameError {
    }
 }
-impl Error for RenameError {}
+macro_rules! format_err {
+    ($fmt:expr) => {RenameError(format!($fmt))};
+    ($fmt:expr, $($arg:tt)+) => {RenameError(format!($fmt, $($arg)+))}
+}
+macro_rules! bail {
+    ($($tokens:tt)*) => {return Err(format_err!($($tokens)*))}
+}
 pub(crate) fn prepare_rename(
    db: &RootDatabase,
    position: FilePosition,
-) -> Result<RangeInfo<()>, RenameError> {
+) -> RenameResult<RangeInfo<()>> {
    let sema = Semantics::new(db);
    let source_file = sema.parse(position.file_id);
    let syntax = source_file.syntax();
    if let Some(module) = find_module_at_offset(&sema, position, syntax) {
        rename_mod(&sema, position, module, "dummy")
    } else if let Some(self_token) =
-        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
+        syntax.token_at_offset(position.offset).find(|t| t.kind() == T![self])
    {
        rename_self_to_param(&sema, position, self_token, "dummy")
    } else {
-        let range = match find_all_refs(&sema, position, None) {
+        let RangeInfo { range, .. } = find_all_refs(&sema, position)?;
-            Some(RangeInfo { range, .. }) => range,
-            None => return Err(RenameError("No references found at position".to_string())),
-        };
        Ok(RangeInfo::new(range, SourceChange::from(vec![])))
    }
    .map(|info| RangeInfo::new(info.range, ()))
@@ -62,7 +67,7 @@ pub(crate) fn rename(
    db: &RootDatabase,
    position: FilePosition,
    new_name: &str,
-) -> Result<RangeInfo<SourceChange>, RenameError> {
+) -> RenameResult<RangeInfo<SourceChange>> {
    let sema = Semantics::new(db);
    rename_with_semantics(&sema, position, new_name)
 }
@@ -71,42 +76,18 @@ pub(crate) fn rename_with_semantics(
    sema: &Semantics<RootDatabase>,
    position: FilePosition,
    new_name: &str,
-) -> Result<RangeInfo<SourceChange>, RenameError> {
+) -> RenameResult<RangeInfo<SourceChange>> {
-    let is_lifetime_name = match lex_single_syntax_kind(new_name) {
-        Some(res) => match res {
-            (SyntaxKind::IDENT, _) => false,
-            (SyntaxKind::UNDERSCORE, _) => false,
-            (SyntaxKind::SELF_KW, _) => return rename_to_self(&sema, position),
-            (SyntaxKind::LIFETIME_IDENT, _) if new_name != "'static" && new_name != "'_" => true,
-            (SyntaxKind::LIFETIME_IDENT, _) => {
-                return Err(RenameError(format!(
-                    "Invalid name `{0}`: Cannot rename lifetime to {0}",
-                    new_name
-                )))
-            }
-            (_, Some(syntax_error)) => {
-                return Err(RenameError(format!("Invalid name `{}`: {}", new_name, syntax_error)))
-            }
-            (_, None) => {
-                return Err(RenameError(format!("Invalid name `{}`: not an identifier", new_name)))
-            }
-        },
-        None => return Err(RenameError(format!("Invalid name `{}`: not an identifier", new_name))),
-    };
    let source_file = sema.parse(position.file_id);
    let syntax = source_file.syntax();
-    // this is here to prevent lifetime renames from happening on modules and self
-    if is_lifetime_name {
+    if let Some(module) = find_module_at_offset(&sema, position, syntax) {
-        rename_reference(&sema, position, new_name, is_lifetime_name)
-    } else if let Some(module) = find_module_at_offset(&sema, position, syntax) {
        rename_mod(&sema, position, module, new_name)
    } else if let Some(self_token) =
-        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
+        syntax.token_at_offset(position.offset).find(|t| t.kind() == T![self])
    {
        rename_self_to_param(&sema, position, self_token, new_name)
    } else {
-        rename_reference(&sema, position, new_name, is_lifetime_name)
+        rename_reference(&sema, position, new_name)
    }
 }
@@ -127,6 +108,33 @@ pub(crate) fn will_rename_file(
    Some(change)
 }
+#[derive(Debug, PartialEq)]
+enum IdentifierKind {
+    Ident,
+    Lifetime,
+    ToSelf,
+    Underscore,
+}
+fn check_identifier(new_name: &str) -> RenameResult<IdentifierKind> {
+    match lex_single_syntax_kind(new_name) {
+        Some(res) => match res {
+            (SyntaxKind::IDENT, _) => Ok(IdentifierKind::Ident),
+            (T![_], _) => Ok(IdentifierKind::Underscore),
+            (T![self], _) => Ok(IdentifierKind::ToSelf),
+            (SyntaxKind::LIFETIME_IDENT, _) if new_name != "'static" && new_name != "'_" => {
+                Ok(IdentifierKind::Lifetime)
+            }
+            (SyntaxKind::LIFETIME_IDENT, _) => {
+                bail!("Invalid name `{0}`: Cannot rename lifetime to {0}", new_name)
+            }
+            (_, Some(syntax_error)) => bail!("Invalid name `{}`: {}", new_name, syntax_error),
+            (_, None) => bail!("Invalid name `{}`: not an identifier", new_name),
+        },
+        None => bail!("Invalid name `{}`: not an identifier", new_name),
+    }
+}
 fn find_module_at_offset(
    sema: &Semantics<RootDatabase>,
    position: FilePosition,
@@ -155,39 +163,54 @@ fn find_module_at_offset(
    Some(module)
 }
-fn source_edit_from_reference(
+fn find_all_refs(
+    sema: &Semantics<RootDatabase>,
+    position: FilePosition,
+) -> RenameResult<RangeInfo<ReferenceSearchResult>> {
+    crate::references::find_all_refs(sema, position, None)
+        .ok_or_else(|| format_err!("No references found at position"))
+}
+fn source_edit_from_references(
    sema: &Semantics<RootDatabase>,
-    reference: Reference,
+    file_id: FileId,
+    references: &[FileReference],
    new_name: &str,
 ) -> SourceFileEdit {
-    let mut replacement_text = String::new();
+    let mut edit = TextEdit::builder();
-    let range = match reference.kind {
+    for reference in references {
-        ReferenceKind::FieldShorthandForField => {
+        let mut replacement_text = String::new();
-            mark::hit!(test_rename_struct_field_for_shorthand);
+        let range = match reference.kind {
-            replacement_text.push_str(new_name);
+            ReferenceKind::FieldShorthandForField => {
-            replacement_text.push_str(": ");
+                mark::hit!(test_rename_struct_field_for_shorthand);
-            TextRange::new(reference.file_range.range.start(), reference.file_range.range.start())
+                replacement_text.push_str(new_name);
-        }
+                replacement_text.push_str(": ");
-        ReferenceKind::FieldShorthandForLocal => {
+                TextRange::new(reference.range.start(), reference.range.start())
-            mark::hit!(test_rename_local_for_field_shorthand);
+            }
-            replacement_text.push_str(": ");
+            ReferenceKind::FieldShorthandForLocal => {
-            replacement_text.push_str(new_name);
+                mark::hit!(test_rename_local_for_field_shorthand);
-            TextRange::new(reference.file_range.range.end(), reference.file_range.range.end())
+                replacement_text.push_str(": ");
-        }
+                replacement_text.push_str(new_name);
-        ReferenceKind::RecordFieldExprOrPat => {
+                TextRange::new(reference.range.end(), reference.range.end())
-            mark::hit!(test_rename_field_expr_pat);
+            }
-            replacement_text.push_str(new_name);
+            ReferenceKind::RecordFieldExprOrPat => {
-            edit_text_range_for_record_field_expr_or_pat(sema, reference.file_range, new_name)
+                mark::hit!(test_rename_field_expr_pat);
-        }
+                replacement_text.push_str(new_name);
-        _ => {
+                edit_text_range_for_record_field_expr_or_pat(
-            replacement_text.push_str(new_name);
+                    sema,
-            reference.file_range.range
+                    FileRange { file_id, range: reference.range },
-        }
+                    new_name,
-    };
+                )
-    SourceFileEdit {
+            }
-        file_id: reference.file_range.file_id,
+            _ => {
-        edit: TextEdit::replace(range, replacement_text),
+                replacement_text.push_str(new_name);
+                reference.range
+            }
+        };
+        edit.replace(range, replacement_text);
    }
+    SourceFileEdit { file_id, edit: edit.finish() }
 }
 fn edit_text_range_for_record_field_expr_or_pat(
@@ -223,7 +246,10 @@ fn rename_mod(
    position: FilePosition,
    module: Module,
    new_name: &str,
-) -> Result<RangeInfo<SourceChange>, RenameError> {
+) -> RenameResult<RangeInfo<SourceChange>> {
+    if IdentifierKind::Ident != check_identifier(new_name)? {
+        bail!("Invalid name `{0}`: cannot rename module to {0}", new_name);
+    }
    let mut source_file_edits = Vec::new();
    let mut file_system_edits = Vec::new();
@@ -254,12 +280,10 @@ fn rename_mod(
        source_file_edits.push(edit);
    }
-    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
-        .ok_or_else(|| RenameError("No references found at position".to_string()))?;
+    let ref_edits = refs.references().iter().map(|(&file_id, references)| {
-    let ref_edits = refs
+        source_edit_from_references(sema, file_id, references, new_name)
-        .references
+    });
-        .into_iter()
-        .map(|reference| source_edit_from_reference(sema, reference, new_name));
    source_file_edits.extend(ref_edits);
    Ok(RangeInfo::new(range, SourceChange::from_edits(source_file_edits, file_system_edits)))
@@ -274,27 +298,26 @@ fn rename_to_self(
    let (fn_def, fn_ast) = find_node_at_offset::<ast::Fn>(syn, position.offset)
        .and_then(|fn_ast| sema.to_def(&fn_ast).zip(Some(fn_ast)))
-        .ok_or_else(|| RenameError("No surrounding method declaration found".to_string()))?;
+        .ok_or_else(|| format_err!("No surrounding method declaration found"))?;
    let param_range = fn_ast
        .param_list()
        .and_then(|p| p.params().next())
-        .ok_or_else(|| RenameError("Method has no parameters".to_string()))?
+        .ok_or_else(|| format_err!("Method has no parameters"))?
        .syntax()
        .text_range();
    if !param_range.contains(position.offset) {
-        return Err(RenameError("Only the first parameter can be self".to_string()));
+        bail!("Only the first parameter can be self");
    }
    let impl_block = find_node_at_offset::<ast::Impl>(syn, position.offset)
        .and_then(|def| sema.to_def(&def))
-        .ok_or_else(|| RenameError("No impl block found for function".to_string()))?;
+        .ok_or_else(|| format_err!("No impl block found for function"))?;
    if fn_def.self_param(sema.db).is_some() {
-        return Err(RenameError("Method already has a self parameter".to_string()));
+        bail!("Method already has a self parameter");
    }
    let params = fn_def.assoc_fn_params(sema.db);
-    let first_param =
+    let first_param = params.first().ok_or_else(|| format_err!("Method has no parameters"))?;
-        params.first().ok_or_else(|| RenameError("Method has no parameters".into()))?;
    let first_param_ty = first_param.ty();
    let impl_ty = impl_block.target_ty(sema.db);
    let (ty, self_param) = if impl_ty.remove_ref().is_some() {
@@ -307,23 +330,17 @@ fn rename_to_self(
    };
    if ty != impl_ty {
-        return Err(RenameError("Parameter type differs from impl block type".to_string()));
+        bail!("Parameter type differs from impl block type");
    }
-    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
-        .ok_or_else(|| RenameError("No reference found at position".to_string()))?;
-    let (param_ref, usages): (Vec<Reference>, Vec<Reference>) = refs
-        .into_iter()
-        .partition(|reference| param_range.intersect(reference.file_range.range).is_some());
-    if param_ref.is_empty() {
-        return Err(RenameError("Parameter to rename not found".to_string()));
-    }
-    let mut edits = usages
+    let mut edits = refs
-        .into_iter()
+        .references()
-        .map(|reference| source_edit_from_reference(sema, reference, "self"))
+        .iter()
+        .map(|(&file_id, references)| {
+            source_edit_from_references(sema, file_id, references, "self")
+        })
        .collect::<Vec<_>>();
    edits.push(SourceFileEdit {
@@ -367,12 +384,22 @@ fn rename_self_to_param(
    self_token: SyntaxToken,
    new_name: &str,
 ) -> Result<RangeInfo<SourceChange>, RenameError> {
+    let ident_kind = check_identifier(new_name)?;
+    match ident_kind {
+        IdentifierKind::Lifetime => bail!("Invalid name `{}`: not an identifier", new_name),
+        IdentifierKind::ToSelf => {
+            // no-op
+            mark::hit!(rename_self_to_self);
+            return Ok(RangeInfo::new(self_token.text_range(), SourceChange::default()));
+        }
+        _ => (),
+    }
    let source_file = sema.parse(position.file_id);
    let syn = source_file.syntax();
    let text = sema.db.file_text(position.file_id);
    let fn_def = find_node_at_offset::<ast::Fn>(syn, position.offset)
-        .ok_or_else(|| RenameError("No surrounding method declaration found".to_string()))?;
+        .ok_or_else(|| format_err!("No surrounding method declaration found"))?;
    let search_range = fn_def.syntax().text_range();
    let mut edits: Vec<SourceFileEdit> = vec![];
@@ -382,12 +409,10 @@ fn rename_self_to_param(
        if !search_range.contains_inclusive(offset) {
            continue;
        }
-        if let Some(ref usage) =
+        if let Some(ref usage) = syn.token_at_offset(offset).find(|t| t.kind() == T![self]) {
-            syn.token_at_offset(offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
-        {
            let edit = if let Some(ref self_param) = ast::SelfParam::cast(usage.parent()) {
                text_edit_from_self_param(syn, self_param, new_name)
-                    .ok_or_else(|| RenameError("No target type found".to_string()))?
+                    .ok_or_else(|| format_err!("No target type found"))?
            } else {
                TextEdit::replace(usage.text_range(), String::from(new_name))
            };
@@ -395,6 +420,10 @@ fn rename_self_to_param(
        }
    }
+    if edits.len() > 1 && ident_kind == IdentifierKind::Underscore {
+        bail!("Cannot rename reference to `_` as it is being referenced multiple times");
+    }
    let range = ast::SelfParam::cast(self_token.parent())
        .map_or(self_token.text_range(), |p| p.syntax().text_range());
@@ -405,35 +434,43 @@ fn rename_reference(
    sema: &Semantics<RootDatabase>,
    position: FilePosition,
    new_name: &str,
-    is_lifetime_name: bool,
 ) -> Result<RangeInfo<SourceChange>, RenameError> {
-    let RangeInfo { range, info: refs } = match find_all_refs(sema, position, None) {
+    let ident_kind = check_identifier(new_name)?;
-        Some(range_info) => range_info,
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position)?;
-        None => return Err(RenameError("No references found at position".to_string())),
-    };
+    match (ident_kind, &refs.declaration.kind) {
+        (IdentifierKind::ToSelf, ReferenceKind::Lifetime)
-    match (refs.declaration.kind == ReferenceKind::Lifetime, is_lifetime_name) {
+        | (IdentifierKind::Underscore, ReferenceKind::Lifetime)
-        (true, false) => {
+        | (IdentifierKind::Ident, ReferenceKind::Lifetime) => {
-            return Err(RenameError(format!(
+            mark::hit!(rename_not_a_lifetime_ident_ref);
-                "Invalid name `{}`: not a lifetime identifier",
+            bail!("Invalid name `{}`: not a lifetime identifier", new_name)
-                new_name
-            )))
        }
-        (false, true) => {
+        (IdentifierKind::Lifetime, ReferenceKind::Lifetime) => mark::hit!(rename_lifetime),
-            return Err(RenameError(format!("Invalid name `{}`: not an identifier", new_name)))
+        (IdentifierKind::Lifetime, _) => {
+            mark::hit!(rename_not_an_ident_ref);
+            bail!("Invalid name `{}`: not an identifier", new_name)
        }
-        _ => (),
+        (IdentifierKind::ToSelf, ReferenceKind::SelfKw) => {
+            unreachable!("rename_self_to_param should've been called instead")
+        }
+        (IdentifierKind::ToSelf, _) => {
+            mark::hit!(rename_to_self);
+            return rename_to_self(sema, position);
+        }
+        (IdentifierKind::Underscore, _) if !refs.references.is_empty() => {
+            mark::hit!(rename_underscore_multiple);
+            bail!("Cannot rename reference to `_` as it is being referenced multiple times")
+        }
+        (IdentifierKind::Ident, _) | (IdentifierKind::Underscore, _) => mark::hit!(rename_ident),
    }
    let edit = refs
        .into_iter()
-        .map(|reference| source_edit_from_reference(sema, reference, new_name))
+        .map(|(file_id, references)| {
+            source_edit_from_references(sema, file_id, &references, new_name)
+        })
        .collect::<Vec<_>>();
-    if edit.is_empty() {
-        return Err(RenameError("No references found at position".to_string()));
-    }
    Ok(RangeInfo::new(range, SourceChange::from(edit)))
 }
@@ -462,9 +499,11 @@ mod tests {
                        text_edit_builder.replace(indel.delete, indel.insert);
                    }
                }
-                let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
+                if let Some(file_id) = file_id {
-                text_edit_builder.finish().apply(&mut result);
+                    let mut result = analysis.file_text(file_id).unwrap().to_string();
-                assert_eq_text!(ra_fixture_after, &*result);
+                    text_edit_builder.finish().apply(&mut result);
+                    assert_eq_text!(ra_fixture_after, &*result);
+                }
            }
            Err(err) => {
                if ra_fixture_after.starts_with("error:") {
@@ -493,19 +532,19 @@ mod tests {
    #[test]
    fn test_rename_to_underscore() {
-        check("_", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let _ = 1; }"#);
+        check("_", r#"fn main() { let i$0 = 1; }"#, r#"fn main() { let _ = 1; }"#);
    }
    #[test]
    fn test_rename_to_raw_identifier() {
-        check("r#fn", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
+        check("r#fn", r#"fn main() { let i$0 = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
    }
    #[test]
    fn test_rename_to_invalid_identifier1() {
        check(
            "invalid!",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
            "error: Invalid name `invalid!`: not an identifier",
        );
    }
@@ -514,7 +553,7 @@ mod tests {
    fn test_rename_to_invalid_identifier2() {
        check(
            "multiple tokens",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
            "error: Invalid name `multiple tokens`: not an identifier",
        );
    }
@@ -523,38 +562,60 @@ mod tests {
    fn test_rename_to_invalid_identifier3() {
        check(
            "let",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
            "error: Invalid name `let`: not an identifier",
        );
    }
    #[test]
    fn test_rename_to_invalid_identifier_lifetime() {
+        mark::check!(rename_not_an_ident_ref);
        check(
            "'foo",
-            r#"fn main() { let i<|> = 1; }"#,
+            r#"fn main() { let i$0 = 1; }"#,
            "error: Invalid name `'foo`: not an identifier",
        );
    }
    #[test]
    fn test_rename_to_invalid_identifier_lifetime2() {
+        mark::check!(rename_not_a_lifetime_ident_ref);
        check(
            "foo",
-            r#"fn main<'a>(_: &'a<|> ()) {}"#,
+            r#"fn main<'a>(_: &'a$0 ()) {}"#,
            "error: Invalid name `foo`: not a lifetime identifier",
        );
    }
    #[test]
+    fn test_rename_to_underscore_invalid() {
+        mark::check!(rename_underscore_multiple);
+        check(
+            "_",
+            r#"fn main(foo$0: ()) {foo;}"#,
+            "error: Cannot rename reference to `_` as it is being referenced multiple times",
+        );
+    }
+    #[test]
+    fn test_rename_mod_invalid() {
+        check(
+            "'foo",
+            r#"mod foo$0 {}"#,
+            "error: Invalid name `'foo`: cannot rename module to 'foo",
+        );
+    }
+    #[test]
    fn test_rename_for_local() {
+        mark::check!(rename_ident);
        check(
            "k",
            r#"
 fn main() {
    let mut i = 1;
    let j = 1;
-    i = i<|> + j;
+    i = i$0 + j;
    { i = 0; }
@@ -579,7 +640,7 @@ fn main() {
    fn test_rename_unresolved_reference() {
        check(
            "new_name",
-            r#"fn main() { let _ = unresolved_ref<|>; }"#,
+            r#"fn main() { let _ = unresolved_ref$0; }"#,
            "error: No references found at position",
        );
    }
@@ -591,7 +652,7 @@ fn main() {
            r#"
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
-    let a<|> = "test";
+    let a$0 = "test";
    foo!(a);
 }
 "#,
@@ -613,7 +674,7 @@ fn main() {
 macro_rules! foo {($i:ident) => {$i} }
 fn main() {
    let a = "test";
-    foo!(a<|>);
+    foo!(a$0);
 }
 "#,
            r#"
@@ -634,7 +695,7 @@ fn main() {
 macro_rules! define_fn {($id:ident) => { fn $id{} }}
 define_fn!(foo);
 fn main() {
-    fo<|>o();
+    fo$0o();
 }
 "#,
            r#"
@@ -653,7 +714,7 @@ fn main() {
            "bar",
            r#"
 macro_rules! define_fn {($id:ident) => { fn $id{} }}
-define_fn!(fo<|>o);
+define_fn!(fo$0o);
 fn main() {
    foo();
 }
@@ -670,17 +731,17 @@ fn main() {
    #[test]
    fn test_rename_for_param_inside() {
-        check("j", r#"fn foo(i : u32) -> u32 { i<|> }"#, r#"fn foo(j : u32) -> u32 { j }"#);
+        check("j", r#"fn foo(i : u32) -> u32 { i$0 }"#, r#"fn foo(j : u32) -> u32 { j }"#);
    }
    #[test]
    fn test_rename_refs_for_fn_param() {
-        check("j", r#"fn foo(i<|> : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
+        check("j", r#"fn foo(i$0 : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
    }
    #[test]
    fn test_rename_for_mut_param() {
-        check("j", r#"fn foo(mut i<|> : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
+        check("j", r#"fn foo(mut i$0 : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
    }
    #[test]
@@ -688,7 +749,7 @@ fn main() {
        check(
            "j",
            r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 impl Foo {
    fn new(i: i32) -> Self {
@@ -714,7 +775,7 @@ impl Foo {
        check(
            "j",
            r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 impl Foo {
    fn new(i: i32) -> Self {
@@ -743,7 +804,7 @@ impl Foo {
 struct Foo { i: i32 }
 impl Foo {
-    fn new(i<|>: i32) -> Self {
+    fn new(i$0: i32) -> Self {
        Self { i }
    }
 }
@@ -765,7 +826,7 @@ impl Foo {
        check(
            "j",
            r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 struct Bar { i: i32 }
 impl Bar {
@@ -794,7 +855,7 @@ impl Bar {
            r#"
 struct Foo { i: i32 }
-fn baz(i<|>: i32) -> Self {
+fn baz(i$0: i32) -> Self {
     let x = Foo { i };
     {
         let i = 0;
@@ -825,7 +886,7 @@ fn baz(j: i32) -> Self {
 mod bar;
 //- /bar.rs
-mod foo<|>;
+mod foo$0;
 //- /bar/foo.rs
 // empty
@@ -883,7 +944,7 @@ fn main() {}
 pub struct FooContent;
 //- /bar.rs
-use crate::foo<|>::FooContent;
+use crate::foo$0::FooContent;
 "#,
            expect![[r#"
                RangeInfo {
@@ -943,9 +1004,9 @@ use crate::foo<|>::FooContent;
            "foo2",
            r#"
 //- /lib.rs
-mod fo<|>o;
+mod fo$0o;
 //- /foo/mod.rs
-// emtpy
+// empty
 "#,
            expect![[r#"
                RangeInfo {
@@ -992,10 +1053,10 @@ mod fo<|>o;
            "bar",
            r#"
 //- /lib.rs
-mod outer { mod fo<|>o; }
+mod outer { mod fo$0o; }
 //- /outer/foo.rs
-// emtpy
+// empty
 "#,
            expect![[r#"
                RangeInfo {
@@ -1041,7 +1102,7 @@ mod outer { mod fo<|>o; }
        check(
            "baz",
            r#"
-mod <|>foo { pub fn bar() {} }
+mod $0foo { pub fn bar() {} }
 fn main() { foo::bar(); }
 "#,
@@ -1065,7 +1126,7 @@ fn f() {
 }
 //- /bar.rs
-pub mod foo<|>;
+pub mod foo$0;
 //- /bar/foo.rs
 // pub fn fun() {}
@@ -1128,7 +1189,7 @@ pub mod foo<|>;
            "Baz",
            r#"
 mod foo {
-    pub enum Foo { Bar<|> }
+    pub enum Foo { Bar$0 }
 }
 fn func(f: foo::Foo) {
@@ -1157,7 +1218,7 @@ fn func(f: foo::Foo) {
            "baz",
            r#"
 mod foo {
-    pub struct Foo { pub bar<|>: uint }
+    pub struct Foo { pub bar$0: uint }
 }
 fn foo(f: foo::Foo) {
@@ -1178,13 +1239,14 @@ fn foo(f: foo::Foo) {
    #[test]
    fn test_parameter_to_self() {
+        mark::check!(rename_to_self);
        check(
            "self",
            r#"
 struct Foo { i: i32 }
 impl Foo {
-    fn f(foo<|>: &mut Foo) -> i32 {
+    fn f(foo$0: &mut Foo) -> i32 {
        foo.i
    }
 }
@@ -1205,7 +1267,7 @@ impl Foo {
 struct Foo { i: i32 }
 impl Foo {
-    fn f(foo<|>: Foo) -> i32 {
+    fn f(foo$0: Foo) -> i32 {
        foo.i
    }
 }
@@ -1229,7 +1291,7 @@ impl Foo {
            r#"
 struct Foo { i: i32 }
-fn f(foo<|>: &mut Foo) -> i32 {
+fn f(foo$0: &mut Foo) -> i32 {
    foo.i
 }
 "#,
@@ -1242,7 +1304,7 @@ struct Foo { i: i32 }
 struct Bar;
 impl Bar {
-    fn f(foo<|>: &mut Foo) -> i32 {
+    fn f(foo$0: &mut Foo) -> i32 {
        foo.i
    }
 }
@@ -1258,7 +1320,7 @@ impl Bar {
            r#"
 struct Foo { i: i32 }
 impl Foo {
-    fn f(x: (), foo<|>: &mut Foo) -> i32 {
+    fn f(x: (), foo$0: &mut Foo) -> i32 {
        foo.i
    }
 }
@@ -1274,7 +1336,7 @@ impl Foo {
            r#"
 struct Foo { i: i32 }
 impl &Foo {
-    fn f(foo<|>: &Foo) -> i32 {
+    fn f(foo$0: &Foo) -> i32 {
        foo.i
    }
 }
@@ -1298,7 +1360,7 @@ impl &Foo {
 struct Foo { i: i32 }
 impl Foo {
-    fn f(&mut <|>self) -> i32 {
+    fn f(&mut $0self) -> i32 {
        self.i
    }
 }
@@ -1323,7 +1385,7 @@ impl Foo {
 struct Foo { i: i32 }
 impl Foo {
-    fn f(<|>self) -> i32 {
+    fn f($0self) -> i32 {
        self.i
    }
 }
@@ -1350,7 +1412,7 @@ struct Foo { i: i32 }
 impl Foo {
    fn f(&self) -> i32 {
        let self_var = 1;
-        self<|>.i
+        self$0.i
    }
 }
 "#,
@@ -1373,7 +1435,7 @@ impl Foo {
        check(
            "bar",
            r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 fn foo(bar: i32) -> Foo {
    Foo { i: bar }
@@ -1394,7 +1456,7 @@ fn foo(bar: i32) -> Foo {
        check(
            "baz",
            r#"
-struct Foo { i<|>: i32 }
+struct Foo { i$0: i32 }
 fn foo(foo: Foo) {
    let Foo { i: baz } = foo;
@@ -1433,7 +1495,7 @@ struct Foo {
 fn foo(foo: Foo) {
    let Foo { i: b } = foo;
-    let _ = b<|>;
+    let _ = b$0;
 }
 "#,
            expected_fixture,
@@ -1447,7 +1509,7 @@ struct Foo {
 fn foo(foo: Foo) {
    let Foo { i } = foo;
-    let _ = i<|>;
+    let _ = i$0;
 }
 "#,
            expected_fixture,
@@ -1464,7 +1526,7 @@ struct Foo {
 }
 fn foo(Foo { i }: foo) -> i32 {
-    i<|>
+    i$0
 }
 "#,
            r#"
@@ -1481,6 +1543,7 @@ fn foo(Foo { i: bar }: foo) -> i32 {
    #[test]
    fn test_rename_lifetimes() {
+        mark::check!(rename_lifetime);
        check(
            "'yeeee",
            r#"
@@ -1488,7 +1551,7 @@ trait Foo<'a> {
    fn foo() -> &'a ();
 }
 impl<'a> Foo<'a> for &'a () {
-    fn foo() -> &'a<|> () {
+    fn foo() -> &'a$0 () {
        unimplemented!()
    }
 }
@@ -1520,7 +1583,7 @@ fn main() {
    let test_variable = CustomOption::Some(22);
    match test_variable {
-        CustomOption::Some(foo<|>) if foo == 11 => {}
+        CustomOption::Some(foo$0) if foo == 11 => {}
        _ => (),
    }
 }"#,
@@ -1549,7 +1612,7 @@ fn main() {
 fn foo<'a>() -> &'a () {
    'a: {
        'b: loop {
-            break 'a<|>;
+            break 'a$0;
        }
    }
 }
@@ -1565,4 +1628,24 @@ fn foo<'a>() -> &'a () {
 "#,
        )
    }
+    #[test]
+    fn test_self_to_self() {
+        mark::check!(rename_self_to_self);
+        check(
+            "self",
+            r#"
+struct Foo;
+impl Foo {
+    fn foo(self$0) {}
+}
+"#,
+            r#"
+struct Foo;
+impl Foo {
+    fn foo(self) {}
+}
+"#,
+        )
+    }
 }
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 891183266..f5ee7de86 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -2,11 +2,11 @@ use std::fmt;
 use assists::utils::test_related_attribute;
 use cfg::CfgExpr;
-use hir::{AsAssocItem, HasAttrs, InFile, Semantics};
+use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
-use ide_db::RootDatabase;
+use ide_db::{defs::Definition, RootDatabase};
 use itertools::Itertools;
 use syntax::{
-    ast::{self, AstNode, AttrsOwner, ModuleItemOwner, NameOwner},
+    ast::{self, AstNode, AttrsOwner, ModuleItemOwner},
    match_ast, SyntaxNode,
 };
@@ -96,41 +96,45 @@ impl Runnable {
 pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
    let sema = Semantics::new(db);
    let source_file = sema.parse(file_id);
-    source_file.syntax().descendants().filter_map(|i| runnable(&sema, i, file_id)).collect()
+    source_file
-}
+        .syntax()
+        .descendants()
-pub(crate) fn runnable(
+        .filter_map(|item| {
-    sema: &Semantics<RootDatabase>,
+            let runnable = match_ast! {
-    item: SyntaxNode,
+                match item {
-    file_id: FileId,
+                    ast::Fn(func) => {
-) -> Option<Runnable> {
+                        let def = sema.to_def(&func)?;
-    let runnable_item = match_ast! {
+                        runnable_fn(&sema, def)
-        match (item.clone()) {
+                    },
-            ast::Fn(it) => runnable_fn(sema, it, file_id),
+                    ast::Module(it) => runnable_mod(&sema, it),
-            ast::Module(it) => runnable_mod(sema, it),
+                    _ => None,
-            _ => None,
+                }
-        }
+            };
-    };
+            runnable.or_else(|| match doc_owner_to_def(&sema, item)? {
-    runnable_item.or_else(|| runnable_doctest(sema, item))
+                Definition::ModuleDef(def) => module_def_doctest(&sema, def),
+                _ => None,
+            })
+        })
+        .collect()
 }
-fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) -> Option<Runnable> {
+pub(crate) fn runnable_fn(sema: &Semantics<RootDatabase>, def: hir::Function) -> Option<Runnable> {
-    let def = sema.to_def(&func)?;
+    let func = def.source(sema.db)?;
-    let name_string = func.name()?.text().to_string();
+    let name_string = def.name(sema.db).to_string();
    let kind = if name_string == "main" {
        RunnableKind::Bin
    } else {
-        let canonical_path = sema.to_def(&func).and_then(|def| {
+        let canonical_path = {
            let def: hir::ModuleDef = def.into();
            def.canonical_path(sema.db)
-        });
+        };
        let test_id = canonical_path.map(TestId::Path).unwrap_or(TestId::Name(name_string));
-        if test_related_attribute(&func).is_some() {
+        if test_related_attribute(&func.value).is_some() {
-            let attr = TestAttr::from_fn(&func);
+            let attr = TestAttr::from_fn(&func.value);
            RunnableKind::Test { test_id, attr }
-        } else if func.has_atom_attr("bench") {
+        } else if func.value.has_atom_attr("bench") {
            RunnableKind::Bench { test_id }
        } else {
            return None;
@@ -139,27 +143,56 @@ fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) -
    let nav = NavigationTarget::from_named(
        sema.db,
-        InFile::new(file_id.into(), &func),
+        func.as_ref().map(|it| it as &dyn ast::NameOwner),
        SymbolKind::Function,
    );
    let cfg = def.attrs(sema.db).cfg();
    Some(Runnable { nav, kind, cfg })
 }
-fn runnable_doctest(sema: &Semantics<RootDatabase>, item: SyntaxNode) -> Option<Runnable> {
+pub(crate) fn runnable_mod(
-    match_ast! {
+    sema: &Semantics<RootDatabase>,
+    module: ast::Module,
+) -> Option<Runnable> {
+    if !has_test_function_or_multiple_test_submodules(&module) {
+        return None;
+    }
+    let module_def = sema.to_def(&module)?;
+    let path = module_def
+        .path_to_root(sema.db)
+        .into_iter()
+        .rev()
+        .filter_map(|it| it.name(sema.db))
+        .join("::");
+    let def = sema.to_def(&module)?;
+    let attrs = def.attrs(sema.db);
+    let cfg = attrs.cfg();
+    let nav = module_def.to_nav(sema.db);
+    Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg })
+}
+// FIXME: figure out a proper API here.
+pub(crate) fn doc_owner_to_def(
+    sema: &Semantics<RootDatabase>,
+    item: SyntaxNode,
+) -> Option<Definition> {
+    let res: hir::ModuleDef = match_ast! {
        match item {
-            ast::Fn(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::SourceFile(it) => sema.scope(&item).module()?.into(),
-            ast::Struct(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Fn(it) => sema.to_def(&it)?.into(),
-            ast::Enum(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Struct(it) => sema.to_def(&it)?.into(),
-            ast::Union(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Enum(it) => sema.to_def(&it)?.into(),
-            ast::Trait(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Union(it) => sema.to_def(&it)?.into(),
-            ast::Const(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Trait(it) => sema.to_def(&it)?.into(),
-            ast::Static(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Const(it) => sema.to_def(&it)?.into(),
-            ast::TypeAlias(it) => module_def_doctest(sema, sema.to_def(&it)?.into()),
+            ast::Static(it) => sema.to_def(&it)?.into(),
-            _ => None,
+            ast::TypeAlias(it) => sema.to_def(&it)?.into(),
+            _ => return None,
        }
-    }
+    };
+    Some(Definition::ModuleDef(res))
 }
 fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Option<Runnable> {
@@ -230,7 +263,7 @@ impl TestAttr {
 const RUSTDOC_FENCE: &str = "```";
 const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUNNABLE: &[&str] =
-    &["", "rust", "should_panic", "edition2015", "edition2018"];
+    &["", "rust", "should_panic", "edition2015", "edition2018", "edition2021"];
 fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool {
    attrs.docs().map_or(false, |doc| {
@@ -254,26 +287,6 @@ fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool {
    })
 }
-fn runnable_mod(sema: &Semantics<RootDatabase>, module: ast::Module) -> Option<Runnable> {
-    if !has_test_function_or_multiple_test_submodules(&module) {
-        return None;
-    }
-    let module_def = sema.to_def(&module)?;
-    let path = module_def
-        .path_to_root(sema.db)
-        .into_iter()
-        .rev()
-        .filter_map(|it| it.name(sema.db))
-        .join("::");
-    let def = sema.to_def(&module)?;
-    let attrs = def.attrs(sema.db);
-    let cfg = attrs.cfg();
-    let nav = module_def.to_nav(sema.db);
-    Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg })
-}
 // We could create runnables for modules with number_of_test_submodules > 0,
 // but that bloats the runnables for no real benefit, since all tests can be run by the submodule already
 fn has_test_function_or_multiple_test_submodules(module: &ast::Module) -> bool {
@@ -330,7 +343,7 @@ mod tests {
        check(
            r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 #[test]
@@ -426,7 +439,7 @@ fn bench() {}
        check(
            r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 /// ```
@@ -574,7 +587,7 @@ struct StructWithRunnable(String);
        check(
            r#"
 //- /lib.rs
-<|>
+$0
 fn main() {}
 struct Data;
@@ -626,7 +639,7 @@ impl Data {
        check(
            r#"
 //- /lib.rs
-<|>
+$0
 mod test_mod {
    #[test]
    fn test_foo1() {}
@@ -680,7 +693,7 @@ mod test_mod {
        check(
            r#"
 //- /lib.rs
-<|>
+$0
 mod root_tests {
    mod nested_tests_0 {
        mod nested_tests_1 {
@@ -820,7 +833,7 @@ mod root_tests {
        check(
            r#"
 //- /lib.rs crate:foo cfg:feature=foo
-<|>
+$0
 #[test]
 #[cfg(feature = "foo")]
 fn test_foo1() {}
@@ -865,7 +878,7 @@ fn test_foo1() {}
        check(
            r#"
 //- /lib.rs crate:foo cfg:feature=foo,feature=bar
-<|>
+$0
 #[test]
 #[cfg(all(feature = "foo", feature = "bar"))]
 fn test_foo1() {}
@@ -920,7 +933,7 @@ fn test_foo1() {}
        check(
            r#"
 //- /lib.rs
-<|>
+$0
 mod test_mod {
    fn foo1() {}
 }
@@ -939,7 +952,7 @@ mod test_mod {
 //- /lib.rs
 mod foo;
 //- /foo.rs
-struct Foo;<|>
+struct Foo;$0
 impl Foo {
    /// ```
    /// let x = 5;
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 5ad96581b..f2d4da78d 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -1,35 +1,39 @@
+pub(crate) mod tags;
+mod highlights;
+mod injector;
+mod highlight;
 mod format;
-mod html;
-mod injection;
 mod macro_rules;
-pub(crate) mod tags;
+mod inject;
+mod html;
 #[cfg(test)]
 mod tests;
-use hir::{AsAssocItem, Local, Name, Semantics, VariantDef};
+use hir::{Name, Semantics};
-use ide_db::{
+use ide_db::RootDatabase;
-    defs::{Definition, NameClass, NameRefClass},
-    RootDatabase,
-};
 use rustc_hash::FxHashMap;
 use syntax::{
    ast::{self, HasFormatSpecifier},
-    AstNode, AstToken, Direction, NodeOrToken, SyntaxElement,
+    AstNode, AstToken, Direction, NodeOrToken,
-    SyntaxKind::{self, *},
+    SyntaxKind::*,
-    SyntaxNode, SyntaxToken, TextRange, WalkEvent, T,
+    SyntaxNode, TextRange, WalkEvent, T,
 };
 use crate::{
    syntax_highlighting::{
-        format::FormatStringHighlighter, macro_rules::MacroRulesHighlighter, tags::Highlight,
+        format::highlight_format_string, highlights::Highlights,
+        macro_rules::MacroRulesHighlighter, tags::Highlight,
    },
-    FileId, HighlightModifier, HighlightTag, SymbolKind,
+    FileId, HlMod, HlTag, SymbolKind,
 };
 pub(crate) use html::highlight_as_html;
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
-pub struct HighlightedRange {
+pub struct HlRange {
    pub range: TextRange,
    pub highlight: Highlight,
    pub binding_hash: Option<u64>,
@@ -49,7 +53,7 @@ pub(crate) fn highlight(
    file_id: FileId,
    range_to_highlight: Option<TextRange>,
    syntactic_name_ref_highlighting: bool,
-) -> Vec<HighlightedRange> {
+) -> Vec<HlRange> {
    let _p = profile::span("highlight");
    let sema = Semantics::new(db);
@@ -68,28 +72,30 @@ pub(crate) fn highlight(
        }
    };
+    let mut hl = highlights::Highlights::new(range_to_highlight);
+    traverse(&mut hl, &sema, &root, range_to_highlight, syntactic_name_ref_highlighting);
+    hl.to_vec()
+}
+fn traverse(
+    hl: &mut Highlights,
+    sema: &Semantics<RootDatabase>,
+    root: &SyntaxNode,
+    range_to_highlight: TextRange,
+    syntactic_name_ref_highlighting: bool,
+) {
    let mut bindings_shadow_count: FxHashMap<Name, u32> = FxHashMap::default();
-    // We use a stack for the DFS traversal below.
-    // When we leave a node, the we use it to flatten the highlighted ranges.
-    let mut stack = HighlightedRangeStack::new();
    let mut current_macro_call: Option<ast::MacroCall> = None;
    let mut current_macro_rules: Option<ast::MacroRules> = None;
-    let mut format_string_highlighter = FormatStringHighlighter::default();
    let mut macro_rules_highlighter = MacroRulesHighlighter::default();
    let mut inside_attribute = false;
    // Walk all nodes, keeping track of whether we are inside a macro or not.
    // If in macro, expand it first and highlight the expanded code.
    for event in root.preorder_with_tokens() {
-        match &event {
-            WalkEvent::Enter(_) => stack.push(),
-            WalkEvent::Leave(_) => stack.pop(),
-        };
        let event_range = match &event {
-            WalkEvent::Enter(it) => it.text_range(),
+            WalkEvent::Enter(it) | WalkEvent::Leave(it) => it.text_range(),
-            WalkEvent::Leave(it) => it.text_range(),
        };
        // Element outside of the viewport, no need to highlight
@@ -101,9 +107,9 @@ pub(crate) fn highlight(
        match event.clone().map(|it| it.into_node().and_then(ast::MacroCall::cast)) {
            WalkEvent::Enter(Some(mc)) => {
                if let Some(range) = macro_call_range(&mc) {
-                    stack.add(HighlightedRange {
+                    hl.add(HlRange {
                        range,
-                        highlight: HighlightTag::Symbol(SymbolKind::Macro).into(),
+                        highlight: HlTag::Symbol(SymbolKind::Macro).into(),
                        binding_hash: None,
                    });
                }
@@ -113,7 +119,6 @@ pub(crate) fn highlight(
            WalkEvent::Leave(Some(mc)) => {
                assert_eq!(current_macro_call, Some(mc));
                current_macro_call = None;
-                format_string_highlighter = FormatStringHighlighter::default();
            }
            _ => (),
        }
@@ -131,33 +136,24 @@ pub(crate) fn highlight(
            }
            _ => (),
        }
        match &event {
-            // Check for Rust code in documentation
-            WalkEvent::Leave(NodeOrToken::Node(node)) => {
-                if ast::Attr::can_cast(node.kind()) {
-                    inside_attribute = false
-                }
-                if let Some((doctest, range_mapping, new_comments)) =
-                    injection::extract_doc_comments(node)
-                {
-                    injection::highlight_doc_comment(
-                        doctest,
-                        range_mapping,
-                        new_comments,
-                        &mut stack,
-                    );
-                }
-            }
            WalkEvent::Enter(NodeOrToken::Node(node)) if ast::Attr::can_cast(node.kind()) => {
                inside_attribute = true
            }
+            WalkEvent::Leave(NodeOrToken::Node(node)) if ast::Attr::can_cast(node.kind()) => {
+                inside_attribute = false
+            }
            _ => (),
        }
        let element = match event {
            WalkEvent::Enter(it) => it,
-            WalkEvent::Leave(_) => continue,
+            WalkEvent::Leave(it) => {
+                if let Some(node) = it.as_node() {
+                    inject::doc_comment(hl, node);
+                }
+                continue;
+            }
        };
        let range = element.text_range();
@@ -177,8 +173,6 @@ pub(crate) fn highlight(
            let token = sema.descend_into_macros(token.clone());
            let parent = token.parent();
-            format_string_highlighter.check_for_format_string(&parent);
            // We only care Name and Name_ref
            match (token.kind(), parent.kind()) {
                (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(),
@@ -191,213 +185,45 @@ pub(crate) fn highlight(
        if let Some(token) = element.as_token().cloned().and_then(ast::String::cast) {
            if token.is_raw() {
                let expanded = element_to_highlight.as_token().unwrap().clone();
-                if injection::highlight_injection(&mut stack, &sema, token, expanded).is_some() {
+                if inject::ra_fixture(hl, &sema, token, expanded).is_some() {
                    continue;
                }
            }
        }
-        if let Some((mut highlight, binding_hash)) = highlight_element(
+        if let Some(_) = macro_rules_highlighter.highlight(element_to_highlight.clone()) {
+            continue;
+        }
+        if let Some((mut highlight, binding_hash)) = highlight::element(
            &sema,
            &mut bindings_shadow_count,
            syntactic_name_ref_highlighting,
            element_to_highlight.clone(),
        ) {
            if inside_attribute {
-                highlight = highlight | HighlightModifier::Attribute;
+                highlight = highlight | HlMod::Attribute;
-            }
-            if macro_rules_highlighter.highlight(element_to_highlight.clone()).is_none() {
-                stack.add(HighlightedRange { range, highlight, binding_hash });
            }
-            if let Some(string) =
+            hl.add(HlRange { range, highlight, binding_hash });
-                element_to_highlight.as_token().cloned().and_then(ast::String::cast)
-            {
-                format_string_highlighter.highlight_format_string(&mut stack, &string, range);
-                // Highlight escape sequences
-                if let Some(char_ranges) = string.char_ranges() {
-                    stack.push();
-                    for (piece_range, _) in char_ranges.iter().filter(|(_, char)| char.is_ok()) {
-                        if string.text()[piece_range.start().into()..].starts_with('\\') {
-                            stack.add(HighlightedRange {
-                                range: piece_range + range.start(),
-                                highlight: HighlightTag::EscapeSequence.into(),
-                                binding_hash: None,
-                            });
-                        }
-                    }
-                    stack.pop_and_inject(None);
-                }
-            }
        }
-    }
-    stack.flattened()
-}
-#[derive(Debug)]
-struct HighlightedRangeStack {
-    stack: Vec<Vec<HighlightedRange>>,
-}
-/// We use a stack to implement the flattening logic for the highlighted
-/// syntax ranges.
-impl HighlightedRangeStack {
-    fn new() -> Self {
-        Self { stack: vec![Vec::new()] }
-    }
-    fn push(&mut self) {
-        self.stack.push(Vec::new());
-    }
-    /// Flattens the highlighted ranges.
-    ///
-    /// For example `#[cfg(feature = "foo")]` contains the nested ranges:
-    /// 1) parent-range: Attribute [0, 23)
-    /// 2) child-range: String [16, 21)
-    ///
-    /// The following code implements the flattening, for our example this results to:
-    /// `[Attribute [0, 16), String [16, 21), Attribute [21, 23)]`
-    fn pop(&mut self) {
-        let children = self.stack.pop().unwrap();
-        let prev = self.stack.last_mut().unwrap();
-        let needs_flattening = !children.is_empty()
-            && !prev.is_empty()
-            && prev.last().unwrap().range.contains_range(children.first().unwrap().range);
-        if !needs_flattening {
-            prev.extend(children);
-        } else {
-            let mut parent = prev.pop().unwrap();
-            for ele in children {
-                assert!(parent.range.contains_range(ele.range));
-                let cloned = Self::intersect(&mut parent, &ele);
-                if !parent.range.is_empty() {
-                    prev.push(parent);
-                }
-                prev.push(ele);
-                parent = cloned;
-            }
-            if !parent.range.is_empty() {
-                prev.push(parent);
-            }
-        }
-    }
-    /// Intersects the `HighlightedRange` `parent` with `child`.
-    /// `parent` is mutated in place, becoming the range before `child`.
-    /// Returns the range (of the same type as `parent`) *after* `child`.
-    fn intersect(parent: &mut HighlightedRange, child: &HighlightedRange) -> HighlightedRange {
-        assert!(parent.range.contains_range(child.range));
-        let mut cloned = parent.clone();
-        parent.range = TextRange::new(parent.range.start(), child.range.start());
-        cloned.range = TextRange::new(child.range.end(), cloned.range.end());
-        cloned
+        if let Some(string) = element_to_highlight.as_token().cloned().and_then(ast::String::cast) {
-    }
+            highlight_format_string(hl, &string, range);
+            // Highlight escape sequences
-    /// Remove the `HighlightRange` of `parent` that's currently covered by `child`.
+            if let Some(char_ranges) = string.char_ranges() {
-    fn intersect_partial(parent: &mut HighlightedRange, child: &HighlightedRange) {
+                for (piece_range, _) in char_ranges.iter().filter(|(_, char)| char.is_ok()) {
-        assert!(
+                    if string.text()[piece_range.start().into()..].starts_with('\\') {
-            parent.range.start() <= child.range.start()
+                        hl.add(HlRange {
-                && parent.range.end() >= child.range.start()
+                            range: piece_range + range.start(),
-                && child.range.end() > parent.range.end()
+                            highlight: HlTag::EscapeSequence.into(),
-        );
+                            binding_hash: None,
+                        });
-        parent.range = TextRange::new(parent.range.start(), child.range.start());
-    }
-    /// Similar to `pop`, but can modify arbitrary prior ranges (where `pop`)
-    /// can only modify the last range currently on the stack.
-    /// Can be used to do injections that span multiple ranges, like the
-    /// doctest injection below.
-    /// If `overwrite_parent` is non-optional, the highlighting of the parent range
-    /// is overwritten with the argument.
-    ///
-    /// Note that `pop` can be simulated by `pop_and_inject(false)` but the
-    /// latter is computationally more expensive.
-    fn pop_and_inject(&mut self, overwrite_parent: Option<Highlight>) {
-        let mut children = self.stack.pop().unwrap();
-        let prev = self.stack.last_mut().unwrap();
-        children.sort_by_key(|range| range.range.start());
-        prev.sort_by_key(|range| range.range.start());
-        for child in children {
-            if let Some(idx) =
-                prev.iter().position(|parent| parent.range.contains_range(child.range))
-            {
-                if let Some(tag) = overwrite_parent {
-                    prev[idx].highlight = tag;
-                }
-                let cloned = Self::intersect(&mut prev[idx], &child);
-                let insert_idx = if prev[idx].range.is_empty() {
-                    prev.remove(idx);
-                    idx
-                } else {
-                    idx + 1
-                };
-                prev.insert(insert_idx, child);
-                if !cloned.range.is_empty() {
-                    prev.insert(insert_idx + 1, cloned);
-                }
-            } else {
-                let maybe_idx =
-                    prev.iter().position(|parent| parent.range.contains(child.range.start()));
-                match (overwrite_parent, maybe_idx) {
-                    (Some(_), Some(idx)) => {
-                        Self::intersect_partial(&mut prev[idx], &child);
-                        let insert_idx = if prev[idx].range.is_empty() {
-                            prev.remove(idx);
-                            idx
-                        } else {
-                            idx + 1
-                        };
-                        prev.insert(insert_idx, child);
-                    }
-                    (_, None) => {
-                        let idx = prev
-                            .binary_search_by_key(&child.range.start(), |range| range.range.start())
-                            .unwrap_or_else(|x| x);
-                        prev.insert(idx, child);
-                    }
-                    _ => {
-                        unreachable!("child range should be completely contained in parent range");
                    }
                }
            }
        }
    }
-    fn add(&mut self, range: HighlightedRange) {
-        self.stack
-            .last_mut()
-            .expect("during DFS traversal, the stack must not be empty")
-            .push(range)
-    }
-    fn flattened(mut self) -> Vec<HighlightedRange> {
-        assert_eq!(
-            self.stack.len(),
-            1,
-            "after DFS traversal, the stack should only contain a single element"
-        );
-        let mut res = self.stack.pop().unwrap();
-        res.sort_by_key(|range| range.range.start());
-        // Check that ranges are sorted and disjoint
-        for (left, right) in res.iter().zip(res.iter().skip(1)) {
-            assert!(
-                left.range.end() <= right.range.start(),
-                "left: {:#?}, right: {:#?}",
-                left,
-                right
-            );
-        }
-        res
-    }
 }
 fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
@@ -415,523 +241,3 @@ fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
    Some(TextRange::new(range_start, range_end))
 }
-/// Returns true if the parent nodes of `node` all match the `SyntaxKind`s in `kinds` exactly.
-fn parents_match(mut node: NodeOrToken<SyntaxNode, SyntaxToken>, mut kinds: &[SyntaxKind]) -> bool {
-    while let (Some(parent), [kind, rest @ ..]) = (&node.parent(), kinds) {
-        if parent.kind() != *kind {
-            return false;
-        }
-        // FIXME: Would be nice to get parent out of the match, but binding by-move and by-value
-        // in the same pattern is unstable: rust-lang/rust#68354.
-        node = node.parent().unwrap().into();
-        kinds = rest;
-    }
-    // Only true if we matched all expected kinds
-    kinds.len() == 0
-}
-fn is_consumed_lvalue(
-    node: NodeOrToken<SyntaxNode, SyntaxToken>,
-    local: &Local,
-    db: &RootDatabase,
-) -> bool {
-    // When lvalues are passed as arguments and they're not Copy, then mark them as Consuming.
-    parents_match(node, &[PATH_SEGMENT, PATH, PATH_EXPR, ARG_LIST]) && !local.ty(db).is_copy(db)
-}
-fn highlight_element(
-    sema: &Semantics<RootDatabase>,
-    bindings_shadow_count: &mut FxHashMap<Name, u32>,
-    syntactic_name_ref_highlighting: bool,
-    element: SyntaxElement,
-) -> Option<(Highlight, Option<u64>)> {
-    let db = sema.db;
-    let mut binding_hash = None;
-    let highlight: Highlight = match element.kind() {
-        FN => {
-            bindings_shadow_count.clear();
-            return None;
-        }
-        // Highlight definitions depending on the "type" of the definition.
-        NAME => {
-            let name = element.into_node().and_then(ast::Name::cast).unwrap();
-            let name_kind = NameClass::classify(sema, &name);
-            if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind {
-                if let Some(name) = local.name(db) {
-                    let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
-                    *shadow_count += 1;
-                    binding_hash = Some(calc_binding_hash(&name, *shadow_count))
-                }
-            };
-            match name_kind {
-                Some(NameClass::ExternCrate(_)) => HighlightTag::Symbol(SymbolKind::Module).into(),
-                Some(NameClass::Definition(def)) => {
-                    highlight_def(db, def) | HighlightModifier::Definition
-                }
-                Some(NameClass::ConstReference(def)) => highlight_def(db, def),
-                Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
-                    let mut h = HighlightTag::Symbol(SymbolKind::Field).into();
-                    if let Definition::Field(field) = field_ref {
-                        if let VariantDef::Union(_) = field.parent_def(db) {
-                            h |= HighlightModifier::Unsafe;
-                        }
-                    }
-                    h
-                }
-                None => highlight_name_by_syntax(name) | HighlightModifier::Definition,
-            }
-        }
-        // Highlight references like the definitions they resolve to
-        NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => {
-            // even though we track whether we are in an attribute or not we still need this special case
-            // as otherwise we would emit unresolved references for name refs inside attributes
-            Highlight::from(HighlightTag::Symbol(SymbolKind::Function))
-        }
-        NAME_REF => {
-            let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
-            highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| {
-                match NameRefClass::classify(sema, &name_ref) {
-                    Some(name_kind) => match name_kind {
-                        NameRefClass::ExternCrate(_) => {
-                            HighlightTag::Symbol(SymbolKind::Module).into()
-                        }
-                        NameRefClass::Definition(def) => {
-                            if let Definition::Local(local) = &def {
-                                if let Some(name) = local.name(db) {
-                                    let shadow_count =
-                                        bindings_shadow_count.entry(name.clone()).or_default();
-                                    binding_hash = Some(calc_binding_hash(&name, *shadow_count))
-                                }
-                            };
-                            let mut h = highlight_def(db, def);
-                            if let Definition::Local(local) = &def {
-                                if is_consumed_lvalue(name_ref.syntax().clone().into(), local, db) {
-                                    h |= HighlightModifier::Consuming;
-                                }
-                            }
-                            if let Some(parent) = name_ref.syntax().parent() {
-                                if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
-                                    if let Definition::Field(field) = def {
-                                        if let VariantDef::Union(_) = field.parent_def(db) {
-                                            h |= HighlightModifier::Unsafe;
-                                        }
-                                    }
-                                }
-                            }
-                            h
-                        }
-                        NameRefClass::FieldShorthand { .. } => {
-                            HighlightTag::Symbol(SymbolKind::Field).into()
-                        }
-                    },
-                    None if syntactic_name_ref_highlighting => {
-                        highlight_name_ref_by_syntax(name_ref, sema)
-                    }
-                    None => HighlightTag::UnresolvedReference.into(),
-                }
-            })
-        }
-        // Simple token-based highlighting
-        COMMENT => {
-            let comment = element.into_token().and_then(ast::Comment::cast)?;
-            let h = HighlightTag::Comment;
-            match comment.kind().doc {
-                Some(_) => h | HighlightModifier::Documentation,
-                None => h.into(),
-            }
-        }
-        STRING | BYTE_STRING => HighlightTag::StringLiteral.into(),
-        ATTR => HighlightTag::Attribute.into(),
-        INT_NUMBER | FLOAT_NUMBER => HighlightTag::NumericLiteral.into(),
-        BYTE => HighlightTag::ByteLiteral.into(),
-        CHAR => HighlightTag::CharLiteral.into(),
-        QUESTION => Highlight::new(HighlightTag::Operator) | HighlightModifier::ControlFlow,
-        LIFETIME => {
-            let lifetime = element.into_node().and_then(ast::Lifetime::cast).unwrap();
-            match NameClass::classify_lifetime(sema, &lifetime) {
-                Some(NameClass::Definition(def)) => {
-                    highlight_def(db, def) | HighlightModifier::Definition
-                }
-                None => match NameRefClass::classify_lifetime(sema, &lifetime) {
-                    Some(NameRefClass::Definition(def)) => highlight_def(db, def),
-                    _ => Highlight::new(HighlightTag::Symbol(SymbolKind::LifetimeParam)),
-                },
-                _ => {
-                    Highlight::new(HighlightTag::Symbol(SymbolKind::LifetimeParam))
-                        | HighlightModifier::Definition
-                }
-            }
-        }
-        p if p.is_punct() => match p {
-            T![&] => {
-                let h = HighlightTag::Operator.into();
-                let is_unsafe = element
-                    .parent()
-                    .and_then(ast::RefExpr::cast)
-                    .map(|ref_expr| sema.is_unsafe_ref_expr(&ref_expr))
-                    .unwrap_or(false);
-                if is_unsafe {
-                    h | HighlightModifier::Unsafe
-                } else {
-                    h
-                }
-            }
-            T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => {
-                HighlightTag::Operator.into()
-            }
-            T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
-                HighlightTag::Symbol(SymbolKind::Macro).into()
-            }
-            T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => {
-                HighlightTag::BuiltinType.into()
-            }
-            T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
-                HighlightTag::Keyword.into()
-            }
-            T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
-                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
-                let expr = prefix_expr.expr()?;
-                let ty = sema.type_of_expr(&expr)?;
-                if ty.is_raw_ptr() {
-                    HighlightTag::Operator | HighlightModifier::Unsafe
-                } else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
-                    HighlightTag::Operator.into()
-                } else {
-                    HighlightTag::Punctuation.into()
-                }
-            }
-            T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
-                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
-                let expr = prefix_expr.expr()?;
-                match expr {
-                    ast::Expr::Literal(_) => HighlightTag::NumericLiteral,
-                    _ => HighlightTag::Operator,
-                }
-                .into()
-            }
-            _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::RangePat::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::RestPat::cast).is_some() => {
-                HighlightTag::Operator.into()
-            }
-            _ if element.parent().and_then(ast::Attr::cast).is_some() => {
-                HighlightTag::Attribute.into()
-            }
-            _ => HighlightTag::Punctuation.into(),
-        },
-        k if k.is_keyword() => {
-            let h = Highlight::new(HighlightTag::Keyword);
-            match k {
-                T![break]
-                | T![continue]
-                | T![else]
-                | T![if]
-                | T![loop]
-                | T![match]
-                | T![return]
-                | T![while]
-                | T![in] => h | HighlightModifier::ControlFlow,
-                T![for] if !is_child_of_impl(&element) => h | HighlightModifier::ControlFlow,
-                T![unsafe] => h | HighlightModifier::Unsafe,
-                T![true] | T![false] => HighlightTag::BoolLiteral.into(),
-                T![self] => {
-                    let self_param_is_mut = element
-                        .parent()
-                        .and_then(ast::SelfParam::cast)
-                        .and_then(|p| p.mut_token())
-                        .is_some();
-                    let self_path = &element
-                        .parent()
-                        .as_ref()
-                        .and_then(SyntaxNode::parent)
-                        .and_then(ast::Path::cast)
-                        .and_then(|p| sema.resolve_path(&p));
-                    let mut h = HighlightTag::Symbol(SymbolKind::SelfParam).into();
-                    if self_param_is_mut
-                        || matches!(self_path,
-                            Some(hir::PathResolution::Local(local))
-                                if local.is_self(db)
-                                    && (local.is_mut(db) || local.ty(db).is_mutable_reference())
-                        )
-                    {
-                        h |= HighlightModifier::Mutable
-                    }
-                    if let Some(hir::PathResolution::Local(local)) = self_path {
-                        if is_consumed_lvalue(element, &local, db) {
-                            h |= HighlightModifier::Consuming;
-                        }
-                    }