diff options
Diffstat (limited to 'crates/ra_ide/src/completion/completion_context.rs')
-rw-r--r-- | crates/ra_ide/src/completion/completion_context.rs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs index 54589a2a8..d867ff6b2 100644 --- a/crates/ra_ide/src/completion/completion_context.rs +++ b/crates/ra_ide/src/completion/completion_context.rs | |||
@@ -36,6 +36,9 @@ pub(crate) struct CompletionContext<'a> { | |||
36 | /// If a name-binding or reference to a const in a pattern. | 36 | /// If a name-binding or reference to a const in a pattern. |
37 | /// Irrefutable patterns (like let) are excluded. | 37 | /// Irrefutable patterns (like let) are excluded. |
38 | pub(super) is_pat_binding: bool, | 38 | pub(super) is_pat_binding: bool, |
39 | // A bind battern which may also be part of a path. | ||
40 | // if let Some(En<|>) = Some(Enum::A) | ||
41 | pub(super) is_pat_binding_and_path: bool, | ||
39 | /// A single-indent path, like `foo`. `::foo` should not be considered a trivial path. | 42 | /// A single-indent path, like `foo`. `::foo` should not be considered a trivial path. |
40 | pub(super) is_trivial_path: bool, | 43 | pub(super) is_trivial_path: bool, |
41 | /// If not a trivial path, the prefix (qualifier). | 44 | /// If not a trivial path, the prefix (qualifier). |
@@ -95,6 +98,7 @@ impl<'a> CompletionContext<'a> { | |||
95 | impl_def: None, | 98 | impl_def: None, |
96 | is_param: false, | 99 | is_param: false, |
97 | is_pat_binding: false, | 100 | is_pat_binding: false, |
101 | is_pat_binding_and_path: false, | ||
98 | is_trivial_path: false, | 102 | is_trivial_path: false, |
99 | path_prefix: None, | 103 | path_prefix: None, |
100 | after_if: false, | 104 | after_if: false, |
@@ -186,12 +190,20 @@ impl<'a> CompletionContext<'a> { | |||
186 | // suggest declaration names, see `CompletionKind::Magic`. | 190 | // suggest declaration names, see `CompletionKind::Magic`. |
187 | if let Some(name) = find_node_at_offset::<ast::Name>(&file_with_fake_ident, offset) { | 191 | if let Some(name) = find_node_at_offset::<ast::Name>(&file_with_fake_ident, offset) { |
188 | if let Some(bind_pat) = name.syntax().ancestors().find_map(ast::BindPat::cast) { | 192 | if let Some(bind_pat) = name.syntax().ancestors().find_map(ast::BindPat::cast) { |
189 | let parent = bind_pat.syntax().parent(); | 193 | let mut parent = bind_pat.syntax().parent(); |
190 | if parent.clone().and_then(ast::MatchArm::cast).is_some() | 194 | if parent.clone().and_then(ast::MatchArm::cast).is_some() |
191 | || parent.and_then(ast::Condition::cast).is_some() | 195 | || parent.clone().and_then(ast::Condition::cast).is_some() |
192 | { | 196 | { |
193 | self.is_pat_binding = true; | 197 | self.is_pat_binding = true; |
194 | } | 198 | } |
199 | |||
200 | while let Some(_) = parent.clone().and_then(ast::TupleStructPat::cast) { | ||
201 | parent = parent.and_then(|p| p.parent()); | ||
202 | if parent.clone().and_then(ast::MatchArm::cast).is_some() { | ||
203 | self.is_pat_binding_and_path = true; | ||
204 | break; | ||
205 | } | ||
206 | } | ||
195 | } | 207 | } |
196 | if is_node::<ast::Param>(name.syntax()) { | 208 | if is_node::<ast::Param>(name.syntax()) { |
197 | self.is_param = true; | 209 | self.is_param = true; |