Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: stable logic for applying fluent layout

This commit is contained in:
dylwil3 2025-12-08 12:20:05 -06:00
parent d08e414179
commit 73a6f47a0d
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/ruff_python_formatter/src/expression/mod.rs
View File

@ -895,6 +895,8 @@ impl CallChainLayout {
comment_ranges: &CommentRanges, comment_ranges: &CommentRanges,
source: &str, source: &str,
) -> Self { ) -> Self {
let mut first_attr_value_parenthesized = false;
let mut attributes_after_parentheses = 0; let mut attributes_after_parentheses = 0;
loop { loop {
match expr { match expr {
@ -907,7 +909,7 @@ impl CallChainLayout {
// ``` // ```
if is_expression_parenthesized(value.into(), comment_ranges, source) { if is_expression_parenthesized(value.into(), comment_ranges, source) {
// `(a).b`. We preserve these parentheses so don't recurse // `(a).b`. We preserve these parentheses so don't recurse
attributes_after_parentheses += 1; first_attr_value_parenthesized = true;
break; break;
} else if matches!(value.as_ref(), Expr::Call(_) | Expr::Subscript(_)) { } else if matches!(value.as_ref(), Expr::Call(_) | Expr::Subscript(_)) {
attributes_after_parentheses += 1; attributes_after_parentheses += 1;
@ -925,28 +927,22 @@ impl CallChainLayout {
// ``` // ```
ExprRef::Call(ast::ExprCall { func: inner, .. }) ExprRef::Call(ast::ExprCall { func: inner, .. })
| ExprRef::Subscript(ast::ExprSubscript { value: inner, .. }) => { | ExprRef::Subscript(ast::ExprSubscript { value: inner, .. }) => {
// We preserve these parentheses so don't recurse
// e.g. (a)[0].x().y().z()
// ^stop here
if is_expression_parenthesized(inner.into(), comment_ranges, source) {
break;
}
expr = ExprRef::from(inner.as_ref()); expr = ExprRef::from(inner.as_ref());
} }
_ => { _ => {
// We to format the following in fluent style:
// ```
// f2 = (a).w().t(1,)
// ^ expr
// ```
if is_expression_parenthesized(expr, comment_ranges, source) {
attributes_after_parentheses += 1;
}
break; break;
} }
} }
}
// We preserve these parentheses so don't recurse if attributes_after_parentheses + u32::from(first_attr_value_parenthesized) < 2 {
if is_expression_parenthesized(expr, comment_ranges, source) {
break;
}
}
if attributes_after_parentheses < 2 {
CallChainLayout::NonFluent CallChainLayout::NonFluent
} else { } else {
CallChainLayout::Fluent CallChainLayout::Fluent