mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-09 10:00:25 +00:00
4bce801065
## Summary Fixes https://github.com/astral-sh/ruff/issues/10267 The issue with the current formatting is that the formatter flips between the `SingleParenthesizedContextManager` and `ParenthesizeIfExpands` or `SingleWithTarget` because the layouts use incompatible formatting ( `SingleParenthesizedContextManager`: `maybe_parenthesize_expression(context)` vs `ParenthesizeIfExpands`: `parenthesize_if_expands(item)`, `SingleWithTarget`: `optional_parentheses(item)`. The fix is to ensure that the layouts between which the formatter flips when adding or removing parentheses are the same. I do this by introducing a new `SingleWithoutTarget` layout that uses the same formatting as `SingleParenthesizedContextManager` if it has no target and prefer `SingleWithoutTarget` over using `ParenthesizeIfExpands` or `SingleWithTarget`. ## Formatting change The downside is that we now use `maybe_parenthesize_expression` over `parenthesize_if_expands` for expressions where `can_omit_optional_parentheses` returns `false`. This can lead to stable formatting changes. I only found one formatting change in our ecosystem check and, unfortunately, this is necessary to fix the instability (and instability fixes are okay to have as part of minor changes according to our versioning policy) The benefit of the change is that `with` items with a single context manager and without a target are now formatted identically to how the same expression would be formatted in other clause headers. ## Test Plan I ran the ecosystem check locally |
||
|---|---|---|
| .. | ||
| clause.rs | ||
| mod.rs | ||
| stmt_ann_assign.rs | ||
| stmt_assert.rs | ||
| stmt_assign.rs | ||
| stmt_aug_assign.rs | ||
| stmt_break.rs | ||
| stmt_class_def.rs | ||
| stmt_continue.rs | ||
| stmt_delete.rs | ||
| stmt_expr.rs | ||
| stmt_for.rs | ||
| stmt_function_def.rs | ||
| stmt_global.rs | ||
| stmt_if.rs | ||
| stmt_import.rs | ||
| stmt_import_from.rs | ||
| stmt_ipy_escape_command.rs | ||
| stmt_match.rs | ||
| stmt_nonlocal.rs | ||
| stmt_pass.rs | ||
| stmt_raise.rs | ||
| stmt_return.rs | ||
| stmt_try.rs | ||
| stmt_type_alias.rs | ||
| stmt_while.rs | ||
| stmt_with.rs | ||
| suite.rs | ||