mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-10 21:58:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid parenthesizing octal/hex or binary literals in object positions (#8160)

Browse source
This commit is contained in:
Micha Reiser 2023-10-24 23:12:52 +09:00 • committed by GitHub
parent 84979f9673
commit 8b665f40c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/ruff_python_formatter/src/expression/expr_attribute.rs
View file

@ -38,14 +38,13 @@ impl FormatNodeRule<ExprAttribute> for FormatExprAttribute {
let format_inner = format_with(|f: &mut PyFormatter| {
let parenthesize_value =
// If the value is an integer, we need to parenthesize it to avoid a syntax error.
matches!(
value.as_ref(),
Expr::Constant(ExprConstant {
value: Constant::Int(_) | Constant::Float(_),
..
})
) || is_expression_parenthesized(value.into(), f.context().comments().ranges(), f.context().source());
is_base_ten_number_literal(value.as_ref(), f.context().source()) || {
is_expression_parenthesized(
value.into(),
f.context().comments().ranges(),
f.context().source(),
)
};
if call_chain_layout == CallChainLayout::Fluent {
if parenthesize_value {
@ -164,3 +163,23 @@ impl NeedsParentheses for ExprAttribute {
}
}
}
// Non Hex, octal or binary number literals need parentheses to disambiguate the attribute `.` from
// a decimal point. Floating point numbers don't strictly need parentheses but it reads better (rather than 0.0.test()).
fn is_base_ten_number_literal(expr: &Expr, source: &str) -> bool {
if let Some(ExprConstant { value, range }) = expr.as_constant_expr() {
match value {
Constant::Float(_) => true,
Constant::Int(_) => {
let text = &source[*range];
!matches!(
text.as_bytes().get(0..2),
Some([b'0', b'x' | b'X' | b'o' | b'O' | b'b' | b'B'])
)
}
_ => false,
}
} else {
false
}
}