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

Correctly resolve crate name in use paths when import shadows itself

Browse source
This commit is contained in:
Lukas Tobias Wirth 2021-05-23 19:33:28 +02:00
parent f04daf693a
commit da74c66947
3 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/hir/src/source_analyzer.rs
View file

@ -286,7 +286,7 @@ impl SourceAnalyzer {
let ctx = body::LowerCtx::with_hygiene(db.upcast(), &hygiene);
let hir_path = Path::from_src(path.clone(), &ctx)?;
// Case where path is a qualifier of another path, e.g. foo::bar::Baz where we
// Case where path is a qualifier of another path, e.g. foo::bar::Baz where we are
// trying to resolve foo::bar.
if let Some(outer_path) = parent().and_then(ast::Path::cast) {
if let Some(qualifier) = outer_path.qualifier() {
@ -295,6 +295,15 @@ impl SourceAnalyzer {
}
}
}
// Case where path is a qualifier of a use tree, e.g. foo::bar::{Baz, Qux} where we are
// trying to resolve foo::bar.
if let Some(use_tree) = parent().and_then(ast::UseTree::cast) {
if let Some(qualifier) = use_tree.path() {
if path == &qualifier && use_tree.coloncolon_token().is_some() {
return resolve_hir_path_qualifier(db, &self.resolver, &hir_path);
}
}
}
resolve_hir_path_(db, &self.resolver, &hir_path, prefer_value_ns)
}