From ccab6afabc931ff323a6d0199b157e03f6c3d180 Mon Sep 17 00:00:00 2001
From: bellau <laurent.belmonte@gmail.com>
Date: Sat, 12 Feb 2022 15:17:10 +0100
Subject: [PATCH] Fix  Immovable generator syntax (static ||) not recognized
 #11448

---
 crates/parser/src/grammar/expressions/atom.rs      |  4 ++++
 crates/parser/src/grammar/items.rs                 |  2 +-
 .../test_data/parser/inline/ok/0106_lambda_expr.rs |  1 +
 .../parser/inline/ok/0106_lambda_expr.txt          | 14 ++++++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index 640caa0778..7f9b9768da 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs
@@ -74,6 +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![if] => if_expr(p),
 
         T![loop] => loop_expr(p, None),
@@ -234,6 +235,7 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
 //     async || {};
 //     move || {};
 //     async move || {};
+//     static || {};
 // }
 fn closure_expr(p: &mut Parser) -> CompletedMarker {
     assert!(
@@ -241,10 +243,12 @@ fn closure_expr(p: &mut Parser) -> CompletedMarker {
             || (p.at(T![move]) && p.nth(1) == T![|])
             || (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![|])
     );
     let m = p.start();
     p.eat(T![async]);
     p.eat(T![move]);
+    p.eat(T![static]);
     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 896efaf375..ab3c8a8a8b 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] => consts::static_(p, m),
+        T![static] if (la != PIPE ) => 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 0757178239..4d7d325395 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
@@ -6,4 +6,5 @@ fn foo() {
     async || {};
     move || {};
     async move || {};
+    static || {};
 }
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 4571788948..0ef0ee59b7 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
@@ -135,6 +135,20 @@ SOURCE_FILE
                 L_CURLY "{"
                 R_CURLY "}"
           SEMICOLON ";"
+        WHITESPACE "\n    "
+        EXPR_STMT
+          CLOSURE_EXPR
+            STATIC_KW "static"
+            WHITESPACE " "
+            PARAM_LIST
+              PIPE "|"
+              PIPE "|"
+            WHITESPACE " "
+            BLOCK_EXPR
+              STMT_LIST
+                L_CURLY "{"
+                R_CURLY "}"
+          SEMICOLON ";"
         WHITESPACE "\n"
         R_CURLY "}"
   WHITESPACE "\n"