From 200860794651c3dcae7dced3de1fe99bea2cd692 Mon Sep 17 00:00:00 2001
From: bellau <laurent.belmonte@gmail.com>
Date: Sat, 12 Feb 2022 16:07:58 +0100
Subject: [PATCH] support static move too

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

diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index 7f9b9768da..76d9b39d38 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs
@@ -74,7 +74,7 @@ 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![|] => closure_expr(p),
+        T![static] if la == T![|] || (la == T![move] && p.nth(2) == T![|]) => closure_expr(p),
         T![if] => if_expr(p),
 
         T![loop] => loop_expr(p, None),
@@ -236,6 +236,7 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
 //     move || {};
 //     async move || {};
 //     static || {};
+//     static move || {};
 // }
 fn closure_expr(p: &mut Parser) -> CompletedMarker {
     assert!(
@@ -244,11 +245,12 @@ fn closure_expr(p: &mut Parser) -> CompletedMarker {
             || (p.at(T![async]) && p.nth(1) == T![|])
             || (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![|])
     );
     let m = p.start();
     p.eat(T![async]);
-    p.eat(T![move]);
     p.eat(T![static]);
+    p.eat(T![move]);
     params::param_list_closure(p);
     if opt_ret_type(p) {
         // test lambda_ret_block
diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index ac39d470f8..e583ff782b 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 => consts::static_(p, m),
+        T![static] if (la != PIPE && la != T![move] ) => 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 4d7d325395..7d19891259 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
@@ -7,4 +7,5 @@ fn foo() {
     move || {};
     async move || {};
     static || {};
+    static 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 0ef0ee59b7..9b4c5d5299 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
@@ -149,6 +149,22 @@ SOURCE_FILE
                 L_CURLY "{"
                 R_CURLY "}"
           SEMICOLON ";"
+        WHITESPACE "\n    "
+        EXPR_STMT
+          CLOSURE_EXPR
+            STATIC_KW "static"
+            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"