diff options
author | Aleksey Kladov <[email protected]> | 2019-06-11 15:40:18 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-06-11 16:28:51 +0100 |
commit | 8b94b429e5a76a0518b07111f8faf0dca7457948 (patch) | |
tree | 32291a105de42f0494fa687cb6c3f0f718d7aea8 /crates/ra_ide_api/src | |
parent | a6e339e822bcba4d81f1ab3912ca9612be9b6a0a (diff) |
use Source for MacroDef
Diffstat (limited to 'crates/ra_ide_api/src')
-rw-r--r-- | crates/ra_ide_api/src/display/navigation_target.rs | 10 | ||||
-rw-r--r-- | crates/ra_ide_api/src/hover.rs | 4 |
2 files changed, 7 insertions, 7 deletions
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 { | |||
248 | } | 248 | } |
249 | 249 | ||
250 | pub(crate) fn from_macro_def(db: &RootDatabase, macro_call: hir::MacroDef) -> NavigationTarget { | 250 | pub(crate) fn from_macro_def(db: &RootDatabase, macro_call: hir::MacroDef) -> NavigationTarget { |
251 | let (file_id, node) = macro_call.source(db); | 251 | let src = macro_call.source(db); |
252 | log::debug!("nav target {}", node.syntax().debug_dump()); | 252 | log::debug!("nav target {}", src.ast.syntax().debug_dump()); |
253 | NavigationTarget::from_named( | 253 | NavigationTarget::from_named( |
254 | file_id.original_file(db), | 254 | src.file_id.original_file(db), |
255 | &*node, | 255 | &*src.ast, |
256 | node.doc_comment_text(), | 256 | src.ast.doc_comment_text(), |
257 | None, | 257 | None, |
258 | ) | 258 | ) |
259 | } | 259 | } |
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<RangeIn | |||
98 | match classify_name_ref(db, &analyzer, name_ref) { | 98 | match classify_name_ref(db, &analyzer, name_ref) { |
99 | Some(Method(it)) => res.extend(from_def_source(db, it)), | 99 | Some(Method(it)) => res.extend(from_def_source(db, it)), |
100 | Some(Macro(it)) => { | 100 | Some(Macro(it)) => { |
101 | let it = it.source(db).1; | 101 | let src = it.source(db); |
102 | res.extend(hover_text(it.doc_comment_text(), None)); | 102 | res.extend(hover_text(src.ast.doc_comment_text(), None)); |
103 | } | 103 | } |
104 | Some(FieldAccess(it)) => { | 104 | Some(FieldAccess(it)) => { |
105 | let it = it.source(db).1; | 105 | let it = it.source(db).1; |