user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added resolve submodules with raw name

Browse source 
#1211
This commit is contained in:
Alexander Andreev 2019-07-03 17:37:56 +03:00
parent f15f0d1ec0
commit 018bf3d7b1
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ra_hir/src/nameres/collector.rs
View file

@ -643,6 +643,7 @@ fn resolve_submodule(
let mod_name = path.file_stem().unwrap_or("unknown");
let is_dir_owner = is_root || mod_name == "mod";
let name = resolve_mod_name(name.to_string());
let file_mod = dir_path.join(format!("{}.rs", name));
let dir_mod = dir_path.join(format!("{}/mod.rs", name));
let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name));
@ -662,6 +663,14 @@ fn resolve_submodule(
}
}
fn resolve_mod_name(name: String) -> String {
if name.starts_with("r#") {
name.replace("r#", "")
} else {
name
}
}
#[cfg(test)]
mod tests {
use ra_db::SourceDatabase;