diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-10 17:56:44 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-10 17:56:44 +0000 |
commit | e5df8c402847d5bedb8ebcb621aac46dbe215cdd (patch) | |
tree | 87f12e2619ac0074134b758ddcc1f6c1ccef863a /crates/ra_ide/src/completion/completion_item.rs | |
parent | daf3609654b6e9b2ac2808a056c61438674a1dc9 (diff) | |
parent | 14094e44770559c13a1e8bdfcfb989d3bedd00d8 (diff) |
Merge #3551
3551: Move FeatureFlags r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/completion/completion_item.rs')
-rw-r--r-- | crates/ra_ide/src/completion/completion_item.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crates/ra_ide/src/completion/completion_item.rs b/crates/ra_ide/src/completion/completion_item.rs index 19bbb2517..1d14e9636 100644 --- a/crates/ra_ide/src/completion/completion_item.rs +++ b/crates/ra_ide/src/completion/completion_item.rs | |||
@@ -321,14 +321,18 @@ impl Into<Vec<CompletionItem>> for Completions { | |||
321 | 321 | ||
322 | #[cfg(test)] | 322 | #[cfg(test)] |
323 | pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> { | 323 | pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> { |
324 | use crate::completion::completions; | 324 | use crate::{ |
325 | use crate::mock_analysis::{analysis_and_position, single_file_with_position}; | 325 | completion::{completions, CompletionOptions}, |
326 | mock_analysis::{analysis_and_position, single_file_with_position}, | ||
327 | }; | ||
328 | |||
326 | let (analysis, position) = if code.contains("//-") { | 329 | let (analysis, position) = if code.contains("//-") { |
327 | analysis_and_position(code) | 330 | analysis_and_position(code) |
328 | } else { | 331 | } else { |
329 | single_file_with_position(code) | 332 | single_file_with_position(code) |
330 | }; | 333 | }; |
331 | let completions = completions(&analysis.db, position).unwrap(); | 334 | let options = CompletionOptions::default(); |
335 | let completions = completions(&analysis.db, position, &options).unwrap(); | ||
332 | let completion_items: Vec<CompletionItem> = completions.into(); | 336 | let completion_items: Vec<CompletionItem> = completions.into(); |
333 | let mut kind_completions: Vec<CompletionItem> = | 337 | let mut kind_completions: Vec<CompletionItem> = |
334 | completion_items.into_iter().filter(|c| c.completion_kind == kind).collect(); | 338 | completion_items.into_iter().filter(|c| c.completion_kind == kind).collect(); |