Skip to content

Commit ded412d

Browse files
xuhongxu96xuhongxu96
committed
implement inherited_visibility in collector
1 parent 3f60e71 commit ded412d

File tree

6 files changed

+156
-88
lines changed

6 files changed

+156
-88
lines changed

‎crates/hir-def/src/data.rs‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use crate::{
1515
type_ref::{TraitRef, TypeBound, TypeRef},
1616
visibility::RawVisibility,
1717
AssocItemId, AstIdWithPath, ConstId, ConstLoc, FunctionId, FunctionLoc, HasModule, ImplId,
18-
Intern, ItemContainerId, Lookup, Macro2Id, MacroRulesId, ModuleId, ProcMacroId, StaticId,
19-
TraitId, TypeAliasId, TypeAliasLoc,
18+
InheritedVisibilityLoc, Intern, ItemContainerId, Lookup, Macro2Id, MacroRulesId, ModuleId,
19+
ProcMacroId, StaticId, TraitId, TypeAliasId, TypeAliasLoc,
2020
};
2121

2222
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -41,6 +41,12 @@ impl FunctionData {
4141
let item_tree = loc.id.item_tree(db);
4242
let func = &item_tree[loc.id.value];
4343

44+
let visibility = if let Some(inherited_vis) = loc.inherited_visibility {
45+
inherited_vis.tree_id.item_tree(db)[inherited_vis.raw_visibility_id].clone()
46+
} else {
47+
item_tree[func.visibility].clone()
48+
};
49+
4450
let enabled_params = func
4551
.params
4652
.clone()
@@ -93,7 +99,7 @@ impl FunctionData {
9399
ret_type: func.ret_type.clone(),
94100
async_ret_type: func.async_ret_type.clone(),
95101
attrs: item_tree.attrs(db, krate, ModItem::from(loc.id.value).into()),
96-
visibility: item_tree[func.visibility].clone(),
102+
visibility,
97103
abi: func.abi.clone(),
98104
legacy_const_generics_indices,
99105
flags,
@@ -171,11 +177,16 @@ impl TypeAliasData {
171177
let loc = typ.lookup(db);
172178
let item_tree = loc.id.item_tree(db);
173179
let typ = &item_tree[loc.id.value];
180+
let visibility = if let Some(inherited_vis) = loc.inherited_visibility {
181+
inherited_vis.tree_id.item_tree(db)[inherited_vis.raw_visibility_id].clone()
182+
} else {
183+
item_tree[typ.visibility].clone()
184+
};
174185

175186
Arc::new(TypeAliasData {
176187
name: typ.name.clone(),
177188
type_ref: typ.type_ref.clone(),
178-
visibility: item_tree[typ.visibility].clone(),
189+
visibility,
179190
is_extern: matches!(loc.container, ItemContainerId::ExternBlockId(_)),
180191
bounds: typ.bounds.to_vec(),
181192
})
@@ -221,6 +232,7 @@ impl TraitData {
221232
module_id,
222233
tr_loc.id.file_id(),
223234
ItemContainerId::TraitId(tr),
235+
Some(InheritedVisibilityLoc::new(tr_def.visibility, tr_loc.id.tree_id())),
224236
);
225237
collector.collect(tr_loc.id.tree_id(), &tr_def.items);
226238

@@ -288,6 +300,7 @@ impl ImplData {
288300
module_id,
289301
impl_loc.id.file_id(),
290302
ItemContainerId::ImplId(id),
303+
None,
291304
);
292305
collector.collect(impl_loc.id.tree_id(), &impl_def.items);
293306

@@ -385,11 +398,16 @@ impl ConstData {
385398
let loc = konst.lookup(db);
386399
let item_tree = loc.id.item_tree(db);
387400
let konst = &item_tree[loc.id.value];
401+
let visibility = if let Some(inherited_vis) = loc.inherited_visibility {
402+
inherited_vis.tree_id.item_tree(db)[inherited_vis.raw_visibility_id].clone()
403+
} else {
404+
item_tree[konst.visibility].clone()
405+
};
388406

389407
Arc::new(ConstData {
390408
name: konst.name.clone(),
391409
type_ref: konst.type_ref.clone(),
392-
visibility: item_tree[konst.visibility].clone(),
410+
visibility,
393411
})
394412
}
395413
}
@@ -428,6 +446,8 @@ struct AssocItemCollector<'a> {
428446

429447
items: Vec<(Name, AssocItemId)>,
430448
attr_calls: Vec<(AstId<ast::Item>, MacroCallId)>,
449+
450+
inherited_visibility: Option<InheritedVisibilityLoc>,
431451
}
432452

433453
impl<'a> AssocItemCollector<'a> {
@@ -436,6 +456,7 @@ impl<'a> AssocItemCollector<'a> {
436456
module_id: ModuleId,
437457
file_id: HirFileId,
438458
container: ItemContainerId,
459+
inherited_visibility: Option<InheritedVisibilityLoc>,
439460
) -> Self {
440461
Self {
441462
db,
@@ -446,6 +467,8 @@ impl<'a> AssocItemCollector<'a> {
446467

447468
items: Vec::new(),
448469
attr_calls: Vec::new(),
470+
471+
inherited_visibility,
449472
}
450473
}
451474

@@ -488,9 +511,12 @@ impl<'a> AssocItemCollector<'a> {
488511
match item {
489512
AssocItem::Function(id) => {
490513
let item = &item_tree[id];
491-
let def =
492-
FunctionLoc { container: self.container, id: ItemTreeId::new(tree_id, id) }
493-
.intern(self.db);
514+
let def = FunctionLoc {
515+
container: self.container,
516+
id: ItemTreeId::new(tree_id, id),
517+
inherited_visibility: self.inherited_visibility,
518+
}
519+
.intern(self.db);
494520
self.items.push((item.name.clone(), def.into()));
495521
}
496522
AssocItem::Const(id) => {
@@ -499,16 +525,20 @@ impl<'a> AssocItemCollector<'a> {
499525
Some(name) => name,
500526
None => continue,
501527
};
502-
let def =
503-
ConstLoc { container: self.container, id: ItemTreeId::new(tree_id, id) }
504-
.intern(self.db);
528+
let def = ConstLoc {
529+
container: self.container,
530+
id: ItemTreeId::new(tree_id, id),
531+
inherited_visibility: self.inherited_visibility,
532+
}
533+
.intern(self.db);
505534
self.items.push((name, def.into()));
506535
}
507536
AssocItem::TypeAlias(id) => {
508537
let item = &item_tree[id];
509538
let def = TypeAliasLoc {
510539
container: self.container,
511540
id: ItemTreeId::new(tree_id, id),
541+
inherited_visibility: self.inherited_visibility,
512542
}
513543
.intern(self.db);
514544
self.items.push((item.name.clone(), def.into()));

‎crates/hir-def/src/item_tree/lower.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! AST -> `ItemTree` lowering code.
22
3-
use std::{collections::hash_map::Entry, mem, sync::Arc};
3+
use std::{collections::hash_map::Entry, sync::Arc};
44

55
use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, HirFileId};
66
use syntax::ast::{self, HasModuleItem};

‎crates/hir-def/src/item_tree/tests.rs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -359,39 +359,39 @@ trait Tr<'a, T: 'a>: Super where Self: for<'a> Tr<'a, T> {}
359359
)
360360
}
361361

362-
#[test]
363-
fn inherit_visibility() {
364-
check(
365-
r#"
366-
pub(crate) enum En {
367-
Var1(u8),
368-
Var2 {
369-
fld: u8,
370-
},
371-
}
372-
373-
pub(crate) trait Tr {
374-
fn f();
375-
fn method(&self) {}
376-
}
377-
"#,
378-
expect![[r#"
379-
pub(crate) enum En {
380-
Var1(
381-
pub(crate) 0: u8,
382-
),
383-
Var2 {
384-
pub(crate) fld: u8,
385-
},
386-
}
387-
388-
pub(crate) trait Tr<Self> {
389-
pub(crate) fn f() -> ();
390-
391-
pub(crate) fn method(
392-
_: &Self, // self
393-
) -> () { ... }
394-
}
395-
"#]],
396-
)
397-
}
362+
// #[test]
363+
// fn inherit_visibility() {
364+
// check(
365+
// r#"
366+
// pub(crate) enum En {
367+
// Var1(u8),
368+
// Var2 {
369+
// fld: u8,
370+
// },
371+
// }
372+
373+
// pub(crate) trait Tr {
374+
// fn f();
375+
// fn method(&self) {}
376+
// }
377+
// "#,
378+
// expect![[r#"
379+
// pub(crate) enum En {
380+
// Var1(
381+
// pub(crate) 0: u8,
382+
// ),
383+
// Var2 {
384+
// pub(crate) fld: u8,
385+
// },
386+
// }
387+
388+
// pub(crate) trait Tr<Self> {
389+
// pub(crate) fn f() -> ();
390+
391+
// pub(crate) fn method(
392+
// _: &Self, // self
393+
// ) -> () { ... }
394+
// }
395+
// "#]],
396+
// )
397+
// }

‎crates/hir-def/src/lib.rs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use hir_expand::{
7070
AstId, ExpandError, ExpandTo, HirFileId, InFile, MacroCallId, MacroCallKind, MacroDefId,
7171
MacroDefKind, UnresolvedMacro,
7272
};
73-
use item_tree::ExternBlock;
73+
use item_tree::{ExternBlock, RawVisibilityId, TreeId};
7474
use la_arena::Idx;
7575
use nameres::DefMap;
7676
use stdx::impl_from;
@@ -156,19 +156,24 @@ impl<N: ItemTreeNode> Hash for ItemLoc<N> {
156156
}
157157
}
158158

159-
#[derive(Debug)]
160-
pub struct AssocItemLoc<N: ItemTreeNode> {
161-
pub container: ItemContainerId,
162-
pub id: ItemTreeId<N>,
159+
#[derive(Debug, Clone, Copy)]
160+
pub struct InheritedVisibilityLoc {
161+
pub raw_visibility_id: RawVisibilityId,
162+
pub tree_id: TreeId,
163163
}
164164

165-
impl<N: ItemTreeNode> Clone for AssocItemLoc<N> {
166-
fn clone(&self) -> Self {
167-
Self { container: self.container, id: self.id }
165+
impl InheritedVisibilityLoc {
166+
pub fn new(visibility_id: RawVisibilityId, tree_id: TreeId) -> Self {
167+
Self { raw_visibility_id: visibility_id, tree_id }
168168
}
169169
}
170170

171-
impl<N: ItemTreeNode> Copy for AssocItemLoc<N> {}
171+
#[derive(Debug, Clone, Copy)]
172+
pub struct AssocItemLoc<N: ItemTreeNode> {
173+
pub container: ItemContainerId,
174+
pub id: ItemTreeId<N>,
175+
pub inherited_visibility: Option<InheritedVisibilityLoc>,
176+
}
172177

173178
impl<N: ItemTreeNode> PartialEq for AssocItemLoc<N> {
174179
fn eq(&self, other: &Self) -> bool {

‎crates/hir-def/src/nameres/collector.rs‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,12 @@ impl ModCollector<'_, '_> {
15491549
}
15501550
ModItem::Function(id) => {
15511551
let it = &self.item_tree[id];
1552-
let fn_id =
1553-
FunctionLoc { container, id: ItemTreeId::new(self.tree_id, id) }.intern(db);
1552+
let fn_id = FunctionLoc {
1553+
container,
1554+
id: ItemTreeId::new(self.tree_id, id),
1555+
inherited_visibility: None,
1556+
}
1557+
.intern(db);
15541558

15551559
let vis = resolve_vis(def_map, &self.item_tree[it.visibility]);
15561560
if self.def_collector.is_proc_macro {
@@ -1613,8 +1617,12 @@ impl ModCollector<'_, '_> {
16131617
}
16141618
ModItem::Const(id) => {
16151619
let it = &self.item_tree[id];
1616-
let const_id =
1617-
ConstLoc { container, id: ItemTreeId::new(self.tree_id, id) }.intern(db);
1620+
let const_id = ConstLoc {
1621+
container,
1622+
id: ItemTreeId::new(self.tree_id, id),
1623+
inherited_visibility: None,
1624+
}
1625+
.intern(db);
16181626

16191627
match &it.name {
16201628
Some(name) => {
@@ -1635,9 +1643,13 @@ impl ModCollector<'_, '_> {
16351643
let vis = resolve_vis(def_map, &self.item_tree[it.visibility]);
16361644
update_def(
16371645
self.def_collector,
1638-
StaticLoc { container, id: ItemTreeId::new(self.tree_id, id) }
1639-
.intern(db)
1640-
.into(),
1646+
StaticLoc {
1647+
container,
1648+
id: ItemTreeId::new(self.tree_id, id),
1649+
inherited_visibility: None,
1650+
}
1651+
.intern(db)
1652+
.into(),
16411653
&it.name,
16421654
vis,
16431655
false,
@@ -1663,9 +1675,13 @@ impl ModCollector<'_, '_> {
16631675
let vis = resolve_vis(def_map, &self.item_tree[it.visibility]);
16641676
update_def(
16651677
self.def_collector,
1666-
TypeAliasLoc { container, id: ItemTreeId::new(self.tree_id, id) }
1667-
.intern(db)
1668-
.into(),
1678+
TypeAliasLoc {
1679+
container,
1680+
id: ItemTreeId::new(self.tree_id, id),
1681+
inherited_visibility: None,
1682+
}
1683+
.intern(db)
1684+
.into(),
16691685
&it.name,
16701686
vis,
16711687
false,

0 commit comments

Comments
 (0)