diff --git a/crates/ruff_python_formatter/src/pattern/mod.rs b/crates/ruff_python_formatter/src/pattern/mod.rs index ac763a41ffc8dc..a83e03ba4fd108 100644 --- a/crates/ruff_python_formatter/src/pattern/mod.rs +++ b/crates/ruff_python_formatter/src/pattern/mod.rs @@ -14,7 +14,6 @@ use crate::expression::parentheses::{ NeedsParentheses, OptionalParentheses, Parentheses, optional_parentheses, parenthesized, }; use crate::prelude::*; -use crate::preview::is_avoid_parens_for_long_as_captures_enabled; pub(crate) mod pattern_arguments; pub(crate) mod pattern_keyword; @@ -246,10 +245,7 @@ pub(crate) fn can_pattern_omit_optional_parentheses( | Pattern::MatchStar(_) | Pattern::MatchOr(_) => false, Pattern::MatchAs(PatternMatchAs { pattern, .. }) => match pattern { - Some(pattern) => { - is_avoid_parens_for_long_as_captures_enabled(context) - && has_parentheses_and_is_non_empty(pattern, context) - } + Some(pattern) => has_parentheses_and_is_non_empty(pattern, context), None => false, }, Pattern::MatchSequence(sequence) => { @@ -327,9 +323,7 @@ impl<'a> CanOmitOptionalParenthesesVisitor<'a> { self.first.set_if_none(First::Token); } Pattern::MatchAs(PatternMatchAs { pattern, .. }) => { - if let Some(pattern) = pattern - && is_avoid_parens_for_long_as_captures_enabled(context) - { + if let Some(pattern) = pattern { self.visit_sub_pattern(pattern, context); } } diff --git a/crates/ruff_python_formatter/src/preview.rs b/crates/ruff_python_formatter/src/preview.rs index ff94f66081ba99..f55d84e93c536e 100644 --- a/crates/ruff_python_formatter/src/preview.rs +++ b/crates/ruff_python_formatter/src/preview.rs @@ -44,15 +44,6 @@ pub(crate) const fn is_allow_newline_after_block_open_enabled(context: &PyFormat context.is_preview() } -/// Returns `true` if the -/// [`avoid_parens_for_long_as_captures`](https://github.com/astral-sh/ruff/pull/21176) preview -/// style is enabled. -pub(crate) const fn is_avoid_parens_for_long_as_captures_enabled( - context: &PyFormatContext, -) -> bool { - context.is_preview() -} - /// Returns `true` if the /// [`parenthesize_lambda_bodies`](https://github.com/astral-sh/ruff/pull/21385) preview style is /// enabled. 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 index a94ee5e636a5ba..b82715abdfdb45 100644 --- a/crates/ruff_python_formatter/tests/snapshots/format@statement__match.py.snap +++ b/crates/ruff_python_formatter/tests/snapshots/format@statement__match.py.snap @@ -1,6 +1,5 @@ --- source: crates/ruff_python_formatter/tests/fixtures.rs -input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/match.py --- ## Input ```python @@ -1345,15 +1344,13 @@ match guard_comments: match class_pattern: case Class(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) as capture: pass - case ( - Class(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) as capture - ): + case Class( + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + ) as capture: pass - case ( - Class( - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - ) as capture - ): + case Class( + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + ) as capture: pass case ( Class( @@ -1365,37 +1362,31 @@ match class_pattern: match sequence_pattern_brackets: case [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx] as capture: pass - case ( - [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx] as capture - ): + case [ + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + ] as capture: pass - case ( - [ - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - ] as capture - ): + case [ + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + ] as capture: pass match class_pattern: # 1 - case ( - Class(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) as capture - ): # 2 + case Class( + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + ) as capture: # 2 # 3 pass # 4 # 5 - case ( - Class( # 6 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 7 - ) as capture - ): # 8 + case Class( # 6 + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 7 + ) as capture: # 8 pass - case ( - Class( # 9 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 10 - ) as capture - ): # 11 + case Class( # 9 + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 10 + ) as capture: # 11 pass case ( Class( # 12 @@ -1403,111 +1394,10 @@ match class_pattern: ) as really_really_really_really_really_really_really_really_really_really_really_really_long_capture ): # 14 pass - case ( - Class( # 0 - # 1 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 2 - # 3 - ) as capture - ): + case Class( # 0 + # 1 + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 2 + # 3 + ) as capture: pass ``` - - -## Preview changes -```diff ---- Stable -+++ Preview -@@ -665,15 +665,13 @@ - match class_pattern: - case Class(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) as capture: - pass -- case ( -- Class(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) as capture -- ): -+ case Class( -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+ ) as capture: - pass -- case ( -- Class( -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -- ) as capture -- ): -+ case Class( -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+ ) as capture: - pass - case ( - Class( -@@ -685,37 +683,31 @@ - match sequence_pattern_brackets: - case [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx] as capture: - pass -- case ( -- [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx] as capture -- ): -+ case [ -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+ ] as capture: - pass -- case ( -- [ -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -- ] as capture -- ): -+ case [ -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+ ] as capture: - pass - - - match class_pattern: - # 1 -- case ( -- Class(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) as capture -- ): # 2 -+ case Class( -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+ ) as capture: # 2 - # 3 - pass # 4 - # 5 -- case ( -- Class( # 6 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 7 -- ) as capture -- ): # 8 -+ case Class( # 6 -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 7 -+ ) as capture: # 8 - pass -- case ( -- Class( # 9 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 10 -- ) as capture -- ): # 11 -+ case Class( # 9 -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 10 -+ ) as capture: # 11 - pass - case ( - Class( # 12 -@@ -723,11 +715,9 @@ - ) as really_really_really_really_really_really_really_really_really_really_really_really_long_capture - ): # 14 - pass -- case ( -- Class( # 0 -- # 1 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 2 -- # 3 -- ) as capture -- ): -+ case Class( # 0 -+ # 1 -+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # 2 -+ # 3 -+ ) as capture: - pass -```