Skip to content

Commit 2c84c2d

Browse files
committed
Don't think that /submod.rs is /mod.rs
1 parent 58b6763 commit 2c84c2d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

crates/assists/src/handlers/extract_module_to_file.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ mod tests;
9191
extract_module_to_file,
9292
r#"
9393
//- /main.rs
94-
mod submodule;
95-
//- /submodule.rs
94+
mod submod;
95+
//- /submod.rs
9696
mod inner<|> {
9797
fn f() {}
9898
}
9999
fn g() {}
100100
"#,
101101
r#"
102-
//- /submodule.rs
102+
//- /submod.rs
103103
mod inner;
104104
fn g() {}
105-
//- /submodule/inner.rs
105+
//- /submod/inner.rs
106106
fn f() {}
107107
"#,
108108
);

crates/hir_def/src/nameres/mod_resolution.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl ModDir {
7979
for candidate in candidate_files.iter() {
8080
let path = AnchoredPath { anchor: file_id, path: candidate.as_str() };
8181
if let Some(file_id) = db.resolve_path(path) {
82-
let is_mod_rs = candidate.ends_with("mod.rs");
82+
let is_mod_rs = candidate.ends_with("/mod.rs");
8383

8484
let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() {
8585
(DirPath::empty(), false)

0 commit comments

Comments
 (0)