Merge #5219

5219: Cleanup dot completiont tests r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 12 insertions, 9 deletions

diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs
index 145d36c98..cbae1da85 100644
--- a/crates/ra_ide/src/completion/test_utils.rs
+++ b/crates/ra_ide/src/completion/test_utils.rs
@@ -13,15 +13,15 @@ use crate::{
 };
 
 pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> {
-    do_completion_with_options(code, kind, &CompletionConfig::default())
+    do_completion_with_config(code, kind, &CompletionConfig::default())
 }
 
-pub(crate) fn do_completion_with_options(
+pub(crate) fn do_completion_with_config(
     code: &str,
     kind: CompletionKind,
-    options: &CompletionConfig,
+    config: &CompletionConfig,
 ) -> Vec<CompletionItem> {
-    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, options)
+    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, config)
         .into_iter()
         .filter(|c| c.completion_kind == kind)
         .collect();
@@ -30,15 +30,15 @@ pub(crate) fn do_completion_with_options(
 }
 
 pub(crate) fn completion_list(code: &str, kind: CompletionKind) -> String {
-    completion_list_with_options(code, kind, &CompletionConfig::default())
+    completion_list_with_config(code, kind, &CompletionConfig::default())
 }
 
-pub(crate) fn completion_list_with_options(
+pub(crate) fn completion_list_with_config(
     code: &str,
     kind: CompletionKind,
-    options: &CompletionConfig,
+    config: &CompletionConfig,
 ) -> String {
-    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, options)
+    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, config)
         .into_iter()
         .filter(|c| c.completion_kind == kind)
         .collect();
@@ -92,7 +92,10 @@ pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -
         .unwrap();
 }
 
-fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<CompletionItem> {
+pub(crate) fn get_all_completion_items(
+    code: &str,
+    options: &CompletionConfig,
+) -> Vec<CompletionItem> {
     let (analysis, position) = analysis_and_position(code);
     analysis.completions(options, position).unwrap().unwrap().into()
 }