mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebase

Browse Source
This commit is contained in:
Edwin Cheng 2019-11-18 03:35:46 +08:00
parent 3ccd05fedc
commit ae49a22b5c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ra_hir/src/source_binder.rs
View File

@ -140,6 +140,11 @@ impl Expansion {
exp_info.map_token_down(token)
}
pub fn source(&self, db: &impl HirDatabase) -> Source<AstId<ast::MacroCall>> {
let loc = db.lookup_intern_macro(self.macro_call_id);
Source::new(self.file_id(), loc.ast_id)
}
fn file_id(&self) -> HirFileId {
self.macro_call_id.as_file(MacroFileKind::Items)
}

7
crates/ra_ide_api/src/expand_macro.rs
View File

@ -1,10 +1,10 @@
//! FIXME: write short doc here
use crate::{db::RootDatabase, FilePosition};
use hir::db::AstDatabase;
use ra_db::SourceDatabase;
use rustc_hash::FxHashMap;
use hir::db::AstDatabase;
use ra_syntax::{
algo::{find_node_at_offset, replace_descendants},
ast::{self},
@ -47,13 +47,14 @@ fn expand_macro_recur(
) -> Option<SyntaxNode> {
let analyzer = hir::SourceAnalyzer::new(db, source, None);
let expansion = analyzer.expand(db, &macro_call)?;
let expanded: SyntaxNode = db.parse_or_expand(expansion.file_id())?;
let new_source = expansion.source(db);
let expanded: SyntaxNode = db.parse_or_expand(new_source.file_id)?;
let children = expanded.descendants().filter_map(ast::MacroCall::cast);
let mut replaces = FxHashMap::default();
for child in children.into_iter() {
let source = hir::Source::new(expansion.file_id(), source.ast);
let source = new_source.with_ast(source.ast);
let new_node = expand_macro_recur(db, source, &child)?;
replaces.insert(child.syntax().clone().into(), new_node.into());