language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-19 19:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: Record macro calls for fields in ChildBySource impls

Browse source
This commit is contained in:
Lukas Wirth 2025-06-06 06:13:15 +02:00
parent d5665e5ca7
commit 8e217cc68a
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/hir/src/semantics/child_by_source.rs
View file

@ -191,6 +191,8 @@ impl ChildBySource for VariantId {
Either::Right(source) => res[keys::RECORD_FIELD].insert(AstPtr::new(&source), id),
}
}
let (_, sm) = db.variant_fields_with_source_map(*self);
sm.expansions().for_each(|(ast, &exp_id)| res[keys::MACRO_CALL].insert(ast.value, exp_id));
}
}
@ -209,11 +211,10 @@ impl ChildBySource for EnumId {
.insert(ast_id_map.get(tree[variant.lookup(db).id.value].ast_id), variant);
});
let (_, source_map) = db.enum_signature_with_source_map(*self);
source_map.expansions().filter(|(ast, _)| ast.file_id == file_id).for_each(
|(ast, &exp_id)| {
res[keys::MACRO_CALL].insert(ast.value, exp_id);
},
);
source_map
.expansions()
.filter(|(ast, _)| ast.file_id == file_id)
.for_each(|(ast, &exp_id)| res[keys::MACRO_CALL].insert(ast.value, exp_id));
}
}
@ -274,11 +275,10 @@ impl ChildBySource for GenericDefId {
}
}
source_map.expansions().filter(|(ast, _)| ast.file_id == file_id).for_each(
|(ast, &exp_id)| {
res[keys::MACRO_CALL].insert(ast.value, exp_id);
},
);
source_map
.expansions()
.filter(|(ast, _)| ast.file_id == file_id)
.for_each(|(ast, &exp_id)| res[keys::MACRO_CALL].insert(ast.value, exp_id));
}
}