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

fix: unescape all occurrences of module name in module resolution

Browse Source
This commit is contained in:
Ryo Yoshida 2022-08-31 03:43:28 +09:00
parent f02cd0a41d
commit 662ab0cd8e
No known key found for this signature in database
GPG Key ID: E25698A930586171
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/hir-def/src/nameres/mod_resolution.rs
View File

@ -65,6 +65,7 @@ pub(super) fn resolve_declaration(
name: &Name,
attr_path: Option<&SmolStr>,
) -> Result<(FileId, bool, ModDir), Box<[String]>> {
let name = name.unescaped();
let orig_file_id = file_id.original_file(db.upcast());
let mut candidate_files = ArrayVec::<_, 2>::new();
@ -73,12 +74,10 @@ pub(super) fn resolve_declaration(
candidate_files.push(self.dir_path.join_attr(attr_path, self.root_non_dir_owner))
}
None if file_id.is_include_macro(db.upcast()) => {
let name = name.unescaped();
candidate_files.push(format!("{}.rs", name));
candidate_files.push(format!("{}/mod.rs", name));
}
None => {
let name = name.unescaped();
candidate_files.push(format!("{}{}.rs", self.dir_path.0, name));
candidate_files.push(format!("{}{}/mod.rs", self.dir_path.0, name));
}

16
crates/hir-def/src/nameres/tests/mod_resolution.rs
View File

@ -127,7 +127,15 @@ fn module_resolution_works_for_raw_modules() {
use self::r#async::Bar;
//- /async.rs
mod foo;
mod r#async;
pub struct Bar;
//- /async/foo.rs
pub struct Foo;
//- /async/async.rs
pub struct Baz;
"#,
expect![[r#"
crate
@ -136,6 +144,14 @@ fn module_resolution_works_for_raw_modules() {
crate::r#async
Bar: t v
foo: t
r#async: t
crate::r#async::foo
Foo: t v
crate::r#async::r#async
Baz: t v
"#]],
);
}