Skip to content

Commit 018bf3d

Browse files
committed
Added resolve submodules with raw name
#1211
1 parent f15f0d1 commit 018bf3d

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

crates/ra_hir/src/nameres/collector.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ fn resolve_submodule(
643643
let mod_name = path.file_stem().unwrap_or("unknown");
644644
let is_dir_owner = is_root || mod_name == "mod";
645645

646+
let name = resolve_mod_name(name.to_string());
646647
let file_mod = dir_path.join(format!("{}.rs", name));
647648
let dir_mod = dir_path.join(format!("{}/mod.rs", name));
648649
let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name));
@@ -662,6 +663,14 @@ fn resolve_submodule(
662663
}
663664
}
664665

666+
fn resolve_mod_name(name: String) -> String {
667+
if name.starts_with("r#") {
668+
name.replace("r#", "")
669+
} else {
670+
name
671+
}
672+
}
673+
665674
#[cfg(test)]
666675
mod tests {
667676
use ra_db::SourceDatabase;

0 commit comments

Comments
 (0)