diff options
author | Kevin DeLorey <[email protected]> | 2020-02-09 16:25:47 +0000 |
---|---|---|
committer | Kevin DeLorey <[email protected]> | 2020-02-09 16:37:43 +0000 |
commit | a957c473fdb79880c39b73dc9e0c923093cf16ac (patch) | |
tree | f998b548f530ce604651e0e6af314ed2ec74b3b5 /crates/ra_ide/src/completion.rs | |
parent | 22caf982b99c54058e2e9200aeea0e61cada284a (diff) | |
parent | 1b9b13b4b4a75b5531c3f046ce6bf72d681f2732 (diff) |
Merge branch 'master' into kdelorey/complete-trait-impl
Diffstat (limited to 'crates/ra_ide/src/completion.rs')
-rw-r--r-- | crates/ra_ide/src/completion.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs index ad7f6ef26..4f24cd1f9 100644 --- a/crates/ra_ide/src/completion.rs +++ b/crates/ra_ide/src/completion.rs | |||
@@ -18,6 +18,7 @@ mod complete_macro_in_item_position; | |||
18 | mod complete_trait_impl; | 18 | mod complete_trait_impl; |
19 | 19 | ||
20 | use ra_db::SourceDatabase; | 20 | use ra_db::SourceDatabase; |
21 | use ra_ide_db::RootDatabase; | ||
21 | 22 | ||
22 | #[cfg(test)] | 23 | #[cfg(test)] |
23 | use crate::completion::completion_item::do_completion; | 24 | use crate::completion::completion_item::do_completion; |
@@ -26,7 +27,7 @@ use crate::{ | |||
26 | completion_context::CompletionContext, | 27 | completion_context::CompletionContext, |
27 | completion_item::{CompletionKind, Completions}, | 28 | completion_item::{CompletionKind, Completions}, |
28 | }, | 29 | }, |
29 | db, FilePosition, | 30 | FilePosition, |
30 | }; | 31 | }; |
31 | 32 | ||
32 | pub use crate::completion::completion_item::{ | 33 | pub use crate::completion::completion_item::{ |
@@ -55,7 +56,7 @@ pub use crate::completion::completion_item::{ | |||
55 | /// `foo` *should* be present among the completion variants. Filtering by | 56 | /// `foo` *should* be present among the completion variants. Filtering by |
56 | /// identifier prefix/fuzzy match should be done higher in the stack, together | 57 | /// identifier prefix/fuzzy match should be done higher in the stack, together |
57 | /// with ordering of completions (currently this is done by the client). | 58 | /// with ordering of completions (currently this is done by the client). |
58 | pub(crate) fn completions(db: &db::RootDatabase, position: FilePosition) -> Option<Completions> { | 59 | pub(crate) fn completions(db: &RootDatabase, position: FilePosition) -> Option<Completions> { |
59 | let original_parse = db.parse(position.file_id); | 60 | let original_parse = db.parse(position.file_id); |
60 | let ctx = CompletionContext::new(db, &original_parse, position)?; | 61 | let ctx = CompletionContext::new(db, &original_parse, position)?; |
61 | 62 | ||