diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-11-27 12:03:14 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-11-27 12:03:14 +0000 |
commit | 0bc6f5802f3b80b76aeeb1668a1e1f5db7494309 (patch) | |
tree | ec9c94fa1bf857032b3914175d03fd179f74c660 /crates/ra_analysis/src/completion | |
parent | 8e37208040a456d4e481472f69b3b584655ee90f (diff) | |
parent | 10f4d4b74cd7e072bf5e8d3fb57c76f35ea03e1d (diff) |
Merge #245
245: File items r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/completion')
-rw-r--r-- | crates/ra_analysis/src/completion/reference_completion.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs index d301a3c02..1faa70a18 100644 --- a/crates/ra_analysis/src/completion/reference_completion.rs +++ b/crates/ra_analysis/src/completion/reference_completion.rs | |||
@@ -46,9 +46,12 @@ pub(super) fn completions( | |||
46 | .iter() | 46 | .iter() |
47 | .filter(|(_name, res)| { | 47 | .filter(|(_name, res)| { |
48 | // Don't expose this item | 48 | // Don't expose this item |
49 | match res.import_name { | 49 | match res.import { |
50 | None => true, | 50 | None => true, |
51 | Some(ptr) => !ptr.range().is_subrange(&name_ref.syntax().range()), | 51 | Some(import) => { |
52 | let range = import.range(db, module.source().file_id()); | ||
53 | !range.is_subrange(&name_ref.syntax().range()) | ||
54 | } | ||
52 | } | 55 | } |
53 | }) | 56 | }) |
54 | .map(|(name, _res)| CompletionItem { | 57 | .map(|(name, _res)| CompletionItem { |