squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fall back to parent DefMaps when resolving paths

Browse source
This commit is contained in:
Jonas Schievink 2021-01-21 15:24:15 +01:00
parent 896dfacfc4
commit f8f44cfb9b
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crates/hir_def/src/nameres/path_resolution.rs
View file

@ -103,6 +103,43 @@ impl DefMap {
original_module: LocalModuleId,
path: &ModPath,
shadow: BuiltinShadowMode,
) -> ResolvePathResult {
let mut result = ResolvePathResult::empty(ReachedFixedPoint::No);
result.segment_index = Some(usize::max_value());
let mut current_map = self;
loop {
let new = current_map.resolve_path_fp_with_macro_single(
db,
mode,
original_module,
path,
shadow,
);
// Merge `new` into `result`.
result.resolved_def = result.resolved_def.or(new.resolved_def);
if result.reached_fixedpoint == ReachedFixedPoint::No {
result.reached_fixedpoint = new.reached_fixedpoint;
}
// FIXME: this doesn't seem right; what if the different namespace resolutions come from different crates?
result.krate = result.krate.or(new.krate);
result.segment_index = result.segment_index.min(new.segment_index);
match &current_map.parent {
Some(map) => current_map = map,
None => return result,
}
}
}
pub(super) fn resolve_path_fp_with_macro_single(
&self,
db: &dyn DefDatabase,
mode: ResolveMode,
original_module: LocalModuleId,
path: &ModPath,
shadow: BuiltinShadowMode,
) -> ResolvePathResult {
let mut segments = path.segments.iter().enumerate();
let mut curr_per_ns: PerNs = match path.kind {