1 files changed, 24 insertions, 2 deletions

diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index a6c86e99c..0798d2c36 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -1,6 +1,6 @@
 use hir::Semantics;
 use ra_ide_db::{
-    defs::{classify_name, classify_name_ref},
+    defs::{classify_name, classify_name_ref, NameClass},
     symbol_index, RootDatabase,
 };
 use ra_syntax::{
@@ -39,7 +39,10 @@ pub(crate) fn goto_definition(
                 reference_definition(&sema, &name_ref).to_vec()
             },
             ast::Name(name) => {
-                let def = classify_name(&sema, &name)?.definition();
+                let def = match classify_name(&sema, &name)? {
+                    NameClass::Definition(def) | NameClass::ConstReference(def) => def,
+                    NameClass::FieldShorthand { local: _, field } => field,
+                };
                 let nav = def.try_to_nav(sema.db)?;
                 vec![nav]
             },
@@ -886,4 +889,23 @@ mod tests {
             "x",
         )
     }
+
+    #[test]
+    fn goto_def_for_enum_variant_field() {
+        check_goto(
+            "
+            //- /lib.rs
+            enum Foo {
+                Bar { x: i32 }
+            }
+            fn baz(foo: Foo) {
+                match foo {
+                    Foo::Bar { x<|> } => x
+                };
+            }
+            ",
+            "x RECORD_FIELD_DEF FileId(1) 21..27 21..22",
+            "x: i32|x",
+        );
+    }
 }