diff options
Diffstat (limited to 'crates/ra_ide/src/completion/test_utils.rs')
-rw-r--r-- | crates/ra_ide/src/completion/test_utils.rs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs index f54d15a90..eb90b5279 100644 --- a/crates/ra_ide/src/completion/test_utils.rs +++ b/crates/ra_ide/src/completion/test_utils.rs | |||
@@ -7,18 +7,13 @@ use crate::{ | |||
7 | }; | 7 | }; |
8 | 8 | ||
9 | pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> { | 9 | pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> { |
10 | do_completion_with_options(code, kind, &CompletionConfig::default(), true) | 10 | do_completion_with_options(code, kind, &CompletionConfig::default()) |
11 | } | ||
12 | |||
13 | pub(crate) fn do_completion_without_sort(code: &str, kind: CompletionKind) -> Vec<CompletionItem> { | ||
14 | do_completion_with_options(code, kind, &CompletionConfig::default(), false) | ||
15 | } | 11 | } |
16 | 12 | ||
17 | pub(crate) fn do_completion_with_options( | 13 | pub(crate) fn do_completion_with_options( |
18 | code: &str, | 14 | code: &str, |
19 | kind: CompletionKind, | 15 | kind: CompletionKind, |
20 | options: &CompletionConfig, | 16 | options: &CompletionConfig, |
21 | sort_by_key: bool, | ||
22 | ) -> Vec<CompletionItem> { | 17 | ) -> Vec<CompletionItem> { |
23 | let (analysis, position) = if code.contains("//-") { | 18 | let (analysis, position) = if code.contains("//-") { |
24 | analysis_and_position(code) | 19 | analysis_and_position(code) |
@@ -29,8 +24,6 @@ pub(crate) fn do_completion_with_options( | |||
29 | let completion_items: Vec<CompletionItem> = completions.into(); | 24 | let completion_items: Vec<CompletionItem> = completions.into(); |
30 | let mut kind_completions: Vec<CompletionItem> = | 25 | let mut kind_completions: Vec<CompletionItem> = |
31 | completion_items.into_iter().filter(|c| c.completion_kind == kind).collect(); | 26 | completion_items.into_iter().filter(|c| c.completion_kind == kind).collect(); |
32 | if sort_by_key { | 27 | kind_completions.sort_by_key(|c| c.label().to_owned()); |
33 | kind_completions.sort_by_key(|c| c.label().to_owned()); | ||
34 | } | ||
35 | kind_completions | 28 | kind_completions |
36 | } | 29 | } |