1 files changed, 36 insertions, 13 deletions

diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index e72b7a6e7..325a5a4f3 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -1,6 +1,6 @@
 use ra_db::{FileId, SourceDatabase};
 use ra_syntax::{
-    AstNode, ast,
+    AstNode, ast::{self, DocCommentsOwner},
     algo::{
         find_node_at_offset,
         visit::{visitor, Visitor},
@@ -13,6 +13,7 @@ use crate::{
     db::RootDatabase,
     RangeInfo,
     name_ref_kind::{NameRefKind::*, classify_name_ref},
+    display::ShortLabel,
 };
 
 pub(crate) fn goto_definition(
@@ -82,7 +83,7 @@ pub(crate) fn reference_definition(
     // Fallback index based approach:
     let navs = crate::symbol_index::index_resolve(db, name_ref)
         .into_iter()
-        .map(NavigationTarget::from_symbol)
+        .map(|s| NavigationTarget::from_symbol(db, s))
         .collect();
     Approximate(navs)
 }
@@ -114,17 +115,39 @@ pub(crate) fn name_definition(
 
 fn named_target(file_id: FileId, node: &SyntaxNode) -> Option<NavigationTarget> {
     visitor()
-        .visit(|node: &ast::StructDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::EnumDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::EnumVariant| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::FnDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::TypeAliasDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::ConstDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::StaticDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::TraitDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::NamedFieldDef| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::Module| NavigationTarget::from_named(file_id, node))
-        .visit(|node: &ast::MacroCall| NavigationTarget::from_named(file_id, node))
+        .visit(|node: &ast::StructDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::EnumDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::EnumVariant| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::FnDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::TypeAliasDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::ConstDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::StaticDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::TraitDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::NamedFieldDef| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::Module| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), node.short_label())
+        })
+        .visit(|node: &ast::MacroCall| {
+            NavigationTarget::from_named(file_id, node, node.doc_comment_text(), None)
+        })
         .accept(node)
 }