mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #8698

Browse Source 
8698: fix: search only crate-level prelude when looking for an item r=jonas-schievink a=jonas-schievink

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8688

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2021-04-30 16:42:24 +00:00 committed by GitHub
commit 6b2b6c1b57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/hir_def/src/find_path.rs
View File

@ -130,7 +130,8 @@ fn find_path_inner(
}
// - if the item is the crate root of a dependency crate, return the name from the extern prelude
for (name, def_id) in root.def_map(db).extern_prelude() {
let root_def_map = root.def_map(db);
for (name, def_id) in root_def_map.extern_prelude() {
if item == ItemInNs::Types(*def_id) {
let name = scope_name.unwrap_or_else(|| name.clone());
return Some(ModPath::from_segments(PathKind::Plain, vec![name]));
@ -138,7 +139,8 @@ fn find_path_inner(
}
// - if the item is in the prelude, return the name from there
if let Some(prelude_module) = def_map.prelude() {
if let Some(prelude_module) = root_def_map.prelude() {
// Preludes in block DefMaps are ignored, only the crate DefMap is searched
let prelude_def_map = prelude_module.def_map(db);
let prelude_scope: &crate::item_scope::ItemScope =
&prelude_def_map[prelude_module.local_id].scope;
@ -1057,4 +1059,28 @@ fn f() {
"dep",
);
}
#[test]
fn prelude_with_inner_items() {
check_found_path(
r#"
//- /main.rs crate:main deps:std
fn f() {
fn inner() {}
$0
}
//- /std.rs crate:std
pub mod prelude {
pub enum Option { None }
pub use Option::*;
}
#[prelude_import]
pub use prelude::*;
"#,
"None",
"None",
"None",
"None",
);
}
}