From 8b94b429e5a76a0518b07111f8faf0dca7457948 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 11 Jun 2019 17:40:18 +0300 Subject: use Source for MacroDef --- crates/ra_ide_api/src/display/navigation_target.rs | 10 +++++----- crates/ra_ide_api/src/hover.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/ra_ide_api/src') diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs index 640d68544..e5e1aa011 100644 --- a/crates/ra_ide_api/src/display/navigation_target.rs +++ b/crates/ra_ide_api/src/display/navigation_target.rs @@ -248,12 +248,12 @@ impl NavigationTarget { } pub(crate) fn from_macro_def(db: &RootDatabase, macro_call: hir::MacroDef) -> NavigationTarget { - let (file_id, node) = macro_call.source(db); - log::debug!("nav target {}", node.syntax().debug_dump()); + let src = macro_call.source(db); + log::debug!("nav target {}", src.ast.syntax().debug_dump()); NavigationTarget::from_named( - file_id.original_file(db), - &*node, - node.doc_comment_text(), + src.file_id.original_file(db), + &*src.ast, + src.ast.doc_comment_text(), None, ) } diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs index c4004435c..72328a72b 100644 --- a/crates/ra_ide_api/src/hover.rs +++ b/crates/ra_ide_api/src/hover.rs @@ -98,8 +98,8 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option res.extend(from_def_source(db, it)), Some(Macro(it)) => { - let it = it.source(db).1; - res.extend(hover_text(it.doc_comment_text(), None)); + let src = it.source(db); + res.extend(hover_text(src.ast.doc_comment_text(), None)); } Some(FieldAccess(it)) => { let it = it.source(db).1; -- cgit v1.2.3