From da74c66947ec847f2ca8e99d96cc7e36fd494c75 Mon Sep 17 00:00:00 2001 From: Lukas Tobias Wirth Date: Sun, 23 May 2021 19:33:28 +0200 Subject: Correctly resolve crate name in use paths when import shadows itself --- crates/hir/src/source_analyzer.rs | 11 ++++++++++- crates/ide/src/hover.rs | 20 ++++++++++++++++++++ crates/ide_assists/src/lib.rs | 3 +-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs index b5c65808e..20753314d 100644 --- a/crates/hir/src/source_analyzer.rs +++ b/crates/hir/src/source_analyzer.rs @@ -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) } diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index 9de653739..04598cd06 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -3957,4 +3957,24 @@ mod string { "#]], ) } + + #[test] + fn function_doesnt_shadow_crate_in_use_tree() { + check( + r#" +//- /main.rs crate:main deps:foo +use foo$0::{foo}; + +//- /foo.rs crate:foo +pub fn foo() {} +"#, + expect![[r#" + *foo* + + ```rust + extern crate foo + ``` + "#]], + ) + } } diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs index 05644b6ff..4cd82f8c1 100644 --- a/crates/ide_assists/src/lib.rs +++ b/crates/ide_assists/src/lib.rs @@ -20,8 +20,7 @@ pub mod path_transform; use std::str::FromStr; use hir::Semantics; -use ide_db::base_db::FileRange; -use ide_db::{label::Label, source_change::SourceChange, RootDatabase}; +use ide_db::{base_db::FileRange, label::Label, source_change::SourceChange, RootDatabase}; use syntax::TextRange; pub(crate) use crate::assist_context::{AssistContext, Assists}; -- cgit v1.2.3