Preserve `kwarg` flag and fix up f5c904c2a9

(cherry picked from commit c8d0bf0156878df03a71fffc97c44abf7333d5d7)

2 files changed, 4 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index d249039024..d34d3f9adb 100644
--- a/parse.y
+++ b/parse.y
@@ -3940,11 +3940,13 @@ p_expr_basic	: p_value
 		| tLBRACE
 		    {
 			$<tbl>$ = push_pktbl(p);
+			$<num>1 = p->in_kwarg;
 			p->in_kwarg = 0;
 		    }
 		  p_kwargs rbrace
 		    {
 			pop_pktbl(p, $<tbl>2);
+			p->in_kwarg = $<num>1;
 			$$ = new_hash_pattern(p, Qnone, $3, &@$);
 		    }
 		| tLBRACE rbrace
diff --git a/test/ruby/test_pattern_matching.rb b/test/ruby/test_pattern_matching.rb
index 3eea523416..3c4314bbe4 100644
--- a/test/ruby/test_pattern_matching.rb
+++ b/test/ruby/test_pattern_matching.rb
@@ -1060,6 +1060,8 @@ END
       in {a:
             2}
         false
+      in a: {b:}, c:
+        p c
       in {a:
       }
         _a = a