language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Enable auto-import and qualify-path in derive attributes

Browse source
This commit is contained in:
Lukas Wirth 2021-10-28 18:40:38 +02:00
parent 3018ffd85e
commit 7fdbdc4ab2
8 changed files with 123 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/hir/src/semantics/source_to_def.rs
View file

@ -299,8 +299,14 @@ impl SourceToDefCtx<'_, '_> {
dyn_map[keys::CONST_PARAM].get(&src).copied()
}
// FIXME: use DynMap as well?
pub(super) fn macro_to_def(&mut self, src: InFile<ast::Macro>) -> Option<MacroDefId> {
let makro = self.dyn_map(src.as_ref()).and_then(|it| it[keys::MACRO].get(&src).copied());
if let res @ Some(_) = makro {
return res;
}
// Not all macros are recorded in the dyn map, only the ones behaving like items, so fall back
// for the non-item like definitions.
let file_ast_id = self.db.ast_id_map(src.file_id).ast_id(&src.value);
let ast_id = AstId::new(src.file_id, file_ast_id.upcast());
let kind = MacroDefKind::Declarative(ast_id);