diff options
author | Lukas Wirth <[email protected]> | 2021-05-08 22:14:08 +0100 |
---|---|---|
committer | Lukas Wirth <[email protected]> | 2021-05-08 22:14:08 +0100 |
commit | 174f043c8d9186d2bec7c9a45b7a6ca68b232c80 (patch) | |
tree | ce526f46adb8a3e61e5c79adb2bb4eeb4ab0b8b6 /crates/ide_completion | |
parent | 96c5df9b171730ad69e130e074584684cee35014 (diff) |
Add `=` to pattern recovery
Diffstat (limited to 'crates/ide_completion')
-rw-r--r-- | crates/ide_completion/src/context.rs | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs index 62ef40818..787eb2fd3 100644 --- a/crates/ide_completion/src/context.rs +++ b/crates/ide_completion/src/context.rs | |||
@@ -313,7 +313,8 @@ impl<'a> CompletionContext<'a> { | |||
313 | cov_mark::hit!(expected_type_let_with_leading_char); | 313 | cov_mark::hit!(expected_type_let_with_leading_char); |
314 | cov_mark::hit!(expected_type_let_without_leading_char); | 314 | cov_mark::hit!(expected_type_let_without_leading_char); |
315 | let ty = it.pat() | 315 | let ty = it.pat() |
316 | .and_then(|pat| self.sema.type_of_pat(&pat)); | 316 | .and_then(|pat| self.sema.type_of_pat(&pat)) |
317 | .or_else(|| it.initializer().and_then(|it| self.sema.type_of_expr(&it))); | ||
317 | let name = if let Some(ast::Pat::IdentPat(ident)) = it.pat() { | 318 | let name = if let Some(ast::Pat::IdentPat(ident)) = it.pat() { |
318 | ident.name().map(NameOrNameRef::Name) | 319 | ident.name().map(NameOrNameRef::Name) |
319 | } else { | 320 | } else { |
@@ -720,6 +721,26 @@ fn foo() { | |||
720 | } | 721 | } |
721 | 722 | ||
722 | #[test] | 723 | #[test] |
724 | fn expected_type_let_pat() { | ||
725 | check_expected_type_and_name( | ||
726 | r#" | ||
727 | fn foo() { | ||
728 | let x$0 = 0u32; | ||
729 | } | ||
730 | "#, | ||
731 | expect![[r#"ty: u32, name: ?"#]], | ||
732 | ); | ||
733 | check_expected_type_and_name( | ||
734 | r#" | ||
735 | fn foo() { | ||
736 | let $0 = 0u32; | ||
737 | } | ||
738 | "#, | ||
739 | expect![[r#"ty: u32, name: ?"#]], | ||
740 | ); | ||
741 | } | ||
742 | |||
743 | #[test] | ||
723 | fn expected_type_fn_param_without_leading_char() { | 744 | fn expected_type_fn_param_without_leading_char() { |
724 | cov_mark::check!(expected_type_fn_param_without_leading_char); | 745 | cov_mark::check!(expected_type_fn_param_without_leading_char); |
725 | check_expected_type_and_name( | 746 | check_expected_type_and_name( |