Change parser

astral-sh · Aug 23, 2023 · 7c7990c · 7c7990c
1 parent b1df844
commit 7c7990c
Show file tree

Hide file tree

Showing 10 changed files with 3,939 additions and 500 deletions.
diff --git a/crates/ruff_python_formatter/bar.py b/crates/ruff_python_formatter/bar.py
@@ -0,0 +1,4 @@
+match d3:
+    case (  # d 3
+    x):
+        pass
diff --git a/crates/ruff_python_formatter/foo.py b/crates/ruff_python_formatter/foo.py
@@ -1,5 +1,8 @@
 match x:
-    case (1):
+    case (
+        # foo
+        1
+    ):
         y = 0
     case (1):
         y = 1
diff --git a/crates/ruff_python_formatter/src/comments/placement.rs b/crates/ruff_python_formatter/src/comments/placement.rs
@@ -1319,6 +1319,7 @@ fn handle_match_case_comment<'a>(
     comment: DecoratedComment<'a>,
     match_case: &'a MatchCase,
 ) -> CommentPlacement<'a> {
+    println!("handle_match_case_comment: {:?}", comment);
     if comment.line_position().is_end_of_line() && comment.start() < match_case.pattern.start() {
         CommentPlacement::dangling(comment.enclosing_node(), comment)
     } else {

diff --git a/crates/ruff_python_formatter/src/pattern/mod.rs b/crates/ruff_python_formatter/src/pattern/mod.rs
@@ -1,5 +1,7 @@
+use crate::expression::parentheses::parenthesized;
 use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule};
 use ruff_python_ast::Pattern;
+use std::slice;
 
 use crate::prelude::*;
 
@@ -17,7 +19,7 @@ pub struct FormatPattern;
 
 impl FormatRule<Pattern, PyFormatContext<'_>> for FormatPattern {
     fn fmt(&self, item: &Pattern, f: &mut PyFormatter) -> FormatResult<()> {
-        match item {
+        let format_pattern = format_with(|f| match item {
             Pattern::MatchValue(p) => p.format().fmt(f),
             Pattern::MatchSingleton(p) => p.format().fmt(f),
             Pattern::MatchSequence(p) => p.format().fmt(f),
@@ -26,7 +28,9 @@ impl FormatRule<Pattern, PyFormatContext<'_>> for FormatPattern {
             Pattern::MatchStar(p) => p.format().fmt(f),
             Pattern::MatchAs(p) => p.format().fmt(f),
             Pattern::MatchOr(p) => p.format().fmt(f),
-        }
+        });
+
+        format_pattern.fmt(f)
     }
 }
 

diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_value.rs
@@ -10,7 +10,7 @@ pub struct FormatPatternMatchValue;
 impl FormatNodeRule<PatternMatchValue> for FormatPatternMatchValue {
     fn fmt_fields(&self, item: &PatternMatchValue, f: &mut PyFormatter) -> FormatResult<()> {
         let PatternMatchValue { value, range: _ } = item;
-        let formatted = value.format().with_options(Parentheses::Preserve);
+        let formatted = value.format();
         write!(f, [formatted])
     }
 }
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
@@ -221,6 +221,31 @@ match foo:
         "b",
     ]:
         pass
+
+
+match foo:
+    case 1:
+        y = 0
+    case (1):
+        y = 1
+    case (  # comment
+        1
+    ):
+        y = 1
+    case (
+        # comment
+        1
+    ):
+        y = 1
+    case (
+        1  # comment
+    ):
+        y = 1
+    case (
+        1
+        # comment
+    ):
+        y = 1
 ```
 
 ## Output
@@ -434,6 +459,31 @@ match foo:
         "b",
     ]:
         pass
+
+
+match foo:
+    case 1:
+        y = 0
+    case (1):
+        y = 1
+    case (  # comment
+        1
+    ):
+        y = 1
+    case (
+        # comment
+        1
+    ):
+        y = 1
+    case (
+        1  # comment
+    ):
+        y = 1
+    case (
+        1
+        # comment
+    ):
+        y = 1
 ```