aboutsummaryrefslogtreecommitdiff
path: root/crates/ide/src
diff options
context:
space:
mode:
authorKirill Bulatov <[email protected]>2020-09-09 23:45:49 +0100
committerKirill Bulatov <[email protected]>2020-09-09 23:45:49 +0100
commit9863798480aa9642e31bfd41ee899d2e7329b5e5 (patch)
treed1a9c8ce7df146d13faa6a783833ba4d31957390 /crates/ide/src
parentf4ee885b3b3019b32d5c481bddf1b2667fba7fb3 (diff)
Rename the method to avoid false promises
Diffstat (limited to 'crates/ide/src')
-rw-r--r--crates/ide/src/completion/complete_mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide/src/completion/complete_mod.rs b/crates/ide/src/completion/complete_mod.rs
index d457ff6bf..2ea0d5034 100644
--- a/crates/ide/src/completion/complete_mod.rs
+++ b/crates/ide/src/completion/complete_mod.rs
@@ -52,11 +52,11 @@ pub(super) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
52 .filter_map(|submodule_file| { 52 .filter_map(|submodule_file| {
53 let submodule_path = source_root.path_for_file(&submodule_file)?; 53 let submodule_path = source_root.path_for_file(&submodule_file)?;
54 let directory_with_submodule = submodule_path.parent()?; 54 let directory_with_submodule = submodule_path.parent()?;
55 match submodule_path.file_name_and_extension()? { 55 match submodule_path.name_and_extension()? {
56 ("lib", Some("rs")) | ("main", Some("rs")) => None, 56 ("lib", Some("rs")) | ("main", Some("rs")) => None,
57 ("mod", Some("rs")) => { 57 ("mod", Some("rs")) => {
58 if directory_with_submodule.parent()? == directory_to_look_for_submodules { 58 if directory_with_submodule.parent()? == directory_to_look_for_submodules {
59 match directory_with_submodule.file_name_and_extension()? { 59 match directory_with_submodule.name_and_extension()? {
60 (directory_name, None) => Some(directory_name.to_owned()), 60 (directory_name, None) => Some(directory_name.to_owned()),
61 _ => None, 61 _ => None,
62 } 62 }
@@ -93,7 +93,7 @@ fn directory_to_look_for_submodules(
93 module_file_path: &VfsPath, 93 module_file_path: &VfsPath,
94) -> Option<VfsPath> { 94) -> Option<VfsPath> {
95 let directory_with_module_path = module_file_path.parent()?; 95 let directory_with_module_path = module_file_path.parent()?;
96 let base_directory = match module_file_path.file_name_and_extension()? { 96 let base_directory = match module_file_path.name_and_extension()? {
97 ("mod", Some("rs")) | ("lib", Some("rs")) | ("main", Some("rs")) => { 97 ("mod", Some("rs")) | ("lib", Some("rs")) | ("main", Some("rs")) => {
98 Some(directory_with_module_path) 98 Some(directory_with_module_path)
99 } 99 }
@@ -103,8 +103,8 @@ fn directory_to_look_for_submodules(
103 directory_with_module_path 103 directory_with_module_path
104 .parent() 104 .parent()
105 .as_ref() 105 .as_ref()
106 .and_then(|path| path.file_name_and_extension()), 106 .and_then(|path| path.name_and_extension()),
107 directory_with_module_path.file_name_and_extension(), 107 directory_with_module_path.name_and_extension(),
108 ), 108 ),
109 (Some(("src", None)), Some(("bin", None))) 109 (Some(("src", None)), Some(("bin", None)))
110 ) { 110 ) {