Merge pull request #2760 from edwin0cheng/fix-descend-into-macros

Use src node for analyze source in `descend_into_macros`

1 files changed, 3 insertions, 2 deletions

diff --git a/crates/ra_ide/src/expand.rs b/crates/ra_ide/src/expand.rs
index 7a22bb0a4..b82259a3d 100644
--- a/crates/ra_ide/src/expand.rs
+++ b/crates/ra_ide/src/expand.rs
@@ -76,14 +76,15 @@ pub(crate) fn descend_into_macros(
 ) -> InFile<SyntaxToken> {
     let src = InFile::new(file_id.into(), token);
 
+    let source_analyzer =
+        hir::SourceAnalyzer::new(db, src.with_value(src.value.parent()).as_ref(), None);
+
     successors(Some(src), |token| {
         let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?;
         let tt = macro_call.token_tree()?;
         if !token.value.text_range().is_subrange(&tt.syntax().text_range()) {
             return None;
         }
-        let source_analyzer =
-            hir::SourceAnalyzer::new(db, token.with_value(token.value.parent()).as_ref(), None);
         let exp = source_analyzer.expand(db, token.with_value(&macro_call))?;
         exp.map_token_down(db, token.as_ref())
     })