## Motivation
While black keeps parentheses nearly everywhere, the notable exception
is in the body of for loops:
```python
for (a, b) in x:
pass
```
becomes
```python
for a, b in x:
pass
```
This currently blocks #5163, which this PR should unblock.
## Solution
This changes the `ExprTuple` formatting option to include one additional
option that removes the parentheses when not using magic trailing comma
and not breaking. It is supposed to be used through
```rust
#[derive(Debug)]
struct ExprTupleWithoutParentheses<'a>(&'a Expr);
impl Format<PyFormatContext<'_>> for ExprTupleWithoutParentheses<'_> {
fn fmt(&self, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
match self.0 {
Expr::Tuple(expr_tuple) => expr_tuple
.format()
.with_options(TupleParentheses::StripInsideForLoop)
.fmt(f),
other => other.format().with_options(Parenthesize::IfBreaks).fmt(f),
}
}
}
```
## Testing
The for loop formatting isn't merged due to missing this (and i didn't
want to create more git weirdness across two people), but I've confirmed
that when applying this to while loops instead of for loops, then
```rust
write!(
f,
[
text("while"),
space(),
ExprTupleWithoutParentheses(test.as_ref()),
text(":"),
trailing_comments(trailing_condition_comments),
block_indent(&body.format())
]
)?;
```
makes
```python
while (a, b):
pass
while (
ajssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssa,
b,
):
pass
while (a,b,):
pass
```
formatted as
```python
while a, b:
pass
while (
ajssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssa,
b,
):
pass
while (
a,
b,
):
pass
```
210 lines
6.8 KiB
Rust
210 lines
6.8 KiB
Rust
use crate::comments::{dangling_node_comments, Comments};
|
|
use crate::context::PyFormatContext;
|
|
use crate::expression::parentheses::{
|
|
default_expression_needs_parentheses, NeedsParentheses, Parentheses, Parenthesize,
|
|
};
|
|
use crate::trivia::Token;
|
|
use crate::trivia::{first_non_trivia_token, TokenKind};
|
|
use crate::{AsFormat, FormatNodeRule, FormattedIterExt, PyFormatter, USE_MAGIC_TRAILING_COMMA};
|
|
use ruff_formatter::formatter::Formatter;
|
|
use ruff_formatter::prelude::{
|
|
block_indent, group, if_group_breaks, soft_block_indent, soft_line_break_or_space, text,
|
|
};
|
|
use ruff_formatter::{format_args, write, Buffer, Format, FormatResult, FormatRuleWithOptions};
|
|
use ruff_python_ast::prelude::{Expr, Ranged};
|
|
use ruff_text_size::TextRange;
|
|
use rustpython_parser::ast::ExprTuple;
|
|
|
|
#[derive(Eq, PartialEq, Debug, Default)]
|
|
pub enum TupleParentheses {
|
|
/// Effectively `None` in `Option<Parentheses>`
|
|
#[default]
|
|
Default,
|
|
/// Effectively `Some(Parentheses)` in `Option<Parentheses>`
|
|
Expr(Parentheses),
|
|
/// Handle the special case where we remove parentheses even if they were initially present
|
|
///
|
|
/// Normally, black keeps parentheses, but in the case of loops it formats
|
|
/// ```python
|
|
/// for (a, b) in x:
|
|
/// pass
|
|
/// ```
|
|
/// to
|
|
/// ```python
|
|
/// for a, b in x:
|
|
/// pass
|
|
/// ```
|
|
/// Black still does use parentheses in this position if the group breaks or magic trailing
|
|
/// comma is used.
|
|
StripInsideForLoop,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
pub struct FormatExprTuple {
|
|
parentheses: TupleParentheses,
|
|
}
|
|
|
|
impl FormatRuleWithOptions<ExprTuple, PyFormatContext<'_>> for FormatExprTuple {
|
|
type Options = TupleParentheses;
|
|
|
|
fn with_options(mut self, options: Self::Options) -> Self {
|
|
self.parentheses = options;
|
|
self
|
|
}
|
|
}
|
|
|
|
impl FormatNodeRule<ExprTuple> for FormatExprTuple {
|
|
fn fmt_fields(&self, item: &ExprTuple, f: &mut PyFormatter) -> FormatResult<()> {
|
|
let ExprTuple {
|
|
range,
|
|
elts,
|
|
ctx: _,
|
|
} = item;
|
|
|
|
// Handle the edge cases of an empty tuple and a tuple with one element
|
|
let last = match &elts[..] {
|
|
[] => {
|
|
return write!(
|
|
f,
|
|
[
|
|
// An empty tuple always needs parentheses, but does not have a comma
|
|
&text("("),
|
|
block_indent(&dangling_node_comments(item)),
|
|
&text(")"),
|
|
]
|
|
);
|
|
}
|
|
[single] => {
|
|
return write!(
|
|
f,
|
|
[group(&format_args![
|
|
// A single element tuple always needs parentheses and a trailing comma
|
|
&text("("),
|
|
soft_block_indent(&format_args![single.format(), &text(",")]),
|
|
&text(")"),
|
|
])]
|
|
);
|
|
}
|
|
[.., last] => last,
|
|
};
|
|
|
|
let magic_trailing_comma = USE_MAGIC_TRAILING_COMMA
|
|
&& matches!(
|
|
first_non_trivia_token(last.range().end(), f.context().contents()),
|
|
Some(Token {
|
|
kind: TokenKind::Comma,
|
|
..
|
|
})
|
|
);
|
|
|
|
if magic_trailing_comma {
|
|
// A magic trailing comma forces us to print in expanded mode since we have more than
|
|
// one element
|
|
write!(
|
|
f,
|
|
[
|
|
// An expanded group always needs parentheses
|
|
&text("("),
|
|
block_indent(&ExprSequence::new(elts)),
|
|
&text(")"),
|
|
]
|
|
)?;
|
|
} else if is_parenthesized(*range, elts, f)
|
|
&& self.parentheses != TupleParentheses::StripInsideForLoop
|
|
{
|
|
// If the tuple has parentheses, we generally want to keep them. The exception are for
|
|
// loops, see `TupleParentheses::StripInsideForLoop` doc comment.
|
|
//
|
|
// Unlike other expression parentheses, tuple parentheses are part of the range of the
|
|
// tuple itself.
|
|
write!(
|
|
f,
|
|
[group(&format_args![
|
|
// If there were previously parentheses, keep them
|
|
&text("("),
|
|
soft_block_indent(&ExprSequence::new(elts)),
|
|
&text(")"),
|
|
])]
|
|
)?;
|
|
} else {
|
|
write!(
|
|
f,
|
|
[group(&format_args![
|
|
// If there were previously no parentheses, add them only if the group breaks
|
|
if_group_breaks(&text("(")),
|
|
soft_block_indent(&ExprSequence::new(elts)),
|
|
if_group_breaks(&text(")")),
|
|
])]
|
|
)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn fmt_dangling_comments(&self, _node: &ExprTuple, _f: &mut PyFormatter) -> FormatResult<()> {
|
|
// Handled in `fmt_fields`
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct ExprSequence<'a> {
|
|
elts: &'a [Expr],
|
|
}
|
|
|
|
impl<'a> ExprSequence<'a> {
|
|
const fn new(elts: &'a [Expr]) -> Self {
|
|
Self { elts }
|
|
}
|
|
}
|
|
|
|
impl Format<PyFormatContext<'_>> for ExprSequence<'_> {
|
|
fn fmt(&self, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
|
|
f.join_with(&format_args!(text(","), soft_line_break_or_space()))
|
|
.entries(self.elts.iter().formatted())
|
|
.finish()?;
|
|
// Black style has a trailing comma on the last entry of an expanded group
|
|
write!(f, [if_group_breaks(&text(","))])
|
|
}
|
|
}
|
|
|
|
impl NeedsParentheses for ExprTuple {
|
|
fn needs_parentheses(
|
|
&self,
|
|
parenthesize: Parenthesize,
|
|
source: &str,
|
|
comments: &Comments,
|
|
) -> Parentheses {
|
|
match default_expression_needs_parentheses(self.into(), parenthesize, source, comments) {
|
|
Parentheses::Optional => Parentheses::Never,
|
|
parentheses => parentheses,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Check if a tuple has already had parentheses in the input
|
|
fn is_parenthesized(
|
|
tuple_range: TextRange,
|
|
elts: &[Expr],
|
|
f: &mut Formatter<PyFormatContext<'_>>,
|
|
) -> bool {
|
|
let parentheses = '(';
|
|
let first_char = &f.context().contents()[usize::from(tuple_range.start())..]
|
|
.chars()
|
|
.next();
|
|
let Some(first_char) = first_char else {
|
|
return false;
|
|
};
|
|
if *first_char != parentheses {
|
|
return false;
|
|
}
|
|
|
|
// Consider `a = (1, 2), 3`: The first char of the current expr starts is a parentheses, but
|
|
// it's not its own but that of its first tuple child. We know that it belongs to the child
|
|
// because if it wouldn't, the child would start (at least) a char later
|
|
let Some(first_child) = elts.first() else {
|
|
return false;
|
|
};
|
|
first_child.range().start() != tuple_range.start()
|
|
}
|