Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Traverse parent DefMap for super paths

Browse source
This commit is contained in:
Jonas Schievink 2021-01-25 19:15:39 +01:00
parent 98a88ebb9e
commit 08253d5473
2 changed files with 54 additions and 9 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

@ -10,8 +10,6 @@
//!
//! `ReachedFixedPoint` signals about this.
use std::iter::successors;
use base_db::Edition;
use hir_expand::name;
use hir_expand::name::Name;
@ -193,14 +191,35 @@ impl DefMap {
self.resolve_name_in_module(db, original_module, &segment, prefer_module)
}
PathKind::Super(lvl) => {
let m = successors(Some(original_module), |m| self.modules[*m].parent)
.nth(lvl as usize);
if let Some(local_id) = m {
PerNs::types(self.module_id(local_id).into(), Visibility::Public)
} else {
log::debug!("super path in root module");
return ResolvePathResult::empty(ReachedFixedPoint::Yes);
let mut module = original_module;
for i in 0..lvl {
match self.modules[module].parent {
Some(it) => module = it,
None => match &self.block {
Some(block) => {
// Look up remaining path in parent `DefMap`
let new_path = ModPath {
kind: PathKind::Super(lvl - i),
segments: path.segments.clone(),
};
log::debug!("`super` path: {} -> {} in parent map", path, new_path);
return block.parent.resolve_path_fp_with_macro(
db,
mode,
block.parent_module,
&new_path,
shadow,
);
}
None => {
log::debug!("super path in root module");
return ResolvePathResult::empty(ReachedFixedPoint::Yes);
}
},
}
}
PerNs::types(self.module_id(module).into(), Visibility::Public)
}
PathKind::Abs => {
// 2018-style absolute path -- only extern prelude

26
crates/hir_def/src/nameres/tests/block.rs
View file

@ -95,3 +95,29 @@ fn outer() {
"#]],
);
}
#[test]
fn super_imports() {
check_at(
r#"
mod module {
fn f() {
use super::Struct;
$0
}
}
struct Struct {}
"#,
expect![[r#"
block scope
Struct: t
crate
Struct: t
module: t
crate::module
f: v
"#]],
);
}