aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/hir/src/source_analyzer.rs11
-rw-r--r--crates/ide/src/hover.rs20
-rw-r--r--crates/ide_assists/src/lib.rs3
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 {
286 let ctx = body::LowerCtx::with_hygiene(db.upcast(), &hygiene); 286 let ctx = body::LowerCtx::with_hygiene(db.upcast(), &hygiene);
287 let hir_path = Path::from_src(path.clone(), &ctx)?; 287 let hir_path = Path::from_src(path.clone(), &ctx)?;
288 288
289 // Case where path is a qualifier of another path, e.g. foo::bar::Baz where we 289 // Case where path is a qualifier of another path, e.g. foo::bar::Baz where we are
290 // trying to resolve foo::bar. 290 // trying to resolve foo::bar.
291 if let Some(outer_path) = parent().and_then(ast::Path::cast) { 291 if let Some(outer_path) = parent().and_then(ast::Path::cast) {
292 if let Some(qualifier) = outer_path.qualifier() { 292 if let Some(qualifier) = outer_path.qualifier() {
@@ -295,6 +295,15 @@ impl SourceAnalyzer {
295 } 295 }
296 } 296 }
297 } 297 }
298 // Case where path is a qualifier of a use tree, e.g. foo::bar::{Baz, Qux} where we are
299 // trying to resolve foo::bar.
300 if let Some(use_tree) = parent().and_then(ast::UseTree::cast) {
301 if let Some(qualifier) = use_tree.path() {
302 if path == &qualifier && use_tree.coloncolon_token().is_some() {
303 return resolve_hir_path_qualifier(db, &self.resolver, &hir_path);
304 }
305 }
306 }
298 307
299 resolve_hir_path_(db, &self.resolver, &hir_path, prefer_value_ns) 308 resolve_hir_path_(db, &self.resolver, &hir_path, prefer_value_ns)
300 } 309 }
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 {
3957 "#]], 3957 "#]],
3958 ) 3958 )
3959 } 3959 }
3960
3961 #[test]
3962 fn function_doesnt_shadow_crate_in_use_tree() {
3963 check(
3964 r#"
3965//- /main.rs crate:main deps:foo
3966use foo$0::{foo};
3967
3968//- /foo.rs crate:foo
3969pub fn foo() {}
3970"#,
3971 expect![[r#"
3972 *foo*
3973
3974 ```rust
3975 extern crate foo
3976 ```
3977 "#]],
3978 )
3979 }
3960} 3980}
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;
20use std::str::FromStr; 20use std::str::FromStr;
21 21
22use hir::Semantics; 22use hir::Semantics;
23use ide_db::base_db::FileRange; 23use ide_db::{base_db::FileRange, label::Label, source_change::SourceChange, RootDatabase};
24use ide_db::{label::Label, source_change::SourceChange, RootDatabase};
25use syntax::TextRange; 24use syntax::TextRange;
26 25
27pub(crate) use crate::assist_context::{AssistContext, Assists}; 26pub(crate) use crate::assist_context::{AssistContext, Assists};