File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
crates/ra_hir/src/nameres Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -643,6 +643,7 @@ fn resolve_submodule(
643
643
let mod_name = path. file_stem ( ) . unwrap_or ( "unknown" ) ;
644
644
let is_dir_owner = is_root || mod_name == "mod" ;
645
645
646
+ let name = resolve_mod_name ( name. to_string ( ) ) ;
646
647
let file_mod = dir_path. join ( format ! ( "{}.rs" , name) ) ;
647
648
let dir_mod = dir_path. join ( format ! ( "{}/mod.rs" , name) ) ;
648
649
let file_dir_mod = dir_path. join ( format ! ( "{}/{}.rs" , mod_name, name) ) ;
@@ -662,6 +663,14 @@ fn resolve_submodule(
662
663
}
663
664
}
664
665
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
+
665
674
#[ cfg( test) ]
666
675
mod tests {
667
676
use ra_db:: SourceDatabase ;
You can’t perform that action at this time.
0 commit comments