Merge pull request #19937 from Veykril/push-rvnylnlnxxyr

fix: Record macro calls for fields in `ChildBySource` impls
This commit is contained in:
Lukas Wirth 2025-06-06 05:45:48 +00:00 committed by GitHub
commit 4fd1cdb3e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 10 deletions

View File

@ -191,6 +191,8 @@ impl ChildBySource for VariantId {
Either::Right(source) => res[keys::RECORD_FIELD].insert(AstPtr::new(&source), id), 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); .insert(ast_id_map.get(tree[variant.lookup(db).id.value].ast_id), variant);
}); });
let (_, source_map) = db.enum_signature_with_source_map(*self); let (_, source_map) = db.enum_signature_with_source_map(*self);
source_map.expansions().filter(|(ast, _)| ast.file_id == file_id).for_each( source_map
|(ast, &exp_id)| { .expansions()
res[keys::MACRO_CALL].insert(ast.value, exp_id); .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( source_map
|(ast, &exp_id)| { .expansions()
res[keys::MACRO_CALL].insert(ast.value, exp_id); .filter(|(ast, _)| ast.file_id == file_id)
}, .for_each(|(ast, &exp_id)| res[keys::MACRO_CALL].insert(ast.value, exp_id));
);
} }
} }

View File

@ -844,4 +844,21 @@ impl<const C: foo$0!()> Trait for () {}
Trait"#]], Trait"#]],
); );
} }
#[test]
fn works_in_fields() {
check(
r#"
macro_rules! foo {
() => { u32 };
}
struct S {
field: foo$0!(),
}
"#,
expect![[r#"
foo!
u32"#]],
);
}
} }

View File

@ -439,6 +439,7 @@ assist.emitMustUse = true"#,
} }
#[test] #[test]
#[ignore = "flaky test that tends to hang"]
fn ratoml_inherit_config_from_ws_root() { fn ratoml_inherit_config_from_ws_root() {
if skip_slow_tests() { if skip_slow_tests() {
return; return;