squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

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

Browse source 
Use src node for analyze source in `descend_into_macros`
This commit is contained in:
Aleksey Kladov 2020-01-07 18:08:43 +01:00 committed by GitHub
parent 5914a93106 1fdee24608
commit 8317efa191
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_ide/src/expand.rs
View file

@ -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())
})