@@ -75,11 +75,6 @@ pub(crate) fn complete_postfix(
75
75
76
76
let try_enum = TryEnum :: from_ty ( & ctx. sema , & receiver_ty. strip_references ( ) ) ;
77
77
if let Some ( try_enum) = & try_enum {
78
- let in_loop = dot_receiver
79
- . syntax ( )
80
- . ancestors ( )
81
- . any ( |n| matches ! ( n. kind( ) , WHILE_EXPR | LOOP_EXPR | FOR_EXPR ) ) ;
82
-
83
78
match try_enum {
84
79
TryEnum :: Result => {
85
80
postfix_snippet (
@@ -92,11 +87,7 @@ pub(crate) fn complete_postfix(
92
87
postfix_snippet (
93
88
"lete" ,
94
89
"let Ok else {}" ,
95
- & if in_loop {
96
- format ! ( "let Ok($1) = {receiver_text} else {{\n ${{2|continue,break,return|}};\n }};\n $0" )
97
- } else {
98
- format ! ( "let Ok($1) = {receiver_text} else {{\n ${{2:return}};\n }};\n $0" )
99
- } ,
90
+ & format ! ( "let Ok($1) = {receiver_text} else {{\n $2\n }};\n $0" ) ,
100
91
)
101
92
. add_to ( acc, ctx. db ) ;
102
93
@@ -118,11 +109,7 @@ pub(crate) fn complete_postfix(
118
109
postfix_snippet (
119
110
"lete" ,
120
111
"let Some else {}" ,
121
- & if in_loop {
122
- format ! ( "let Some($1) = {receiver_text} else {{\n ${{2|continue,break,return|}};\n }};\n $0" )
123
- } else {
124
- format ! ( "let Some($1) = {receiver_text} else {{\n ${{2:return}};\n }};\n $0" )
125
- } ,
112
+ & format ! ( "let Some($1) = {receiver_text} else {{\n $2\n }};\n $0" ) ,
126
113
)
127
114
. add_to ( acc, ctx. db ) ;
128
115
@@ -511,36 +498,9 @@ fn main() {
511
498
fn main() {
512
499
let bar = Some(true);
513
500
let Some($1) = bar else {
514
- ${2:return};
515
- };
516
- $0
517
- }
518
- "# ,
519
- ) ;
520
- }
521
-
522
- #[ test]
523
- fn option_letelse_loop ( ) {
524
- check_edit (
525
- "lete" ,
526
- r#"
527
- //- minicore: option
528
- fn main() {
529
- let bar = Some(true);
530
- loop {
531
- bar.$0
532
- }
533
- }
534
- "# ,
535
- r#"
536
- fn main() {
537
- let bar = Some(true);
538
- loop {
539
- let Some($1) = bar else {
540
- ${2|continue,break,return|};
501
+ $2
541
502
};
542
503
$0
543
- }
544
504
}
545
505
"# ,
546
506
) ;
0 commit comments