Skip to content

Commit 486c5c3

Browse files
Exclude special files
1 parent 897a4c7 commit 486c5c3

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

crates/base_db/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,22 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
172172
Some(("mod", Some("rs"))) | Some(("lib", Some("rs"))) => {
173173
module_files.list_files_with_extensions(module_file, None)
174174
}
175+
// TODO kb for `src/bin/foo.rs`, we need to check for modules in `src/bin/`
175176
Some((directory_with_module_name, Some("rs"))) => module_files
176177
.list_files_with_extensions(
177178
module_file,
178179
Some(&format!("../{}/", directory_with_module_name)),
179180
),
181+
// TODO kb also consider the case when there's no `../module_name.rs`, but `../module_name/mod.rs`
180182
_ => Vec::new(),
181183
};
182184

183185
possible_submodule_files
184186
.into_iter()
185187
.filter(|(_, extension)| extension == &Some("rs"))
188+
.filter(|(file_name, _)| file_name != &"mod")
189+
.filter(|(file_name, _)| file_name != &"lib")
190+
.filter(|(file_name, _)| file_name != &"main")
186191
.map(|(file_name, _)| file_name.to_owned())
187192
.collect()
188193
}

crates/ide/src/completion/completion_context.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@ impl<'a> CompletionContext<'a> {
117117
.to_module_def(position.file_id)
118118
.and_then(|current_module| {
119119
let definition_source = current_module.definition_source(db);
120-
if !matches!(definition_source.value, ModuleSource::SourceFile(_)) {
121-
return None;
122-
}
123120
let module_definition_source_file = definition_source.file_id.original_file(db);
124121
let mod_declaration_candidates =
125122
db.possible_sudmobule_names(module_definition_source_file);

0 commit comments

Comments
 (0)