aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/completion/completion_context.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-04-22 14:04:56 +0100
committerAleksey Kladov <[email protected]>2019-04-22 14:04:56 +0100
commitc27a3da5e86b1fcbfb562e0723fb97d72268fa72 (patch)
tree1a78d5e88244a4689cfd71cfadf76b0830a1280d /crates/ra_ide_api/src/completion/completion_context.rs
parente01052d1f0b8bf70a418a10538528923c5f400d5 (diff)
remove path_ident from CompletionContext
We really shouldn't be looking at the identifier at point. Instead, all filtering and sorting should be implemented at the layer above. This layer should probably be home for auto-import completions as well, but, since that is not yet implemented, let's just stick this into complete_scope.
Diffstat (limited to 'crates/ra_ide_api/src/completion/completion_context.rs')
-rw-r--r--crates/ra_ide_api/src/completion/completion_context.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index 0d630fdf6..a8c8cc7b0 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -5,10 +5,10 @@ use ra_syntax::{
5 algo::{find_token_at_offset, find_covering_element, find_node_at_offset}, 5 algo::{find_token_at_offset, find_covering_element, find_node_at_offset},
6 SyntaxKind::*, 6 SyntaxKind::*,
7}; 7};
8 8use hir::source_binder;
9use hir::{ source_binder, Name };
10 9
11use crate::{db, FilePosition}; 10use crate::{db, FilePosition};
11
12/// `CompletionContext` is created early during completion to figure out, where 12/// `CompletionContext` is created early during completion to figure out, where
13/// exactly is the cursor, syntax-wise. 13/// exactly is the cursor, syntax-wise.
14#[derive(Debug)] 14#[derive(Debug)]
@@ -29,8 +29,6 @@ pub(crate) struct CompletionContext<'a> {
29 pub(super) is_trivial_path: bool, 29 pub(super) is_trivial_path: bool,
30 /// If not a trivial path, the prefix (qualifier). 30 /// If not a trivial path, the prefix (qualifier).
31 pub(super) path_prefix: Option<hir::Path>, 31 pub(super) path_prefix: Option<hir::Path>,
32 /// If a trivial path, the ident.
33 pub(super) path_ident: Option<Name>,
34 pub(super) after_if: bool, 32 pub(super) after_if: bool,
35 /// `true` if we are a statement or a last expr in the block. 33 /// `true` if we are a statement or a last expr in the block.
36 pub(super) can_be_stmt: bool, 34 pub(super) can_be_stmt: bool,
@@ -65,7 +63,6 @@ impl<'a> CompletionContext<'a> {
65 is_pat_binding: false, 63 is_pat_binding: false,
66 is_trivial_path: false, 64 is_trivial_path: false,
67 path_prefix: None, 65 path_prefix: None,
68 path_ident: None,
69 after_if: false, 66 after_if: false,
70 can_be_stmt: false, 67 can_be_stmt: false,
71 is_new_item: false, 68 is_new_item: false,