language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make enum variant fields public

Browse source
This commit is contained in:
Florian Diebold 2019-12-24 22:10:44 +01:00
parent 9e9c4be48a
commit 8aeaf93b9a
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ra_hir_def/src/visibility.rs
View file

@ -38,12 +38,19 @@ impl Visibility {
} }
VisibilityDefId::StructFieldId(it) => { VisibilityDefId::StructFieldId(it) => {
let src = it.parent.child_source(db); let src = it.parent.child_source(db);
// TODO: enum variant fields should be public by default let is_enum = match it.parent {
crate::VariantId::EnumVariantId(_) => true,
_ => false,
};
let vis_node = src.map(|m| match &m[it.local_id] { let vis_node = src.map(|m| match &m[it.local_id] {
Either::Left(tuple) => tuple.visibility(), Either::Left(tuple) => tuple.visibility(),
Either::Right(record) => record.visibility(), Either::Right(record) => record.visibility(),
}); });
Visibility::from_ast(db, vis_node) if vis_node.value.is_none() && is_enum {
Visibility::Public
} else {
Visibility::from_ast(db, vis_node)
}
} }
VisibilityDefId::AdtId(it) => match it { VisibilityDefId::AdtId(it) => match it {
AdtId::StructId(it) => visibility_from_loc(it.lookup(db), db), AdtId::StructId(it) => visibility_from_loc(it.lookup(db), db),