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

Some cleanup and additional tests

Browse source
This commit is contained in:
Florian Diebold 2019-02-01 23:06:57 +01:00
parent d571d26955
commit c5852f422f
7 changed files with 138 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ pub(crate) enum Scope {
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum Resolution {
// FIXME make these tuple variants
/// An item
Def(ModuleDef),
/// A local binding (only value namespace)
@ -85,7 +84,7 @@ impl Resolver {
pub fn all_names(&self) -> FxHashMap<Name, PerNs<Resolution>> {
let mut names = FxHashMap::default();
for scope in &self.scopes {
for scope in self.scopes.iter().rev() {
scope.collect_names(&mut |name, res| {
let current: &mut PerNs<Resolution> = names.entry(name).or_default();
if current.types.is_none() {