diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-21 15:14:34 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-21 15:14:34 +0000 |
| commit | 0dcea10616e173a513667e3c761dc06c8253366b (patch) | |
| tree | 4652bd1f393540f2f5abdaaab367cfb0b46a10d6 /crates/ra_analysis/src/imp.rs | |
| parent | 463e5af3f2ff54b74e4aeb73e75047c00b6339be (diff) | |
| parent | 45232dfa689bafadf98b92ef30fd32ea9a5e9e7a (diff) | |
Merge #312
312: Completion refactoring r=matklad a=matklad
Just a usual refactoring, turning a rather ad-hoc completion infra into something extensible
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/imp.rs')
| -rw-r--r-- | crates/ra_analysis/src/imp.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index 5701e1ae2..340f7c78c 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs | |||
| @@ -219,7 +219,8 @@ impl AnalysisImpl { | |||
| 219 | self.db.crate_graph().crate_root(crate_id) | 219 | self.db.crate_graph().crate_root(crate_id) |
| 220 | } | 220 | } |
| 221 | pub fn completions(&self, position: FilePosition) -> Cancelable<Option<Vec<CompletionItem>>> { | 221 | pub fn completions(&self, position: FilePosition) -> Cancelable<Option<Vec<CompletionItem>>> { |
| 222 | completions(&self.db, position) | 222 | let completions = completions(&self.db, position)?; |
| 223 | Ok(completions.map(|it| it.into())) | ||
| 223 | } | 224 | } |
| 224 | pub fn approximately_resolve_symbol( | 225 | pub fn approximately_resolve_symbol( |
| 225 | &self, | 226 | &self, |