Merge #3722

3722: Fix parsing lambdas with return type r=matklad a=matklad

We should eat only a single block, and not whatever larger expression
may start with a block.

closes #3721



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 13 insertions, 7 deletions

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 2335d99b3..0d277a586 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -230,14 +230,20 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
     p.eat(T![async]);
     p.eat(T![move]);
     params::param_list_closure(p);
-    if opt_fn_ret_type(p) && !p.at(T!['{']) {
-        p.error("expected `{`");
-    }
-
-    if p.at_ts(EXPR_FIRST) {
-        expr(p);
+    if opt_fn_ret_type(p) {
+        if p.at(T!['{']) {
+            // test lambda_ret_block
+            // fn main() { || -> i32 { 92 }(); }
+            block_expr(p, None);
+        } else {
+            p.error("expected `{`");
+        }
     } else {
-        p.error("expected expression");
+        if p.at_ts(EXPR_FIRST) {
+            expr(p);
+        } else {
+            p.error("expected expression");
+        }
     }
     m.complete(p, LAMBDA_EXPR)
 }