language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix a bug for single dollar sign macro

Browse source
This commit is contained in:
Edwin Cheng 2020-03-04 01:03:44 +08:00
parent b55d22e060
commit 3dc3d9d18f
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_hir_expand/src/db.rs
View file

@ -86,10 +86,13 @@ pub(crate) fn macro_def(
log::warn!("fail on macro_def to token tree: {:#?}", arg);
None
})?;
let rules = MacroRules::parse(&tt).ok().or_else(|| {
log::warn!("fail on macro_def parse: {:#?}", tt);
None
})?;
let rules = match MacroRules::parse(&tt) {
Ok(it) => it,
Err(err) => {
log::warn!("fail on macro_def parse: error: {:#?} {:#?}", err, tt);
return None;
}
};
Some(Arc::new((TokenExpander::MacroRules(rules), tmap)))
}
MacroDefKind::BuiltIn(expander) => {
@ -150,7 +153,9 @@ pub(crate) fn parse_macro(
// Note:
// The final goal we would like to make all parse_macro success,
// such that the following log will not call anyway.
log::warn!("fail on macro_parse: (reason: {})", err,);
let loc: MacroCallLoc = db.lookup_intern_macro(macro_call_id);
let node = loc.kind.node(db);
log::warn!("fail on macro_parse: (reason: {} macro_call: {:#})", err, node.value);
})
.ok()?;