From c303e6fbdfd8d04b645796489766e912d2cb3009 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 6 Jan 2019 16:05:59 +0300 Subject: fix ra_analysis to work with the new API --- crates/ra_analysis/src/completion/complete_scope.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crates/ra_analysis/src/completion') diff --git a/crates/ra_analysis/src/completion/complete_scope.rs b/crates/ra_analysis/src/completion/complete_scope.rs index 21d77aa97..ee9052d3d 100644 --- a/crates/ra_analysis/src/completion/complete_scope.rs +++ b/crates/ra_analysis/src/completion/complete_scope.rs @@ -20,14 +20,17 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) -> } let module_scope = module.scope(ctx.db)?; + let (file_id, _) = module.defenition_source(ctx.db)?; module_scope .entries() .filter(|(_name, res)| { // Don't expose this item + // FIXME: this penetrates through all kinds of abstractions, + // we need to figura out the way to do it less ugly. match res.import { None => true, Some(import) => { - let range = import.range(ctx.db, module.file_id()); + let range = import.range(ctx.db, file_id); !range.is_subrange(&ctx.leaf.range()) } } -- cgit v1.2.3