Clean-up

Author: charliermarsh

crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/ann_assign.py

@@ -24,11 +24,12 @@ class DefaultRunner:
     task_runner_cls: TaskRunnerProtocol | typing.Callable[[], typing.Any] = DefaultTaskRunner
 
 
-# Regression test: Preserve parentheses around invalid type expressions.
+# Preserve parentheses around invalid type expressions.
 def preserve_invalid_type_expressions_in_annotations():
     named: (value := int) = 1
     yielded_with_value: (yield 1) = 1
     yielded: (yield 1)
+    yielded_from: (yield from iter) = 1
 
 
 async def preserve_invalid_type_expressions_in_async_annotations():

crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/function.py

@@ -563,3 +563,16 @@ def args_with_type_annotations_no_after_colon_comment(
     int # trailing type
     # after type
     ): pass
+
+
+# Preserve parentheses around invalid type expressions in parameter annotations.
+def preserve_named_param_annotation(x: (value := int)):
+    pass
+
+
+def preserve_yield_param_annotation(x: (yield 1)):
+    pass
+
+
+async def preserve_await_param_annotation(x: (await g())):
+    pass

crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/return_annotation.py

@@ -194,6 +194,6 @@ def process_board_action(
     pass
 
 
-# Regression test: Preserve parentheses around invalid type expressions.
+# Preserve parentheses around invalid type expressions.
 async def preserve_await_return_annotation() -> (await g()):
     pass

crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/type_alias.py

@@ -151,7 +151,7 @@
 type long_bound_short_default[T: (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbb, ccccccccccc, ddddddddddddd, eeeeeee)=a]=int
 type short_bound_long_default[T:a= (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbb, ccccccccccc, ddddddddddddd, eeeeeee)]=int
 
-# Regression test: Preserve parentheses around invalid type expressions.
+# Preserve parentheses around invalid type expressions.
 type NamedExprValue = (value := int)
 
 async def preserve_await_type_alias_value():

crates/ruff_python_formatter/src/expression/expr_await.rs

@@ -2,7 +2,6 @@ use ruff_formatter::write;
 use ruff_python_ast::AnyNodeRef;
 use ruff_python_ast::ExprAwait;
 
-use crate::expression::is_type_expression_parent;
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::{
     NeedsParentheses, OptionalParentheses, Parenthesize, is_expression_parenthesized,
@@ -37,7 +36,7 @@ impl NeedsParentheses for ExprAwait {
         parent: AnyNodeRef,
         context: &PyFormatContext,
     ) -> OptionalParentheses {
-        if parent.is_expr_await() || is_type_expression_parent(parent) {
+        if parent.is_expr_await() {
             OptionalParentheses::Always
         } else if is_expression_parenthesized(
             self.value.as_ref().into(),

crates/ruff_python_formatter/src/expression/expr_named.rs

@@ -3,7 +3,6 @@ use ruff_python_ast::AnyNodeRef;
 use ruff_python_ast::ExprNamed;
 
 use crate::comments::dangling_comments;
-use crate::expression::is_type_expression_parent;
 use crate::expression::parentheses::{
     NeedsParentheses, OptionalParentheses, in_parentheses_only_soft_line_break_or_space,
 };
@@ -54,8 +53,7 @@ impl NeedsParentheses for ExprNamed {
     ) -> OptionalParentheses {
         // Unlike tuples, named expression parentheses are not part of the range even when
         // mandatory. See [PEP 572](https://peps.python.org/pep-0572/) for details.
-        if is_type_expression_parent(parent)
-            || parent.is_stmt_ann_assign()
+        if parent.is_stmt_ann_assign()
             || parent.is_stmt_assign()
             || parent.is_stmt_aug_assign()
             || parent.is_stmt_assert()
@@ -67,6 +65,7 @@ impl NeedsParentheses for ExprNamed {
             || parent.is_expr_await()
             || parent.is_stmt_delete()
             || parent.is_stmt_for()
+            || parent.is_stmt_function_def()
             || parent.is_expr_lambda()
         {
             OptionalParentheses::Always

crates/ruff_python_formatter/src/expression/expr_yield.rs

@@ -3,7 +3,6 @@ use ruff_python_ast::AnyNodeRef;
 use ruff_python_ast::{Expr, ExprYield, ExprYieldFrom};
 use ruff_text_size::{Ranged, TextRange};
 
-use crate::expression::is_type_expression_parent;
 use crate::expression::maybe_parenthesize_expression;
 use crate::expression::parentheses::{
     NeedsParentheses, OptionalParentheses, Parenthesize, is_expression_parenthesized,
@@ -43,10 +42,6 @@ impl NeedsParentheses for AnyExpressionYield<'_> {
         parent: AnyNodeRef,
         context: &PyFormatContext,
     ) -> OptionalParentheses {
-        if is_type_expression_parent(parent) {
-            return OptionalParentheses::Always;
-        }
-
         // According to https://docs.python.org/3/reference/grammar.html There are two situations
         // where we do not want to always parenthesize a yield expression:
         //  1. Right hand side of an assignment, e.g. `x = yield y`

crates/ruff_python_formatter/src/expression/mod.rs

@@ -1452,19 +1452,6 @@ pub(crate) const fn is_invalid_type_expression(expr: &Expr) -> bool {
     )
 }
 
-/// Returns `true` if `parent` represents a type-expression position.
-pub(crate) const fn is_type_expression_parent(parent: AnyNodeRef) -> bool {
-    matches!(
-        parent,
-        AnyNodeRef::StmtFunctionDef(_)
-            | AnyNodeRef::StmtTypeAlias(_)
-            | AnyNodeRef::Parameter(_)
-            | AnyNodeRef::TypeParamTypeVar(_)
-            | AnyNodeRef::TypeParamTypeVarTuple(_)
-            | AnyNodeRef::TypeParamParamSpec(_)
-    )
-}
-
 /// Returns the sub-expression to which the left-most character in expression belongs.
 ///
 /// For example, in the expression `a + b * c`, the left-most subexpression is `a`. But for

crates/ruff_python_formatter/tests/snapshots/format@statement__ann_assign.py.snap

@@ -29,11 +29,12 @@ class DefaultRunner:
     task_runner_cls: TaskRunnerProtocol | typing.Callable[[], typing.Any] = DefaultTaskRunner
 
 
-# Regression test: Preserve parentheses around invalid type expressions.
+# Preserve parentheses around invalid type expressions.
 def preserve_invalid_type_expressions_in_annotations():
     named: (value := int) = 1
     yielded_with_value: (yield 1) = 1
     yielded: (yield 1)
+    yielded_from: (yield from iter) = 1
 
 
 async def preserve_invalid_type_expressions_in_async_annotations():
@@ -81,11 +82,12 @@ class DefaultRunner:
     )
 
 
-# Regression test: Preserve parentheses around invalid type expressions.
+# Preserve parentheses around invalid type expressions.
 def preserve_invalid_type_expressions_in_annotations():
     named: (value := int) = 1
     yielded_with_value: (yield 1) = 1
     yielded: (yield 1)
+    yielded_from: (yield from iter) = 1
 
 
 async def preserve_invalid_type_expressions_in_async_annotations():

crates/ruff_python_formatter/tests/snapshots/format@statement__function.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/function.py
 ---
 ## Input
 ```python
@@ -569,6 +568,19 @@ def args_with_type_annotations_no_after_colon_comment(
     int # trailing type
     # after type
     ): pass
+
+
+# Preserve parentheses around invalid type expressions in parameter annotations.
+def preserve_named_param_annotation(x: (value := int)):
+    pass
+
+
+def preserve_yield_param_annotation(x: (yield 1)):
+    pass
+
+
+async def preserve_await_param_annotation(x: (await g())):
+    pass
 ```
 
 ## Output
@@ -1318,6 +1330,19 @@ def args_with_type_annotations_no_after_colon_comment(
     # after type
 ):
     pass
+
+
+# Preserve parentheses around invalid type expressions in parameter annotations.
+def preserve_named_param_annotation(x: (value := int)):
+    pass
+
+
+def preserve_yield_param_annotation(x: (yield 1)):
+    pass
+
+
+async def preserve_await_param_annotation(x: (await g())):
+    pass
 ```