10 files changed, 278 insertions, 102 deletions

diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index b3c323d38..2c2b6fa48 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -1,24 +1,26 @@
 //! FIXME: write short doc here
 
-use ra_db::SourceDatabase;
+use hir::db::AstDatabase;
 use ra_syntax::{
-    algo::ancestors_at_offset,
     ast::{self, ArgListOwner},
-    match_ast, AstNode, SyntaxNode, TextUnit,
+    match_ast, AstNode, SyntaxNode,
 };
 use test_utils::tested_by;
 
-use crate::{db::RootDatabase, CallInfo, FilePosition, FunctionSignature};
+use crate::{
+    db::RootDatabase, expand::descend_into_macros, CallInfo, FilePosition, FunctionSignature,
+};
 
 /// Computes parameter information for the given call expression.
 pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<CallInfo> {
-    let parse = db.parse(position.file_id);
-    let syntax = parse.tree().syntax().clone();
+    let file = db.parse_or_expand(position.file_id.into())?;
+    let token = file.token_at_offset(position.offset).next()?;
+    let token = descend_into_macros(db, position.file_id, token);
 
     // Find the calling expression and it's NameRef
-    let calling_node = FnCallNode::with_node(&syntax, position.offset)?;
+    let calling_node = FnCallNode::with_node(&token.value.parent())?;
     let name_ref = calling_node.name_ref()?;
-    let name_ref = hir::InFile::new(position.file_id.into(), name_ref.syntax());
+    let name_ref = token.with_value(name_ref.syntax());
 
     let analyzer = hir::SourceAnalyzer::new(db, name_ref, None);
     let (mut call_info, has_self) = match &calling_node {
@@ -93,8 +95,8 @@ enum FnCallNode {
 }
 
 impl FnCallNode {
-    fn with_node(syntax: &SyntaxNode, offset: TextUnit) -> Option<FnCallNode> {
-        ancestors_at_offset(syntax, offset).find_map(|node| {
+    fn with_node(syntax: &SyntaxNode) -> Option<FnCallNode> {
+        syntax.ancestors().find_map(|node| {
             match_ast! {
                 match node {
                     ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) },
@@ -589,4 +591,25 @@ fn f() {
         assert_eq!(info.label(), "foo!()");
         assert_eq!(info.doc().map(|it| it.into()), Some("empty macro".to_string()));
     }
+
+    #[test]
+    fn fn_signature_for_call_in_macro() {
+        let info = call_info(
+            r#"
+            macro_rules! id {
+                ($($tt:tt)*) => { $($tt)* }
+            }
+            fn foo() {
+
+            }
+            id! {
+                fn bar() {
+                    foo(<|>);
+                }
+            }
+            "#,
+        );
+
+        assert_eq!(info.label(), "fn foo()");
+    }
 }
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 6a6b49afd..b9ae67828 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -328,22 +328,23 @@ impl ToNav for hir::AssocItem {
 impl ToNav for hir::Local {
     fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
         let src = self.source(db);
-        let (full_range, focus_range) = match src.value {
-            Either::Left(it) => {
-                (it.syntax().text_range(), it.name().map(|it| it.syntax().text_range()))
+        let node = match &src.value {
+            Either::Left(bind_pat) => {
+                bind_pat.name().map_or_else(|| bind_pat.syntax().clone(), |it| it.syntax().clone())
             }
-            Either::Right(it) => (it.syntax().text_range(), Some(it.self_kw_token().text_range())),
+            Either::Right(it) => it.syntax().clone(),
         };
+        let full_range = original_range(db, src.with_value(&node));
         let name = match self.name(db) {
             Some(it) => it.to_string().into(),
             None => "".into(),
         };
         NavigationTarget {
-            file_id: src.file_id.original_file(db),
+            file_id: full_range.file_id,
             name,
             kind: BIND_PAT,
-            full_range,
-            focus_range,
+            full_range: full_range.range,
+            focus_range: None,
             container_name: None,
             description: None,
             docs: None,
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index bee8e9df2..9b5744789 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -225,35 +225,40 @@ mod tests {
 
     use crate::mock_analysis::analysis_and_position;
 
-    fn check_goto(fixture: &str, expected: &str) {
+    fn check_goto(fixture: &str, expected: &str, expected_range: &str) {
         let (analysis, pos) = analysis_and_position(fixture);
 
         let mut navs = analysis.goto_definition(pos).unwrap().unwrap().info;
         assert_eq!(navs.len(), 1);
-        let nav = navs.pop().unwrap();
-        nav.assert_match(expected);
-    }
-
-    fn check_goto_with_range_content(fixture: &str, expected: &str, expected_range: &str) {
-        let (analysis, pos) = analysis_and_position(fixture);
 
-        let mut navs = analysis.goto_definition(pos).unwrap().unwrap().info;
-        assert_eq!(navs.len(), 1);
         let nav = navs.pop().unwrap();
-        let file_text = analysis.file_text(pos.file_id).unwrap();
+        let file_text = analysis.file_text(nav.file_id()).unwrap();
+
+        let mut actual = file_text[nav.full_range()].to_string();
+        if let Some(focus) = nav.focus_range() {
+            actual += "|";
+            actual += &file_text[focus];
+        }
 
-        let actual_full_range = &file_text[nav.full_range()];
-        let actual_range = &file_text[nav.range()];
+        if !expected_range.contains("...") {
+            test_utils::assert_eq_text!(&actual, expected_range);
+        } else {
+            let mut parts = expected_range.split("...");
+            let prefix = parts.next().unwrap();
+            let suffix = parts.next().unwrap();
+            assert!(
+                actual.starts_with(prefix) && actual.ends_with(suffix),
+                "\nExpected: {}\n Actual: {}\n",
+                expected_range,
+                actual
+            );
+        }
 
-        test_utils::assert_eq_text!(
-            &format!("{}|{}", actual_full_range, actual_range),
-            expected_range
-        );
         nav.assert_match(expected);
     }
 
     #[test]
-    fn goto_definition_works_in_items() {
+    fn goto_def_in_items() {
         check_goto(
             "
             //- /lib.rs
@@ -261,11 +266,12 @@ mod tests {
             enum E { X(Foo<|>) }
             ",
             "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "struct Foo;|Foo",
         );
     }
 
     #[test]
-    fn goto_definition_works_at_start_of_item() {
+    fn goto_def_at_start_of_item() {
         check_goto(
             "
             //- /lib.rs
@@ -273,6 +279,7 @@ mod tests {
             enum E { X(<|>Foo) }
             ",
             "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "struct Foo;|Foo",
         );
     }
 
@@ -285,61 +292,65 @@ mod tests {
             mod a;
             mod b;
             enum E { X(Foo<|>) }
+
             //- /a.rs
             struct Foo;
+
             //- /b.rs
             struct Foo;
             ",
             "Foo STRUCT_DEF FileId(2) [0; 11) [7; 10)",
+            "struct Foo;|Foo",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_module_declaration() {
+    fn goto_def_for_module_declaration() {
         check_goto(
             "
             //- /lib.rs
             mod <|>foo;
+
             //- /foo.rs
             // empty
             ",
             "foo SOURCE_FILE FileId(2) [0; 10)",
+            "// empty\n\n",
         );
 
         check_goto(
             "
             //- /lib.rs
             mod <|>foo;
+
             //- /foo/mod.rs
             // empty
             ",
             "foo SOURCE_FILE FileId(2) [0; 10)",
+            "// empty\n\n",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_macros() {
-        covers!(goto_definition_works_for_macros);
+    fn goto_def_for_macros() {
+        covers!(goto_def_for_macros);
         check_goto(
             "
             //- /lib.rs
-            macro_rules! foo {
-                () => {
-                    {}
-                };
-            }
+            macro_rules! foo { () => { () } }
 
             fn bar() {
                 <|>foo!();
             }
             ",
-            "foo MACRO_CALL FileId(1) [0; 50) [13; 16)",
+            "foo MACRO_CALL FileId(1) [0; 33) [13; 16)",
+            "macro_rules! foo { () => { () } }|foo",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_macros_from_other_crates() {
-        covers!(goto_definition_works_for_macros);
+    fn goto_def_for_macros_from_other_crates() {
+        covers!(goto_def_for_macros);
         check_goto(
             "
             //- /lib.rs
@@ -350,18 +361,15 @@ mod tests {
 
             //- /foo/lib.rs
             #[macro_export]
-            macro_rules! foo {
-                () => {
-                    {}
-                };
-            }
+            macro_rules! foo { () => { () } }
             ",
-            "foo MACRO_CALL FileId(2) [0; 66) [29; 32)",
+            "foo MACRO_CALL FileId(2) [0; 49) [29; 32)",
+            "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_macros_in_use_tree() {
+    fn goto_def_for_macros_in_use_tree() {
         check_goto(
             "
             //- /lib.rs
@@ -369,19 +377,16 @@ mod tests {
 
             //- /foo/lib.rs
             #[macro_export]
-            macro_rules! foo {
-                () => {
-                    {}
-                };
-            }
+            macro_rules! foo { () => { () } }
             ",
-            "foo MACRO_CALL FileId(2) [0; 66) [29; 32)",
+            "foo MACRO_CALL FileId(2) [0; 49) [29; 32)",
+            "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_macro_defined_fn_with_arg() {
-        check_goto_with_range_content(
+    fn goto_def_for_macro_defined_fn_with_arg() {
+        check_goto(
             "
             //- /lib.rs
             macro_rules! define_fn {
@@ -400,8 +405,8 @@ mod tests {
     }
 
     #[test]
-    fn goto_definition_works_for_macro_defined_fn_no_arg() {
-        check_goto_with_range_content(
+    fn goto_def_for_macro_defined_fn_no_arg() {
+        check_goto(
             "
             //- /lib.rs
             macro_rules! define_fn {
@@ -420,27 +425,28 @@ mod tests {
     }
 
     #[test]
-    fn goto_definition_works_for_methods() {
-        covers!(goto_definition_works_for_methods);
+    fn goto_def_for_methods() {
+        covers!(goto_def_for_methods);
         check_goto(
             "
             //- /lib.rs
             struct Foo;
             impl Foo {
-                fn frobnicate(&self) {  }
+                fn frobnicate(&self) { }
             }
 
             fn bar(foo: &Foo) {
                 foo.frobnicate<|>();
             }
             ",
-            "frobnicate FN_DEF FileId(1) [27; 52) [30; 40)",
+            "frobnicate FN_DEF FileId(1) [27; 51) [30; 40)",
+            "fn frobnicate(&self) { }|frobnicate",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_fields() {
-        covers!(goto_definition_works_for_fields);
+    fn goto_def_for_fields() {
+        covers!(goto_def_for_fields);
         check_goto(
             "
             //- /lib.rs
@@ -453,12 +459,13 @@ mod tests {
             }
             ",
             "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)",
+            "spam: u32|spam",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_record_fields() {
-        covers!(goto_definition_works_for_record_fields);
+    fn goto_def_for_record_fields() {
+        covers!(goto_def_for_record_fields);
         check_goto(
             "
             //- /lib.rs
@@ -473,6 +480,7 @@ mod tests {
             }
             ",
             "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)",
+            "spam: u32|spam",
         );
     }
 
@@ -489,29 +497,31 @@ mod tests {
             }
             ",
             "TUPLE_FIELD_DEF FileId(1) [11; 14)",
+            "u32",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_ufcs_inherent_methods() {
+    fn goto_def_for_ufcs_inherent_methods() {
         check_goto(
             "
             //- /lib.rs
             struct Foo;
             impl Foo {
-                fn frobnicate() {  }
+                fn frobnicate() { }
             }
 
             fn bar(foo: &Foo) {
                 Foo::frobnicate<|>();
             }
             ",
-            "frobnicate FN_DEF FileId(1) [27; 47) [30; 40)",
+            "frobnicate FN_DEF FileId(1) [27; 46) [30; 40)",
+            "fn frobnicate() { }|frobnicate",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_ufcs_trait_methods_through_traits() {
+    fn goto_def_for_ufcs_trait_methods_through_traits() {
         check_goto(
             "
             //- /lib.rs
@@ -524,11 +534,12 @@ mod tests {
             }
             ",
             "frobnicate FN_DEF FileId(1) [16; 32) [19; 29)",
+            "fn frobnicate();|frobnicate",
         );
     }
 
     #[test]
-    fn goto_definition_works_for_ufcs_trait_methods_through_self() {
+    fn goto_def_for_ufcs_trait_methods_through_self() {
         check_goto(
             "
             //- /lib.rs
@@ -543,6 +554,7 @@ mod tests {
             }
             ",
             "frobnicate FN_DEF FileId(1) [30; 46) [33; 43)",
+            "fn frobnicate();|frobnicate",
         );
     }
 
@@ -559,6 +571,7 @@ mod tests {
             }
             ",
             "impl IMPL_BLOCK FileId(1) [12; 73)",
+            "impl Foo {...}",
         );
 
         check_goto(
@@ -572,6 +585,7 @@ mod tests {
             }
             ",
             "impl IMPL_BLOCK FileId(1) [12; 73)",
+            "impl Foo {...}",
         );
 
         check_goto(
@@ -585,6 +599,7 @@ mod tests {
             }
             ",
             "impl IMPL_BLOCK FileId(1) [15; 75)",
+            "impl Foo {...}",
         );
 
         check_goto(
@@ -597,6 +612,7 @@ mod tests {
             }
             ",
             "impl IMPL_BLOCK FileId(1) [15; 62)",
+            "impl Foo {...}",
         );
     }
 
@@ -616,6 +632,7 @@ mod tests {
             }
             ",
             "impl IMPL_BLOCK FileId(1) [49; 115)",
+            "impl Make for Foo {...}",
         );
 
         check_goto(
@@ -632,17 +649,19 @@ mod tests {
             }
             ",
             "impl IMPL_BLOCK FileId(1) [49; 115)",
+            "impl Make for Foo {...}",
         );
     }
 
     #[test]
-    fn goto_definition_works_when_used_on_definition_name_itself() {
+    fn goto_def_when_used_on_definition_name_itself() {
         check_goto(
             "
             //- /lib.rs
             struct Foo<|> { value: u32 }
             ",
             "Foo STRUCT_DEF FileId(1) [0; 25) [7; 10)",
+            "struct Foo { value: u32 }|Foo",
         );
 
         check_goto(
@@ -653,15 +672,16 @@ mod tests {
             }
             "#,
             "field RECORD_FIELD_DEF FileId(1) [17; 30) [17; 22)",
+            "field: string|field",
         );
 
         check_goto(
             "
             //- /lib.rs
-            fn foo_test<|>() {
-            }
+            fn foo_test<|>() { }
             ",
             "foo_test FN_DEF FileId(1) [0; 17) [3; 11)",
+            "fn foo_test() { }|foo_test",
         );
 
         check_goto(
@@ -672,6 +692,7 @@ mod tests {
             }
             ",
             "Foo ENUM_DEF FileId(1) [0; 25) [5; 8)",
+            "enum Foo {...}|Foo",
         );
 
         check_goto(
@@ -684,22 +705,25 @@ mod tests {
             }
             ",
             "Variant2 ENUM_VARIANT FileId(1) [29; 37) [29; 37)",
+            "Variant2|Variant2",
         );
 
         check_goto(
             r#"
             //- /lib.rs
-            static inner<|>: &str = "";
+            static INNER<|>: &str = "";
             "#,
-            "inner STATIC_DEF FileId(1) [0; 24) [7; 12)",
+            "INNER STATIC_DEF FileId(1) [0; 24) [7; 12)",
+            "static INNER: &str = \"\";|INNER",
         );
 
         check_goto(
             r#"
             //- /lib.rs
-            const inner<|>: &str = "";
+            const INNER<|>: &str = "";
             "#,
-            "inner CONST_DEF FileId(1) [0; 23) [6; 11)",
+            "INNER CONST_DEF FileId(1) [0; 23) [6; 11)",
+            "const INNER: &str = \"\";|INNER",
         );
 
         check_goto(
@@ -708,24 +732,25 @@ mod tests {
             type Thing<|> = Option<()>;
             "#,
             "Thing TYPE_ALIAS_DEF FileId(1) [0; 24) [5; 10)",
+            "type Thing = Option<()>;|Thing",
         );
 
         check_goto(
             r#"
             //- /lib.rs
-            trait Foo<|> {
-            }
+            trait Foo<|> { }
             "#,
             "Foo TRAIT_DEF FileId(1) [0; 13) [6; 9)",
+            "trait Foo { }|Foo",
         );
 
         check_goto(
             r#"
             //- /lib.rs
-            mod bar<|> {
-            }
+            mod bar<|> { }
             "#,
             "bar MODULE FileId(1) [0; 11) [4; 7)",
+            "mod bar { }|bar",
         );
     }
 
@@ -746,6 +771,7 @@ mod tests {
             mod confuse_index { fn foo(); }
             ",
             "foo FN_DEF FileId(1) [52; 63) [55; 58)",
+            "fn foo() {}|foo",
         );
     }
 
@@ -774,6 +800,7 @@ mod tests {
             }
             ",
             "foo FN_DEF FileId(1) [398; 415) [401; 404)",
+            "fn foo() -> i8 {}|foo",
         );
     }
 
@@ -787,6 +814,82 @@ mod tests {
             }
             ",
             "T TYPE_PARAM FileId(1) [11; 12)",
+            "T",
         );
     }
+
+    #[test]
+    fn goto_within_macro() {
+        check_goto(
+            "
+            //- /lib.rs
+            macro_rules! id {
+                ($($tt:tt)*) => ($($tt)*)
+            }
+
+            fn foo() {
+                let x = 1;
+                id!({
+                    let y = <|>x;
+                    let z = y;
+                });
+            }
+            ",
+            "x BIND_PAT FileId(1) [69; 70)",
+            "x",
+        );
+
+        check_goto(
+            "
+            //- /lib.rs
+            macro_rules! id {
+                ($($tt:tt)*) => ($($tt)*)
+            }
+
+            fn foo() {
+                let x = 1;
+                id!({
+                    let y = x;
+                    let z = <|>y;
+                });
+            }
+            ",
+            "y BIND_PAT FileId(1) [98; 99)",
+            "y",
+        );
+    }
+
+    #[test]
+    fn goto_def_in_local_fn() {
+        check_goto(
+            "
+            //- /lib.rs
+            fn main() {
+                fn foo() {
+                    let x = 92;
+                    <|>x;
+                }
+            }
+            ",
+            "x BIND_PAT FileId(1) [39; 40)",
+            "x",
+        );
+    }
+
+    #[test]
+    fn goto_def_for_field_init_shorthand() {
+        covers!(goto_def_for_field_init_shorthand);
+        check_goto(
+            "
+            //- /lib.rs
+            struct Foo { x: i32 }
+            fn main() {
+                let x = 92;
+                Foo { x<|> };
+            }
+            ",
+            "x RECORD_FIELD_DEF FileId(1) [13; 19) [13; 14)",
+            "x: i32|x",
+        )
+    }
 }
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index 51e320128..a227bf546 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -250,7 +250,7 @@ pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Option<String> {
     } else {
         return None;
     };
-    Some(ty.display(db).to_string())
+    Some(ty.display_truncated(db, None).to_string())
 }
 
 #[cfg(test)]
@@ -425,6 +425,23 @@ mod tests {
     }
 
     #[test]
+    fn hover_omits_default_generic_types() {
+        check_hover_result(
+            r#"
+//- /main.rs
+struct Test<K, T = u8> {
+    k: K,
+    t: T,
+}
+
+fn main() {
+    let zz<|> = Test { t: 23, k: 33 };
+}"#,
+            &["Test<i32>"],
+        );
+    }
+
+    #[test]
     fn hover_some() {
         let (analysis, position) = single_file_with_position(
             "
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 3730121af..3154df457 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -160,6 +160,32 @@ mod tests {
     use crate::mock_analysis::single_file;
 
     #[test]
+    fn default_generic_types_should_not_be_displayed() {
+        let (analysis, file_id) = single_file(
+            r#"
+struct Test<K, T = u8> {
+    k: K,
+    t: T,
+}
+
+fn main() {
+    let zz = Test { t: 23, k: 33 };
+}"#,
+        );
+
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        [
+            InlayHint {
+                range: [69; 71),
+                kind: TypeHint,
+                label: "Test<i32>",
+            },
+        ]
+        "###
+        );
+    }
+
+    #[test]
     fn let_statement() {
         let (analysis, file_id) = single_file(
             r#"
diff --git a/crates/ra_ide/src/marks.rs b/crates/ra_ide/src/marks.rs
index 848ae4dc7..077a44473 100644
--- a/crates/ra_ide/src/marks.rs
+++ b/crates/ra_ide/src/marks.rs
@@ -3,10 +3,11 @@
 test_utils::marks!(
     inserts_angle_brackets_for_generics
     inserts_parens_for_function_calls
-    goto_definition_works_for_macros
-    goto_definition_works_for_methods
-    goto_definition_works_for_fields
-    goto_definition_works_for_record_fields
+    goto_def_for_macros
+    goto_def_for_methods
+    goto_def_for_fields
+    goto_def_for_record_fields
+    goto_def_for_field_init_shorthand
     call_info_bad_offset
     dont_complete_current_use
     dont_complete_primitive_in_use
diff --git a/crates/ra_ide/src/references/classify.rs b/crates/ra_ide/src/references/classify.rs
index c1f091ec0..3483a7176 100644
--- a/crates/ra_ide/src/references/classify.rs
+++ b/crates/ra_ide/src/references/classify.rs
@@ -134,21 +134,22 @@ pub(crate) fn classify_name_ref(
     let analyzer = SourceAnalyzer::new(db, name_ref.map(|it| it.syntax()), None);
 
     if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
-        tested_by!(goto_definition_works_for_methods);
+        tested_by!(goto_def_for_methods);
         if let Some(func) = analyzer.resolve_method_call(&method_call) {
             return Some(from_assoc_item(db, func.into()));
         }
     }
 
     if let Some(field_expr) = ast::FieldExpr::cast(parent.clone()) {
-        tested_by!(goto_definition_works_for_fields);
+        tested_by!(goto_def_for_fields);
         if let Some(field) = analyzer.resolve_field(&field_expr) {
             return Some(from_struct_field(db, field));
         }
     }
 
     if let Some(record_field) = ast::RecordField::cast(parent.clone()) {
-        tested_by!(goto_definition_works_for_record_fields);
+        tested_by!(goto_def_for_record_fields);
+        tested_by!(goto_def_for_field_init_shorthand);
         if let Some(field_def) = analyzer.resolve_record_field(&record_field) {
             return Some(from_struct_field(db, field_def));
         }
@@ -160,7 +161,7 @@ pub(crate) fn classify_name_ref(
     let visibility = None;
 
     if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
-        tested_by!(goto_definition_works_for_macros);
+        tested_by!(goto_def_for_macros);
         if let Some(macro_def) = analyzer.resolve_macro_call(db, name_ref.with_value(&macro_call)) {
             let kind = NameKind::Macro(macro_def);
             return Some(NameDefinition { kind, container, visibility });
diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html
index 2157139f6..a097cf8e8 100644
--- a/crates/ra_ide/src/snapshots/highlighting.html
+++ b/crates/ra_ide/src/snapshots/highlighting.html
@@ -5,6 +5,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .comment            { color: #7F9F7F; }
 .string             { color: #CC9393; }
+.field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
@@ -39,7 +40,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
     <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable.mut">vec</span> = <span class="text">Vec</span>::<span class="text">new</span>();
     <span class="keyword.control">if</span> <span class="keyword">true</span> {
-        <span class="variable.mut">vec</span>.<span class="text">push</span>(<span class="type">Foo</span> { <span class="field">x</span>: <span class="literal.numeric">0</span>, <span class="field">y</span>: <span class="literal.numeric">1</span> });
+        <span class="keyword">let</span> <span class="variable">x</span> = <span class="literal.numeric">92</span>;
+        <span class="variable.mut">vec</span>.<span class="text">push</span>(<span class="type">Foo</span> { <span class="field">x</span>, <span class="field">y</span>: <span class="literal.numeric">1</span> });
     }
     <span class="keyword.unsafe">unsafe</span> { <span class="variable.mut">vec</span>.<span class="text">set_len</span>(<span class="literal.numeric">0</span>); }
 
diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
index 871a52cf6..110556c09 100644
--- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html
+++ b/crates/ra_ide/src/snapshots/rainbow_highlighting.html
@@ -5,6 +5,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .comment            { color: #7F9F7F; }
 .string             { color: #CC9393; }
+.field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 15e75709c..657c7b21a 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -102,11 +102,10 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
             COMMENT => tags::LITERAL_COMMENT,
             STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => tags::LITERAL_STRING,
             ATTR => tags::LITERAL_ATTRIBUTE,
+            // Special-case field init shorthand
+            NAME_REF if node.parent().and_then(ast::RecordField::cast).is_some() => tags::FIELD,
+            NAME_REF if node.ancestors().any(|it| it.kind() == ATTR) => continue,
             NAME_REF => {
-                if node.ancestors().any(|it| it.kind() == ATTR) {
-                    continue;
-                }
-
                 let name_ref = node.as_node().cloned().and_then(ast::NameRef::cast).unwrap();
                 let name_kind =
                     classify_name_ref(db, InFile::new(file_id.into(), &name_ref)).map(|d| d.kind);
@@ -282,6 +281,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 
 .comment            { color: #7F9F7F; }
 .string             { color: #CC9393; }
+.field              { color: #94BFF3; }
 .function           { color: #93E0E3; }
 .parameter          { color: #94BFF3; }
 .text               { color: #DCDCCC; }
@@ -327,7 +327,8 @@ fn main() {
 
     let mut vec = Vec::new();
     if true {
-        vec.push(Foo { x: 0, y: 1 });
+        let x = 92;
+        vec.push(Foo { x, y: 1 });
     }
     unsafe { vec.set_len(0); }