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

Handle visibility for path completion (not in all cases yet)

Browse source
This commit is contained in:
Florian Diebold 2020-03-08 10:51:40 +01:00
parent 734e68da4c
commit d9c77c5453
2 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_hir/src/code_model.rs
View file

@ -204,10 +204,20 @@ impl Module {
}
/// Returns a `ModuleScope`: a set of items, visible in this module.
pub fn scope(self, db: &impl HirDatabase) -> Vec<(Name, ScopeDef)> {
pub fn scope(self, db: &impl HirDatabase, visible_from: Option<Module>) -> Vec<(Name, ScopeDef)> {
db.crate_def_map(self.id.krate)[self.id.local_id]
.scope
.entries()
.filter_map(|(name, def)| if let Some(m) = visible_from {
let filtered = def.filter_visibility(|vis| vis.is_visible_from(db, m.id));
if filtered.is_none() && !def.is_none() {
None
} else {
Some((name, filtered))
}
} else {
Some((name, def))
})
.map(|(name, def)| (name.clone(), def.into()))
.collect()
}