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 bugs

Browse source
This commit is contained in:
Edwin Cheng 2019-04-20 23:05:25 +08:00
parent 0d39b1c3fa
commit 9e35bf91b8
5 changed files with 153 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_hir/src/ids.rs
View file

@ -63,8 +63,15 @@ impl HirFileId {
match file_id.0 {
HirFileIdRepr::File(file_id) => db.parse(file_id),
HirFileIdRepr::Macro(macro_call_id) => {
// returning an empty string looks fishy...
parse_macro(db, macro_call_id).unwrap_or_else(|| SourceFile::parse(""))
parse_macro(db, macro_call_id).unwrap_or_else(|| {
// 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: {}", macro_call_id.debug_dump(db));
// returning an empty string looks fishy...
SourceFile::parse("")
})
}
}
}
@ -299,3 +306,16 @@ impl AstItemDef<ast::TypeAliasDef> for TypeAliasId {
db.lookup_intern_type_alias(self)
}
}
impl MacroCallId {
pub fn debug_dump(&self, db: &impl DefDatabase) -> String {
let loc = self.clone().loc(db);
let node = loc.ast_id.to_node(db);
let syntax_str = node.syntax().to_string();
// dump the file name
let file_id: HirFileId = self.clone().into();
let original = file_id.original_file(db);
format!("macro call [file: {:#?}] : {}", db.file_relative_path(original), syntax_str)
}
}