diff options
author | Kirill Bulatov <[email protected]> | 2020-09-07 14:17:50 +0100 |
---|---|---|
committer | Kirill Bulatov <[email protected]> | 2020-09-09 23:42:20 +0100 |
commit | 33179a0ae1ba9a908cc34a4cf87599ed779b9886 (patch) | |
tree | 13d5b6f0ad9894305a1268d9e76d66973a9ce122 /crates/base_db | |
parent | b2bcc5278db23c3ba0a4f47a3ef6ee411aaaa8dc (diff) |
Move rust-related logic from vfs to base_db level
Diffstat (limited to 'crates/base_db')
-rw-r--r-- | crates/base_db/src/lib.rs | 70 |
1 files changed, 69 insertions, 1 deletions
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs index 030b96829..9733e1fd3 100644 --- a/crates/base_db/src/lib.rs +++ b/crates/base_db/src/lib.rs | |||
@@ -167,7 +167,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> { | |||
167 | } | 167 | } |
168 | 168 | ||
169 | fn possible_sudmobule_names(&self, module_file: FileId) -> Vec<String> { | 169 | fn possible_sudmobule_names(&self, module_file: FileId) -> Vec<String> { |
170 | self.source_root(module_file).file_set.possible_sudmobule_names(module_file) | 170 | possible_sudmobule_names(&self.source_root(module_file).file_set, module_file) |
171 | } | 171 | } |
172 | } | 172 | } |
173 | 173 | ||
@@ -177,3 +177,71 @@ impl<T: SourceDatabaseExt> FileLoaderDelegate<&'_ T> { | |||
177 | self.0.source_root(source_root) | 177 | self.0.source_root(source_root) |
178 | } | 178 | } |
179 | } | 179 | } |
180 | |||
181 | fn possible_sudmobule_names(module_files: &FileSet, module_file: FileId) -> Vec<String> { | ||
182 | let directory_to_look_for_submodules = match module_files | ||
183 | .path_for_file(&module_file) | ||
184 | .and_then(|module_file_path| get_directory_with_submodules(module_file_path)) | ||
185 | { | ||
186 | Some(directory) => directory, | ||
187 | None => return Vec::new(), | ||
188 | }; | ||
189 | module_files | ||
190 | .iter() | ||
191 | .filter(|submodule_file| submodule_file != &module_file) | ||
192 | .filter_map(|submodule_file| { | ||
193 | let submodule_path = module_files.path_for_file(&submodule_file)?; | ||
194 | if submodule_path.parent()? == directory_to_look_for_submodules { | ||
195 | submodule_path.file_name_and_extension() | ||
196 | } else { | ||
197 | None | ||
198 | } | ||
199 | }) | ||
200 | .filter_map(|file_name_and_extension| { | ||
201 | match file_name_and_extension { | ||
202 | // TODO kb wrong resolution for nested non-file modules (mod tests {mod <|>) | ||
203 | // TODO kb in src/bin when a module is included into another, | ||
204 | // the included file gets "moved" into a directory below and now cannot add any other modules | ||
205 | ("mod", Some("rs")) | ("lib", Some("rs")) | ("main", Some("rs")) => None, | ||
206 | (file_name, Some("rs")) => Some(file_name.to_owned()), | ||
207 | (subdirectory_name, None) => { | ||
208 | let mod_rs_path = | ||
209 | directory_to_look_for_submodules.join(subdirectory_name)?.join("mod.rs")?; | ||
210 | if module_files.file_for_path(&mod_rs_path).is_some() { | ||
211 | Some(subdirectory_name.to_owned()) | ||
212 | } else { | ||
213 | None | ||
214 | } | ||
215 | } | ||
216 | _ => None, | ||
217 | } | ||
218 | }) | ||
219 | .collect() | ||
220 | } | ||
221 | |||
222 | fn get_directory_with_submodules(module_file_path: &VfsPath) -> Option<VfsPath> { | ||
223 | let module_directory_path = module_file_path.parent()?; | ||
224 | match module_file_path.file_name_and_extension()? { | ||
225 | ("mod", Some("rs")) | ("lib", Some("rs")) | ("main", Some("rs")) => { | ||
226 | Some(module_directory_path) | ||
227 | } | ||
228 | (regular_rust_file_name, Some("rs")) => { | ||
229 | if matches!( | ||
230 | ( | ||
231 | module_directory_path | ||
232 | .parent() | ||
233 | .as_ref() | ||
234 | .and_then(|path| path.file_name_and_extension()), | ||
235 | module_directory_path.file_name_and_extension(), | ||
236 | ), | ||
237 | (Some(("src", None)), Some(("bin", None))) | ||
238 | ) { | ||
239 | // files in /src/bin/ can import each other directly | ||
240 | Some(module_directory_path) | ||
241 | } else { | ||
242 | module_directory_path.join(regular_rust_file_name) | ||
243 | } | ||
244 | } | ||
245 | _ => None, | ||
246 | } | ||
247 | } | ||