diff options
author | Aleksey Kladov <[email protected]> | 2020-06-13 12:57:18 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-06-13 12:57:18 +0100 |
commit | b99b4953c9a4791f7f39ab208a1842086ad0f04c (patch) | |
tree | 4adc45371a53cb1110b053961c0fea42d39dcfc3 /crates/ra_ide/src/completion/test_utils.rs | |
parent | ef70076f1da391be8697aaf3c534e4e770561429 (diff) |
More concise completion tests
Diffstat (limited to 'crates/ra_ide/src/completion/test_utils.rs')
-rw-r--r-- | crates/ra_ide/src/completion/test_utils.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs index ba724116d..1e16a43ca 100644 --- a/crates/ra_ide/src/completion/test_utils.rs +++ b/crates/ra_ide/src/completion/test_utils.rs | |||
@@ -12,8 +12,8 @@ pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionI | |||
12 | do_completion_with_options(code, kind, &CompletionConfig::default()) | 12 | do_completion_with_options(code, kind, &CompletionConfig::default()) |
13 | } | 13 | } |
14 | 14 | ||
15 | pub(crate) fn get_completions(code: &str, kind: CompletionKind) -> Vec<String> { | 15 | pub(crate) fn completion_list(code: &str, kind: CompletionKind) -> String { |
16 | get_completions_with_options(code, kind, &CompletionConfig::default()) | 16 | completion_list_with_options(code, kind, &CompletionConfig::default()) |
17 | } | 17 | } |
18 | 18 | ||
19 | pub(crate) fn do_completion_with_options( | 19 | pub(crate) fn do_completion_with_options( |
@@ -38,11 +38,11 @@ fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<Compl | |||
38 | analysis.completions(options, position).unwrap().unwrap().into() | 38 | analysis.completions(options, position).unwrap().unwrap().into() |
39 | } | 39 | } |
40 | 40 | ||
41 | pub(crate) fn get_completions_with_options( | 41 | pub(crate) fn completion_list_with_options( |
42 | code: &str, | 42 | code: &str, |
43 | kind: CompletionKind, | 43 | kind: CompletionKind, |
44 | options: &CompletionConfig, | 44 | options: &CompletionConfig, |
45 | ) -> Vec<String> { | 45 | ) -> String { |
46 | let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, options) | 46 | let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, options) |
47 | .into_iter() | 47 | .into_iter() |
48 | .filter(|c| c.completion_kind == kind) | 48 | .filter(|c| c.completion_kind == kind) |
@@ -50,7 +50,7 @@ pub(crate) fn get_completions_with_options( | |||
50 | kind_completions.sort_by_key(|c| c.label().to_owned()); | 50 | kind_completions.sort_by_key(|c| c.label().to_owned()); |
51 | kind_completions | 51 | kind_completions |
52 | .into_iter() | 52 | .into_iter() |
53 | .map(|it| format!("{} {}", it.kind().unwrap().tag(), it.label())) | 53 | .map(|it| format!("{} {}\n", it.kind().unwrap().tag(), it.label())) |
54 | .collect() | 54 | .collect() |
55 | } | 55 | } |
56 | 56 | ||