From 46bc8675edd403ffcd8963e4f26447b283e9d09e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 11 Jun 2019 17:13:20 +0300 Subject: use Source for statics and consts --- crates/ra_ide_api/src/display/navigation_target.rs | 32 +++------------------- 1 file changed, 4 insertions(+), 28 deletions(-) (limited to 'crates/ra_ide_api/src/display') diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs index 3333771ab..a036a3b36 100644 --- a/crates/ra_ide_api/src/display/navigation_target.rs +++ b/crates/ra_ide_api/src/display/navigation_target.rs @@ -212,24 +212,8 @@ impl NavigationTarget { hir::ModuleDef::Struct(it) => NavigationTarget::from_adt_def(db, it.into()), hir::ModuleDef::Enum(it) => NavigationTarget::from_adt_def(db, it.into()), hir::ModuleDef::Union(it) => NavigationTarget::from_adt_def(db, it.into()), - hir::ModuleDef::Const(s) => { - let (file_id, node) = s.source(db); - NavigationTarget::from_named( - file_id.original_file(db), - &*node, - node.doc_comment_text(), - node.short_label(), - ) - } - hir::ModuleDef::Static(s) => { - let (file_id, node) = s.source(db); - NavigationTarget::from_named( - file_id.original_file(db), - &*node, - node.doc_comment_text(), - node.short_label(), - ) - } + hir::ModuleDef::Const(it) => NavigationTarget::from_def_source(db, it), + hir::ModuleDef::Static(it) => NavigationTarget::from_def_source(db, it), hir::ModuleDef::EnumVariant(var) => { let src = var.source(db); NavigationTarget::from_named( @@ -281,16 +265,8 @@ impl NavigationTarget { pub(crate) fn from_impl_item(db: &RootDatabase, impl_item: hir::ImplItem) -> NavigationTarget { match impl_item { - ImplItem::Method(f) => NavigationTarget::from_function(db, f), - ImplItem::Const(c) => { - let (file_id, node) = c.source(db); - NavigationTarget::from_named( - file_id.original_file(db), - &*node, - node.doc_comment_text(), - node.short_label(), - ) - } + ImplItem::Method(it) => NavigationTarget::from_function(db, it), + ImplItem::Const(it) => NavigationTarget::from_def_source(db, it), ImplItem::TypeAlias(a) => { let (file_id, node) = a.source(db); NavigationTarget::from_named( -- cgit v1.2.3