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

use extern prelude in Resolver

Browse source 
This fixes two bugs:

- completion for paths works again
- we handle extern prelude shadowing more correctly
This commit is contained in:
Aleksey Kladov 2019-02-11 15:39:26 +03:00
parent 2babbbb978
commit 58ed8ee665
5 changed files with 81 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_hir/src/resolve.rs
View file

@ -149,10 +149,7 @@ impl Scope {
if let Some(KnownName::SelfParam) = name.as_known_name() {
PerNs::types(Resolution::Def(m.module.into()))
} else {
match m.item_map[m.module.module_id].get(name) {
Some(res) => res.def.map(Resolution::Def),
None => PerNs::none(),
}
m.item_map.resolve_name_in_module(m.module, name).map(Resolution::Def)
}
}
Scope::GenericParams(gp) => match gp.find_by_name(name) {
@ -177,7 +174,7 @@ impl Scope {
}
}
fn collect_names(&self, f: &mut FnMut(Name, PerNs<Resolution>)) {
fn collect_names(&self, f: &mut dyn FnMut(Name, PerNs<Resolution>)) {
match self {
Scope::ModuleScope(m) => {
// TODO: should we provide `self` here?