Misc. follow-ups to single-element tuple patterns (#7698)

Just changes to internal comments and tests. See comments in #7683.
astral-sh · Sep 28, 2023 · 46b85ab · 46b85ab
1 parent 1c02fcd
commit 46b85ab
Show file tree

Hide file tree

Showing 3 changed files with 140 additions and 1 deletion.
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/match.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/match.py
@@ -522,3 +522,45 @@ def foo():
 
     case a, b,:
         pass
+
+    case (a,  # comment
+        ):
+        pass
+
+    case (a, b  # comment
+            ):
+        pass
+
+    case (a, b,  # comment
+            ):
+        pass
+
+    case (  # comment
+        a,
+    ):
+        pass
+
+    case (  # comment
+        a, b
+    ):
+        pass
+
+    case (  # comment
+        a, b,
+    ):
+        pass
+
+    case (
+        # comment
+        a,):
+        pass
+
+    case (
+        # comment
+        a, b):
+        pass
+
+    case (
+        # comment
+        a, b,):
+        pass
diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs
@@ -22,7 +22,8 @@ impl FormatNodeRule<PatternMatchSequence> for FormatPatternMatchSequence {
         let sequence_type = SequenceType::from_pattern(item, f.context().source());
 
         match (patterns.as_slice(), sequence_type) {
-            // If the sequence is empty, the parentheses with any dangling comments.
+            // If the sequence is empty, format the empty parentheses, along with any dangling
+            // comments.
             ([], SequenceType::Tuple | SequenceType::TupleNoParens) => {
                 return empty_parenthesized("(", dangling, ")").fmt(f)
             }

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@statement__match.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@statement__match.py.snap
@@ -528,6 +528,48 @@ match pattern:
 
     case a, b,:
         pass
+
+    case (a,  # comment
+        ):
+        pass
+
+    case (a, b  # comment
+            ):
+        pass
+
+    case (a, b,  # comment
+            ):
+        pass
+
+    case (  # comment
+        a,
+    ):
+        pass
+
+    case (  # comment
+        a, b
+    ):
+        pass
+
+    case (  # comment
+        a, b,
+    ):
+        pass
+
+    case (
+        # comment
+        a,):
+        pass
+
+    case (
+        # comment
+        a, b):
+        pass
+
+    case (
+        # comment
+        a, b,):
+        pass
 ```
 
 ## Output
@@ -1086,6 +1128,60 @@ match pattern:
         b,
     ):
         pass
+
+    case (
+        a,  # comment
+    ):
+        pass
+
+    case (
+        a,
+        b,  # comment
+    ):
+        pass
+
+    case (
+        a,
+        b,  # comment
+    ):
+        pass
+
+    case (  # comment
+        a,
+    ):
+        pass
+
+    case (  # comment
+        a,
+        b,
+    ):
+        pass
+
+    case (  # comment
+        a,
+        b,
+    ):
+        pass
+
+    case (
+        # comment
+        a,
+    ):
+        pass
+
+    case (
+        # comment
+        a,
+        b,
+    ):
+        pass
+
+    case (
+        # comment
+        a,
+        b,
+    ):
+        pass
 ```