language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Auto merge of #17462 - Veykril:sema-attr-macro-res, r=Veykril

Browse source 
fix: Fix IDE features breaking in some attr macros

Fixes https://github.com/rust-lang/rust-analyzer/issues/17453, Fixes https://github.com/rust-lang/rust-analyzer/issues/17458
This commit is contained in:
bors 2024-06-20 09:11:44 +00:00
commit e08f7953f4
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir/src/semantics.rs
View file

@ -772,7 +772,7 @@ impl<'db> SemanticsImpl<'db> {
let exp_info = macro_file.expansion_info(self.db.upcast());
let InMacroFile { file_id, value } = exp_info.expanded();
if let InFile { file_id, value: Some(value) } = exp_info.call_node() {
if let InFile { file_id, value: Some(value) } = exp_info.arg() {
self.cache(value.ancestors().last().unwrap(), file_id);
}
self.cache(value, file_id.into());
@ -786,7 +786,7 @@ impl<'db> SemanticsImpl<'db> {
// FIXME: uncached parse
// Create the source analyzer for the macro call scope
let Some(sa) = expansion_info
.call_node()
.arg()
.value
.and_then(|it| self.analyze_no_infer(&it.ancestors().last().unwrap()))
else {
@ -1145,7 +1145,7 @@ impl<'db> SemanticsImpl<'db> {
.expansion_info_cache
.entry(macro_file)
.or_insert_with(|| macro_file.expansion_info(self.db.upcast()));
expansion_info.call_node().transpose()
expansion_info.arg().map(|node| node?.parent()).transpose()
})
}
}