diff options
Diffstat (limited to 'crates/ra_ide/src')
-rw-r--r-- | crates/ra_ide/src/call_info.rs | 21 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_pattern.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_record.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/complete_unqualified_path.rs | 9 | ||||
-rw-r--r-- | crates/ra_ide/src/completion/completion_context.rs | 12 |
5 files changed, 37 insertions, 11 deletions
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs index ca57eceff..f95b6baf3 100644 --- a/crates/ra_ide/src/call_info.rs +++ b/crates/ra_ide/src/call_info.rs | |||
@@ -208,9 +208,20 @@ mod tests { | |||
208 | } | 208 | } |
209 | } | 209 | } |
210 | 210 | ||
211 | fn call_info(text: &str) -> CallInfo { | 211 | fn call_info_helper(text: &str) -> Option<CallInfo> { |
212 | let (analysis, position) = single_file_with_position(text); | 212 | let (analysis, position) = single_file_with_position(text); |
213 | analysis.call_info(position).unwrap().unwrap() | 213 | analysis.call_info(position).unwrap() |
214 | } | ||
215 | |||
216 | fn call_info(text: &str) -> CallInfo { | ||
217 | let info = call_info_helper(text); | ||
218 | assert!(info.is_some()); | ||
219 | info.unwrap() | ||
220 | } | ||
221 | |||
222 | fn no_call_info(text: &str) { | ||
223 | let info = call_info_helper(text); | ||
224 | assert!(info.is_none()); | ||
214 | } | 225 | } |
215 | 226 | ||
216 | #[test] | 227 | #[test] |
@@ -558,9 +569,8 @@ fn main() { | |||
558 | } | 569 | } |
559 | 570 | ||
560 | #[test] | 571 | #[test] |
561 | #[should_panic] | ||
562 | fn cant_call_named_structs() { | 572 | fn cant_call_named_structs() { |
563 | let _ = call_info( | 573 | no_call_info( |
564 | r#" | 574 | r#" |
565 | struct TS { x: u32, y: i32 } | 575 | struct TS { x: u32, y: i32 } |
566 | fn main() { | 576 | fn main() { |
@@ -594,9 +604,8 @@ fn main() { | |||
594 | } | 604 | } |
595 | 605 | ||
596 | #[test] | 606 | #[test] |
597 | #[should_panic] | ||
598 | fn cant_call_enum_records() { | 607 | fn cant_call_enum_records() { |
599 | let _ = call_info( | 608 | no_call_info( |
600 | r#" | 609 | r#" |
601 | enum E { | 610 | enum E { |
602 | /// A Variant | 611 | /// A Variant |
diff --git a/crates/ra_ide/src/completion/complete_pattern.rs b/crates/ra_ide/src/completion/complete_pattern.rs index 1b7d3122f..a8b4ce114 100644 --- a/crates/ra_ide/src/completion/complete_pattern.rs +++ b/crates/ra_ide/src/completion/complete_pattern.rs | |||
@@ -7,6 +7,10 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) { | |||
7 | if !ctx.is_pat_binding_or_const { | 7 | if !ctx.is_pat_binding_or_const { |
8 | return; | 8 | return; |
9 | } | 9 | } |
10 | if ctx.record_pat_syntax.is_some() { | ||
11 | return; | ||
12 | } | ||
13 | |||
10 | // FIXME: ideally, we should look at the type we are matching against and | 14 | // FIXME: ideally, we should look at the type we are matching against and |
11 | // suggest variants + auto-imports | 15 | // suggest variants + auto-imports |
12 | ctx.scope().process_all_names(&mut |name, res| { | 16 | ctx.scope().process_all_names(&mut |name, res| { |
diff --git a/crates/ra_ide/src/completion/complete_record.rs b/crates/ra_ide/src/completion/complete_record.rs index f46bcee5c..83a553155 100644 --- a/crates/ra_ide/src/completion/complete_record.rs +++ b/crates/ra_ide/src/completion/complete_record.rs | |||
@@ -2,7 +2,7 @@ | |||
2 | use crate::completion::{CompletionContext, Completions}; | 2 | use crate::completion::{CompletionContext, Completions}; |
3 | 3 | ||
4 | pub(super) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { | 4 | pub(super) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { |
5 | let missing_fields = match (ctx.record_lit_pat.as_ref(), ctx.record_lit_syntax.as_ref()) { | 5 | let missing_fields = match (ctx.record_pat_syntax.as_ref(), ctx.record_lit_syntax.as_ref()) { |
6 | (None, None) => return None, | 6 | (None, None) => return None, |
7 | (Some(_), Some(_)) => unreachable!("A record cannot be both a literal and a pattern"), | 7 | (Some(_), Some(_)) => unreachable!("A record cannot be both a literal and a pattern"), |
8 | (Some(record_pat), _) => ctx.sema.record_pattern_missing_fields(record_pat), | 8 | (Some(record_pat), _) => ctx.sema.record_pattern_missing_fields(record_pat), |
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs index 0b0da6ee4..2d8e0776c 100644 --- a/crates/ra_ide/src/completion/complete_unqualified_path.rs +++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs | |||
@@ -3,7 +3,14 @@ | |||
3 | use crate::completion::{CompletionContext, Completions}; | 3 | use crate::completion::{CompletionContext, Completions}; |
4 | 4 | ||
5 | pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) { | 5 | pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) { |
6 | if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const && !ctx.record_lit_syntax.is_some()) { | 6 | if !ctx.is_trivial_path { |
7 | return; | ||
8 | } | ||
9 | |||
10 | if ctx.is_pat_binding_or_const | ||
11 | || ctx.record_lit_syntax.is_some() | ||
12 | || ctx.record_pat_syntax.is_some() | ||
13 | { | ||
7 | return; | 14 | return; |
8 | } | 15 | } |
9 | 16 | ||
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs index eb8016dd1..da054f7a2 100644 --- a/crates/ra_ide/src/completion/completion_context.rs +++ b/crates/ra_ide/src/completion/completion_context.rs | |||
@@ -31,7 +31,7 @@ pub(crate) struct CompletionContext<'a> { | |||
31 | pub(super) function_syntax: Option<ast::FnDef>, | 31 | pub(super) function_syntax: Option<ast::FnDef>, |
32 | pub(super) use_item_syntax: Option<ast::UseItem>, | 32 | pub(super) use_item_syntax: Option<ast::UseItem>, |
33 | pub(super) record_lit_syntax: Option<ast::RecordLit>, | 33 | pub(super) record_lit_syntax: Option<ast::RecordLit>, |
34 | pub(super) record_lit_pat: Option<ast::RecordPat>, | 34 | pub(super) record_pat_syntax: Option<ast::RecordPat>, |
35 | pub(super) impl_def: Option<ast::ImplDef>, | 35 | pub(super) impl_def: Option<ast::ImplDef>, |
36 | pub(super) call_info: Option<CallInfo>, | 36 | pub(super) call_info: Option<CallInfo>, |
37 | pub(super) is_param: bool, | 37 | pub(super) is_param: bool, |
@@ -97,7 +97,7 @@ impl<'a> CompletionContext<'a> { | |||
97 | call_info: None, | 97 | call_info: None, |
98 | use_item_syntax: None, | 98 | use_item_syntax: None, |
99 | record_lit_syntax: None, | 99 | record_lit_syntax: None, |
100 | record_lit_pat: None, | 100 | record_pat_syntax: None, |
101 | impl_def: None, | 101 | impl_def: None, |
102 | is_param: false, | 102 | is_param: false, |
103 | is_pat_binding_or_const: false, | 103 | is_pat_binding_or_const: false, |
@@ -186,6 +186,11 @@ impl<'a> CompletionContext<'a> { | |||
186 | self.is_param = true; | 186 | self.is_param = true; |
187 | return; | 187 | return; |
188 | } | 188 | } |
189 | // FIXME: remove this (V) duplication and make the check more precise | ||
190 | if name_ref.syntax().ancestors().find_map(ast::RecordFieldPatList::cast).is_some() { | ||
191 | self.record_pat_syntax = | ||
192 | self.sema.find_node_at_offset_with_macros(&original_file, offset); | ||
193 | } | ||
189 | self.classify_name_ref(original_file, name_ref, offset); | 194 | self.classify_name_ref(original_file, name_ref, offset); |
190 | } | 195 | } |
191 | 196 | ||
@@ -215,8 +220,9 @@ impl<'a> CompletionContext<'a> { | |||
215 | self.is_param = true; | 220 | self.is_param = true; |
216 | return; | 221 | return; |
217 | } | 222 | } |
223 | // FIXME: remove this (^) duplication and make the check more precise | ||
218 | if name.syntax().ancestors().find_map(ast::RecordFieldPatList::cast).is_some() { | 224 | if name.syntax().ancestors().find_map(ast::RecordFieldPatList::cast).is_some() { |
219 | self.record_lit_pat = | 225 | self.record_pat_syntax = |
220 | self.sema.find_node_at_offset_with_macros(&original_file, offset); | 226 | self.sema.find_node_at_offset_with_macros(&original_file, offset); |
221 | } | 227 | } |
222 | } | 228 | } |