user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deduplicate macro completions from legacy macros and prelude

Browse source
This commit is contained in:
AdnoC 2020-12-31 13:41:49 -07:00
parent ddbf484acf
commit 435c189c80
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/hir_def/src/per_ns.rs
View file

@ -7,7 +7,7 @@ use hir_expand::MacroDefId;
use crate::{item_scope::ItemInNs, visibility::Visibility, ModuleDefId};
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub struct PerNs {
pub types: Option<(ModuleDefId, Visibility)>,
pub values: Option<(ModuleDefId, Visibility)>,

9
crates/hir_def/src/resolver.rs
View file

@ -483,6 +483,7 @@ pub enum ScopeDef {
impl Scope {
fn process_names(&self, db: &dyn DefDatabase, f: &mut dyn FnMut(Name, ScopeDef)) {
let mut seen = FxHashSet::default();
match self {
Scope::ModuleScope(m) => {
// FIXME: should we provide `self` here?
@ -496,7 +497,9 @@ impl Scope {
f(name.clone(), ScopeDef::PerNs(def));
});
m.crate_def_map[m.module_id].scope.legacy_macros().for_each(|(name, macro_)| {
f(name.clone(), ScopeDef::PerNs(PerNs::macros(macro_, Visibility::Public)));
let scope = PerNs::macros(macro_, Visibility::Public);
seen.insert((name.clone(), scope));
f(name.clone(), ScopeDef::PerNs(scope));
});
m.crate_def_map.extern_prelude.iter().for_each(|(name, &def)| {
f(name.clone(), ScopeDef::PerNs(PerNs::types(def, Visibility::Public)));
@ -507,7 +510,9 @@ impl Scope {
if let Some(prelude) = m.crate_def_map.prelude {
let prelude_def_map = db.crate_def_map(prelude.krate);
prelude_def_map[prelude.local_id].scope.entries().for_each(|(name, def)| {
f(name.clone(), ScopeDef::PerNs(def));
if !seen.contains(&(name.clone(), def)) {
f(name.clone(), ScopeDef::PerNs(def));
}
});
}
}

2
crates/hir_def/src/visibility.rs
View file

@ -85,7 +85,7 @@ impl RawVisibility {
}
/// Visibility of an item, with the path resolved.
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub enum Visibility {
/// Visibility is restricted to a certain module.
Module(ModuleId),