diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-29 15:04:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-08-29 15:04:28 +0100 |
commit | 7d72ca80003b7915ed7fc64907b5b6dc5c88dacd (patch) | |
tree | 4aa7826d1b9a7222ad64085f136a1615d7daa7a5 /crates/ra_ide_api/src/completion/complete_keyword.rs | |
parent | 5a99184967c89992df4544d0c1ca27d79946a1a7 (diff) | |
parent | 0f6c048ce1a621ccd3e2080ec5aafbd053c516f4 (diff) |
Merge #1738
1738: :arrow_up: insta r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/completion/complete_keyword.rs')
-rw-r--r-- | crates/ra_ide_api/src/completion/complete_keyword.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/crates/ra_ide_api/src/completion/complete_keyword.rs b/crates/ra_ide_api/src/completion/complete_keyword.rs index 18c1839dc..c527a9f63 100644 --- a/crates/ra_ide_api/src/completion/complete_keyword.rs +++ b/crates/ra_ide_api/src/completion/complete_keyword.rs | |||
@@ -113,7 +113,7 @@ fn complete_return( | |||
113 | #[cfg(test)] | 113 | #[cfg(test)] |
114 | mod tests { | 114 | mod tests { |
115 | use crate::completion::{do_completion, CompletionItem, CompletionKind}; | 115 | use crate::completion::{do_completion, CompletionItem, CompletionKind}; |
116 | use insta::assert_debug_snapshot_matches; | 116 | use insta::assert_debug_snapshot; |
117 | 117 | ||
118 | fn do_keyword_completion(code: &str) -> Vec<CompletionItem> { | 118 | fn do_keyword_completion(code: &str) -> Vec<CompletionItem> { |
119 | do_completion(code, CompletionKind::Keyword) | 119 | do_completion(code, CompletionKind::Keyword) |
@@ -121,7 +121,7 @@ mod tests { | |||
121 | 121 | ||
122 | #[test] | 122 | #[test] |
123 | fn completes_keywords_in_use_stmt() { | 123 | fn completes_keywords_in_use_stmt() { |
124 | assert_debug_snapshot_matches!( | 124 | assert_debug_snapshot!( |
125 | do_keyword_completion( | 125 | do_keyword_completion( |
126 | r" | 126 | r" |
127 | use <|> | 127 | use <|> |
@@ -152,7 +152,7 @@ mod tests { | |||
152 | ]"### | 152 | ]"### |
153 | ); | 153 | ); |
154 | 154 | ||
155 | assert_debug_snapshot_matches!( | 155 | assert_debug_snapshot!( |
156 | do_keyword_completion( | 156 | do_keyword_completion( |
157 | r" | 157 | r" |
158 | use a::<|> | 158 | use a::<|> |
@@ -176,7 +176,7 @@ mod tests { | |||
176 | ]"### | 176 | ]"### |
177 | ); | 177 | ); |
178 | 178 | ||
179 | assert_debug_snapshot_matches!( | 179 | assert_debug_snapshot!( |
180 | do_keyword_completion( | 180 | do_keyword_completion( |
181 | r" | 181 | r" |
182 | use a::{b, <|>} | 182 | use a::{b, <|>} |
@@ -203,7 +203,7 @@ mod tests { | |||
203 | 203 | ||
204 | #[test] | 204 | #[test] |
205 | fn completes_various_keywords_in_function() { | 205 | fn completes_various_keywords_in_function() { |
206 | assert_debug_snapshot_matches!( | 206 | assert_debug_snapshot!( |
207 | do_keyword_completion( | 207 | do_keyword_completion( |
208 | r" | 208 | r" |
209 | fn quux() { | 209 | fn quux() { |
@@ -253,7 +253,7 @@ mod tests { | |||
253 | 253 | ||
254 | #[test] | 254 | #[test] |
255 | fn completes_else_after_if() { | 255 | fn completes_else_after_if() { |
256 | assert_debug_snapshot_matches!( | 256 | assert_debug_snapshot!( |
257 | do_keyword_completion( | 257 | do_keyword_completion( |
258 | r" | 258 | r" |
259 | fn quux() { | 259 | fn quux() { |
@@ -319,7 +319,7 @@ mod tests { | |||
319 | 319 | ||
320 | #[test] | 320 | #[test] |
321 | fn test_completion_return_value() { | 321 | fn test_completion_return_value() { |
322 | assert_debug_snapshot_matches!( | 322 | assert_debug_snapshot!( |
323 | do_keyword_completion( | 323 | do_keyword_completion( |
324 | r" | 324 | r" |
325 | fn quux() -> i32 { | 325 | fn quux() -> i32 { |
@@ -366,7 +366,7 @@ mod tests { | |||
366 | }, | 366 | }, |
367 | ]"### | 367 | ]"### |
368 | ); | 368 | ); |
369 | assert_debug_snapshot_matches!( | 369 | assert_debug_snapshot!( |
370 | do_keyword_completion( | 370 | do_keyword_completion( |
371 | r" | 371 | r" |
372 | fn quux() { | 372 | fn quux() { |
@@ -417,7 +417,7 @@ mod tests { | |||
417 | 417 | ||
418 | #[test] | 418 | #[test] |
419 | fn dont_add_semi_after_return_if_not_a_statement() { | 419 | fn dont_add_semi_after_return_if_not_a_statement() { |
420 | assert_debug_snapshot_matches!( | 420 | assert_debug_snapshot!( |
421 | do_keyword_completion( | 421 | do_keyword_completion( |
422 | r" | 422 | r" |
423 | fn quux() -> i32 { | 423 | fn quux() -> i32 { |
@@ -469,7 +469,7 @@ mod tests { | |||
469 | 469 | ||
470 | #[test] | 470 | #[test] |
471 | fn last_return_in_block_has_semi() { | 471 | fn last_return_in_block_has_semi() { |
472 | assert_debug_snapshot_matches!( | 472 | assert_debug_snapshot!( |
473 | do_keyword_completion( | 473 | do_keyword_completion( |
474 | r" | 474 | r" |
475 | fn quux() -> i32 { | 475 | fn quux() -> i32 { |
@@ -517,7 +517,7 @@ mod tests { | |||
517 | }, | 517 | }, |
518 | ]"### | 518 | ]"### |
519 | ); | 519 | ); |
520 | assert_debug_snapshot_matches!( | 520 | assert_debug_snapshot!( |
521 | do_keyword_completion( | 521 | do_keyword_completion( |
522 | r" | 522 | r" |
523 | fn quux() -> i32 { | 523 | fn quux() -> i32 { |
@@ -571,7 +571,7 @@ mod tests { | |||
571 | 571 | ||
572 | #[test] | 572 | #[test] |
573 | fn completes_break_and_continue_in_loops() { | 573 | fn completes_break_and_continue_in_loops() { |
574 | assert_debug_snapshot_matches!( | 574 | assert_debug_snapshot!( |
575 | do_keyword_completion( | 575 | do_keyword_completion( |
576 | r" | 576 | r" |
577 | fn quux() -> i32 { | 577 | fn quux() -> i32 { |
@@ -633,7 +633,7 @@ mod tests { | |||
633 | ); | 633 | ); |
634 | 634 | ||
635 | // No completion: lambda isolates control flow | 635 | // No completion: lambda isolates control flow |
636 | assert_debug_snapshot_matches!( | 636 | assert_debug_snapshot!( |
637 | do_keyword_completion( | 637 | do_keyword_completion( |
638 | r" | 638 | r" |
639 | fn quux() -> i32 { | 639 | fn quux() -> i32 { |
@@ -683,7 +683,7 @@ mod tests { | |||
683 | 683 | ||
684 | #[test] | 684 | #[test] |
685 | fn no_semi_after_break_continue_in_expr() { | 685 | fn no_semi_after_break_continue_in_expr() { |
686 | assert_debug_snapshot_matches!( | 686 | assert_debug_snapshot!( |
687 | do_keyword_completion( | 687 | do_keyword_completion( |
688 | r" | 688 | r" |
689 | fn f() { | 689 | fn f() { |