Skip to content

adt: correctly inherit field visibility from enum #6189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2020
Merged

adt: correctly inherit field visibility from enum #6189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions crates/assists/src/handlers/fix_visibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,23 +324,21 @@ pub struct Foo { pub bar: () }

#[test]
fn fix_visibility_of_enum_variant_field() {
check_assist(
// Enum variants, as well as their fields, always get the enum's visibility. In fact, rustc
// rejects any visibility specifiers on them, so this assist should never fire on them.
check_assist_not_applicable(
fix_visibility,
r"mod foo { pub enum Foo { Bar { bar: () } } }
fn main() { foo::Foo::Bar { <|>bar: () }; } ",
r"mod foo { pub enum Foo { Bar { $0pub(crate) bar: () } } }
fn main() { foo::Foo::Bar { bar: () }; } ",
);
check_assist(
check_assist_not_applicable(
Copy link
Contributor Author

@jonas-schievink jonas-schievink Oct 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was wrong, the code that was inserted by the assist does not compile

fix_visibility,
r"
//- /lib.rs
mod foo;
fn main() { foo::Foo::Bar { <|>bar: () }; }
//- /foo.rs
pub enum Foo { Bar { bar: () } }
",
r"pub enum Foo { Bar { $0pub(crate) bar: () } }
",
);
check_assist_not_applicable(
Expand Down
28 changes: 19 additions & 9 deletions crates/hir_def/src/adt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use tt::{Delimiter, DelimiterKind, Leaf, Subtree, TokenTree};
use crate::{
body::{CfgExpander, LowerCtx},
db::DefDatabase,
item_tree::{AttrOwner, Field, Fields, ItemTree, ModItem},
item_tree::{AttrOwner, Field, Fields, ItemTree, ModItem, RawVisibilityId},
src::HasChildSource,
src::HasSource,
trace::Trace,
Expand Down Expand Up @@ -91,7 +91,7 @@ impl StructData {
let cfg_options = db.crate_graph()[loc.container.module(db).krate].cfg_options.clone();

let strukt = &item_tree[loc.id.value];
let variant_data = lower_fields(&item_tree, &cfg_options, &strukt.fields);
let variant_data = lower_fields(&item_tree, &cfg_options, &strukt.fields, None);
Arc::new(StructData {
name: strukt.name.clone(),
variant_data: Arc::new(variant_data),
Expand All @@ -105,7 +105,7 @@ impl StructData {
let cfg_options = db.crate_graph()[loc.container.module(db).krate].cfg_options.clone();

let union = &item_tree[loc.id.value];
let variant_data = lower_fields(&item_tree, &cfg_options, &union.fields);
let variant_data = lower_fields(&item_tree, &cfg_options, &union.fields, None);

Arc::new(StructData {
name: union.name.clone(),
Expand All @@ -126,7 +126,8 @@ impl EnumData {
for var_id in enum_.variants.clone() {
if item_tree.attrs(var_id.into()).is_cfg_enabled(&cfg_options) {
let var = &item_tree[var_id];
let var_data = lower_fields(&item_tree, &cfg_options, &var.fields);
let var_data =
lower_fields(&item_tree, &cfg_options, &var.fields, Some(enum_.visibility));

variants.alloc(EnumVariantData {
name: var.name.clone(),
Expand Down Expand Up @@ -296,13 +297,18 @@ fn lower_struct(
}
}

fn lower_fields(item_tree: &ItemTree, cfg_options: &CfgOptions, fields: &Fields) -> VariantData {
fn lower_fields(
item_tree: &ItemTree,
cfg_options: &CfgOptions,
fields: &Fields,
override_visibility: Option<RawVisibilityId>,
) -> VariantData {
match fields {
Fields::Record(flds) => {
let mut arena = Arena::new();
for field_id in flds.clone() {
if item_tree.attrs(field_id.into()).is_cfg_enabled(cfg_options) {
arena.alloc(lower_field(item_tree, &item_tree[field_id]));
arena.alloc(lower_field(item_tree, &item_tree[field_id], override_visibility));
}
}
VariantData::Record(arena)
Expand All @@ -311,7 +317,7 @@ fn lower_fields(item_tree: &ItemTree, cfg_options: &CfgOptions, fields: &Fields)
let mut arena = Arena::new();
for field_id in flds.clone() {
if item_tree.attrs(field_id.into()).is_cfg_enabled(cfg_options) {
arena.alloc(lower_field(item_tree, &item_tree[field_id]));
arena.alloc(lower_field(item_tree, &item_tree[field_id], override_visibility));
}
}
VariantData::Tuple(arena)
Expand All @@ -320,10 +326,14 @@ fn lower_fields(item_tree: &ItemTree, cfg_options: &CfgOptions, fields: &Fields)
}
}

fn lower_field(item_tree: &ItemTree, field: &Field) -> FieldData {
fn lower_field(
item_tree: &ItemTree,
field: &Field,
override_visibility: Option<RawVisibilityId>,
) -> FieldData {
FieldData {
name: field.name.clone(),
type_ref: field.type_ref.clone(),
visibility: item_tree[field.visibility].clone(),
visibility: item_tree[override_visibility.unwrap_or(field.visibility)].clone(),
}
}
24 changes: 24 additions & 0 deletions crates/ide/src/references.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,30 @@ fn f(e: En) {
);
}

#[test]
fn test_find_all_refs_enum_var_privacy() {
check(
r#"
mod m {
pub enum En {
Variant {
field<|>: u8,
}
}
}

fn f() -> m::En {
m::En::Variant { field: 0 }
}
"#,
expect![[r#"
field RECORD_FIELD FileId(0) 56..65 56..61 Other

FileId(0) 125..130 Other Read
"#]],
);
}

fn check(ra_fixture: &str, expect: Expect) {
check_with_scope(ra_fixture, None, expect)
}
Expand Down