aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src/completion/mod.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-05 10:21:28 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-05 10:21:28 +0000
commitd1b993c0aacb2a29fc87283a8b35fe1b4a542459 (patch)
tree615c68873a325a02be8e21e1bd4dcb9ce8ab6a1e /crates/ra_analysis/src/completion/mod.rs
parent7960c8b27681ebeb72d83930c4a2bbf43a982c52 (diff)
parentdb456749a85e87cdbe3f87b85bf44446d9d5694b (diff)
Merge #255
255: Binders r=matklad a=matklad Binding sources to hir is a fuzzy operation, so let's move it to a special enclave in the source code. Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/completion/mod.rs')
-rw-r--r--crates/ra_analysis/src/completion/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 124da486a..0f154112a 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -9,6 +9,7 @@ use ra_syntax::{
9}; 9};
10use ra_db::SyntaxDatabase; 10use ra_db::SyntaxDatabase;
11use rustc_hash::{FxHashMap}; 11use rustc_hash::{FxHashMap};
12use hir::source_binder;
12 13
13use crate::{ 14use crate::{
14 db, 15 db,
@@ -36,7 +37,7 @@ pub(crate) fn completions(
36 original_file.reparse(&edit) 37 original_file.reparse(&edit)
37 }; 38 };
38 39
39 let module = ctry!(hir::Module::guess_from_position(db, position)?); 40 let module = ctry!(source_binder::module_from_position(db, position)?);
40 41
41 let mut res = Vec::new(); 42 let mut res = Vec::new();
42 let mut has_completions = false; 43 let mut has_completions = false;