Fix handling of standalone match/case with newlines/comments (#2760)

Resolves #2759

diff --git a/CHANGES.md b/CHANGES.md
index a1c8ccb0b7d739b5449b2f21c0ffab5510c11221..748dbca70195620e85f96aec5b7455600bc2e51d 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,8 @@
   be formatted. (#2526)
 - Speed-up the new backtracking parser about 4X in general (enabled when
   `--target-version` is set to 3.10 and higher). (#2728)
   be formatted. (#2526)
 - Speed-up the new backtracking parser about 4X in general (enabled when
   `--target-version` is set to 3.10 and higher). (#2728)

+- Fix handling of standalone `match()` or `case()` when there is a trailing newline or a
+  comment inside of the parentheses. (#2760)

 
 ### Packaging
 
 
 ### Packaging
 

diff --git a/src/blib2to3/pgen2/parse.py b/src/blib2to3/pgen2/parse.py
index 8fe9667289796bf16d2186b17a81a3b8cf1a6ece..4a23d538b493659a448d941bcc3801fc2abd5b82 100644 (file)
--- a/src/blib2to3/pgen2/parse.py
+++ b/src/blib2to3/pgen2/parse.py
@@ -269,6 +269,10 @@ class Parser(object):
                     break
 
                 next_token_type, next_token_value, *_ = proxy.eat(counter)
                     break
 
                 next_token_type, next_token_value, *_ = proxy.eat(counter)

+                if next_token_type in (tokenize.COMMENT, tokenize.NL):
+                    counter += 1
+                    continue
+

                 if next_token_type == tokenize.OP:
                     next_token_type = grammar.opmap[next_token_value]
 
                 if next_token_type == tokenize.OP:
                     next_token_type = grammar.opmap[next_token_value]
 

diff --git a/tests/data/pattern_matching_style.py b/tests/data/pattern_matching_style.py
index c1c0aeedb70391de28543ef62ff013b29b2a9b16..8e18ce2ada6dda70dd8c82d2733034b807e44384 100644 (file)
--- a/tests/data/pattern_matching_style.py
+++ b/tests/data/pattern_matching_style.py
@@ -6,10 +6,52 @@ match something:
     ): print(1)
     case c(
         very_complex=True,
     ): print(1)
     case c(
         very_complex=True,

-        perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1
+        perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1,

     ): print(2)
     case a: pass
 
     ): print(2)
     case a: pass
 

+match(
+    arg # comment
+)
+
+match(
+)
+
+match(
+
+
+)
+
+case(
+    arg # comment
+)
+
+case(
+)
+
+case(
+
+
+)
+
+
+re.match(
+    something # fast
+)
+re.match(
+
+
+
+)
+match match(
+
+
+):
+    case case(
+        arg, # comment
+    ):
+        pass
+

 # output
 
 match something:
 # output
 
 match something:


@@ -20,8 +62,30 @@ match something:
     ):
         print(1)
     case c(
     ):
         print(1)
     case c(

-        very_complex=True, perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1
+        very_complex=True,
+        perhaps_even_loooooooooooooooooooooooooooooooooooooong=-1,

     ):
         print(2)
     case a:
         pass
     ):
         print(2)
     case a:
         pass

+
+match(arg)  # comment
+
+match()
+
+match()
+
+case(arg)  # comment
+
+case()
+
+case()
+
+
+re.match(something)  # fast
+re.match()
+match match():
+    case case(
+        arg,  # comment
+    ):
+        pass