Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

1 files changed, 16 insertions, 44 deletions

diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index b693a4c31..3f16e9566 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -1,16 +1,15 @@
 //! FIXME: write short doc here
 
-use std::iter::successors;
-
 use hir::{db::AstDatabase, Source};
 use ra_syntax::{
     ast::{self, DocCommentsOwner},
-    match_ast, AstNode, SyntaxNode, SyntaxToken,
+    match_ast, AstNode, SyntaxNode,
 };
 
 use crate::{
     db::RootDatabase,
     display::{ShortLabel, ToNav},
+    expand::descend_into_macros,
     references::{classify_name_ref, NameKind::*},
     FilePosition, NavigationTarget, RangeInfo,
 };
@@ -19,7 +18,9 @@ pub(crate) fn goto_definition(
     db: &RootDatabase,
     position: FilePosition,
 ) -> Option<RangeInfo<Vec<NavigationTarget>>> {
-    let token = descend_into_macros(db, position)?;
+    let file = db.parse_or_expand(position.file_id.into())?;
+    let token = file.token_at_offset(position.offset).filter(|it| !it.kind().is_trivia()).next()?;
+    let token = descend_into_macros(db, position.file_id, token);
 
     let res = match_ast! {
         match (token.ast.parent()) {
@@ -39,24 +40,6 @@ pub(crate) fn goto_definition(
     Some(res)
 }
 
-fn descend_into_macros(db: &RootDatabase, position: FilePosition) -> Option<Source<SyntaxToken>> {
-    let file = db.parse_or_expand(position.file_id.into())?;
-    let token = file.token_at_offset(position.offset).filter(|it| !it.kind().is_trivia()).next()?;
-
-    successors(Some(Source::new(position.file_id.into(), token)), |token| {
-        let macro_call = token.ast.ancestors().find_map(ast::MacroCall::cast)?;
-        let tt = macro_call.token_tree()?;
-        if !token.ast.text_range().is_subrange(&tt.syntax().text_range()) {
-            return None;
-        }
-        let source_analyzer =
-            hir::SourceAnalyzer::new(db, token.with_ast(token.ast.parent()).as_ref(), None);
-        let exp = source_analyzer.expand(db, &macro_call)?;
-        exp.map_token_down(db, token.as_ref())
-    })
-    .last()
-}
-
 #[derive(Debug)]
 pub(crate) enum ReferenceResult {
     Exact(NavigationTarget),
@@ -137,8 +120,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::StructDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -146,8 +128,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::EnumDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -155,8 +136,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::EnumVariant(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -164,8 +144,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::FnDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -173,8 +152,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::TypeAliasDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -182,8 +160,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::ConstDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -191,8 +168,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::StaticDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -200,8 +176,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::TraitDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -209,8 +184,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::RecordFieldDef(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -218,8 +192,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::Module(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     it.short_label(),
                 ))
@@ -227,8 +200,7 @@ fn named_target(db: &RootDatabase, node: Source<&SyntaxNode>) -> Option<Navigati
             ast::MacroCall(it) => {
                 Some(NavigationTarget::from_named(
                     db,
-                    node.file_id,
-                    &it,
+                    node.with_ast(&it),
                     it.doc_comment_text(),
                     None,
                 ))