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

fix #668

Browse Source
This commit is contained in:
Erlend Tobiassen 2019-01-26 13:12:55 +01:00
parent 683e5e64f4
commit c5e6db16b1
No known key found for this signature in database
GPG Key ID: B48B8536A8F585B2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_hir/src/module_tree.rs
View File

@ -172,6 +172,7 @@ impl ModuleTree {
file_id: HirFileId,
decl_id: Option<SourceFileItemId>,
) -> ModuleId {
let is_root = parent.is_none();
let id = self.alloc_mod(ModuleData {
file_id,
decl_id,
@ -295,6 +296,7 @@ fn resolve_submodule(
db: &impl HirDatabase,
file_id: HirFileId,
name: &Name,
is_root: bool,
) -> (Vec<FileId>, Option<Problem>) {
// FIXME: handle submodules of inline modules properly
let file_id = file_id.original_file(db);
@ -303,7 +305,7 @@ fn resolve_submodule(
let root = RelativePathBuf::default();
let dir_path = path.parent().unwrap_or(&root);
let mod_name = path.file_stem().unwrap_or("unknown");
let is_dir_owner = mod_name == "mod" || mod_name == "lib" || mod_name == "main";
let is_dir_owner = is_root || mod_name == "mod";
let file_mod = dir_path.join(format!("{}.rs", name));
let dir_mod = dir_path.join(format!("{}/mod.rs", name));