From 0a18a050b50da53145e43fea9b403eec23ca36c7 Mon Sep 17 00:00:00 2001
From: bellau <laurent.belmonte@gmail.com>
Date: Sun, 13 Feb 2022 09:09:44 +0100
Subject: [PATCH] fix handle static async and static async move

---
 crates/parser/src/grammar/expressions/atom.rs | 19 +++++++++--
 crates/parser/src/grammar/items.rs            |  2 +-
 .../parser/inline/ok/0106_lambda_expr.rs      |  2 ++
 .../parser/inline/ok/0106_lambda_expr.txt     | 34 +++++++++++++++++++
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index 76d9b39d385..b4d88f8d0ed 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs
@@ -74,7 +74,14 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
         T![|] => closure_expr(p),
         T![move] if la == T![|] => closure_expr(p),
         T![async] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
-        T![static] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
+        T![static]
+            if la == T![|]
+                || (la == T![move] && p.nth(2) == T![|])
+                || (la == T![async] && p.nth(2) == T![|])
+                || (la == T![async] && p.nth(2) == T![move] && p.nth(3) == T![|]) =>
+        {
+            closure_expr(p)
+        }
         T![if] => if_expr(p),
 
         T![loop] => loop_expr(p, None),
@@ -237,6 +244,8 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
 //     async move || {};
 //     static || {};
 //     static move || {};
+//     static async || {};
+//     static async move || {};
 // }
 fn closure_expr(p: &mut Parser) -> CompletedMarker {
     assert!(
@@ -246,10 +255,15 @@ fn closure_expr(p: &mut Parser) -> CompletedMarker {
             || (p.at(T![async]) && p.nth(1) == T![move] && p.nth(2) == T![|])
             || (p.at(T![static]) && p.nth(1) == T![|])
             || (p.at(T![static]) && p.nth(1) == T![move] && p.nth(2) == T![|])
+            || (p.at(T![static]) && p.nth(1) == T![async] && p.nth(2) == T![|])
+            || (p.at(T![static])
+                && p.nth(1) == T![async]
+                && p.nth(2) == T![move]
+                && p.nth(3) == T![|])
     );
     let m = p.start();
-    p.eat(T![async]);
     p.eat(T![static]);
+    p.eat(T![async]);
     p.eat(T![move]);
     params::param_list_closure(p);
     if opt_ret_type(p) {
@@ -257,6 +271,7 @@ fn closure_expr(p: &mut Parser) -> CompletedMarker {
         // fn main() { || -> i32 { 92 }(); }
         block_expr(p);
     } else if p.at_ts(EXPR_FIRST) {
+        println!("gg");
         expr(p);
     } else {
         p.error("expected expression");
diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index 066e809c148..c9e5d42392e 100644
--- a/crates/parser/src/grammar/items.rs
+++ b/crates/parser/src/grammar/items.rs
@@ -230,7 +230,7 @@ fn opt_item_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
         IDENT if p.at_contextual_kw(T![macro_rules]) && p.nth(1) == BANG => macro_rules(p, m),
 
         T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::konst(p, m),
-        T![static] if (la != PIPE && la != T![move]) => consts::static_(p, m),
+        T![static] if (la != PIPE && la != T![move] && la != T![async]) => consts::static_(p, m),
 
         _ => return Err(m),
     };
diff --git a/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs b/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs
index 7d19891259f..d01f9216642 100644
--- a/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs
+++ b/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.rs
@@ -8,4 +8,6 @@ fn foo() {
     async move || {};
     static || {};
     static move || {};
+    static async || {};
+    static async move || {};
 }
diff --git a/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt b/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt
index 9b4c5d52995..bc54b018697 100644
--- a/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt
+++ b/crates/parser/test_data/parser/inline/ok/0106_lambda_expr.txt
@@ -165,6 +165,40 @@ SOURCE_FILE
                 L_CURLY "{"
                 R_CURLY "}"
           SEMICOLON ";"
+        WHITESPACE "\n    "
+        EXPR_STMT
+          CLOSURE_EXPR
+            STATIC_KW "static"
+            WHITESPACE " "
+            ASYNC_KW "async"
+            WHITESPACE " "
+            PARAM_LIST
+              PIPE "|"
+              PIPE "|"
+            WHITESPACE " "
+            BLOCK_EXPR
+              STMT_LIST
+                L_CURLY "{"
+                R_CURLY "}"
+          SEMICOLON ";"
+        WHITESPACE "\n    "
+        EXPR_STMT
+          CLOSURE_EXPR
+            STATIC_KW "static"
+            WHITESPACE " "
+            ASYNC_KW "async"
+            WHITESPACE " "
+            MOVE_KW "move"
+            WHITESPACE " "
+            PARAM_LIST
+              PIPE "|"
+              PIPE "|"
+            WHITESPACE " "
+            BLOCK_EXPR
+              STMT_LIST
+                L_CURLY "{"
+                R_CURLY "}"
+          SEMICOLON ";"
         WHITESPACE "\n"
         R_CURLY "}"
   WHITESPACE "\n"