mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-09 18:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Treat parenthesized power operands as non-simple (#7371)

Browse source 
Closes https://github.com/astral-sh/ruff/issues/7318.
This commit is contained in:
Charlie Marsh 2023-09-14 11:36:21 -04:00 • committed by GitHub
parent 2ddea7c657
commit 34c1cb7d11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/binary.py vendored
View file

@ -206,6 +206,11 @@ if (
for user_id in set(target_user_ids) - {u.user_id for u in updates}: for user_id in set(target_user_ids) - {u.user_id for u in updates}:
updates.append(UserPresenceState.default(user_id)) updates.append(UserPresenceState.default(user_id))
# If either operator is parenthesized, use non-simple formatting.
# See: https://github.com/astral-sh/ruff/issues/7318.
10**(2)
10**2
# Keeps parenthesized left hand sides # Keeps parenthesized left hand sides
( (
log(self.price / self.strike) log(self.price / self.strike)

8
crates/ruff_python_formatter/src/expression/binary_like.rs
View file

@ -466,8 +466,11 @@ impl Format<PyFormatContext<'_>> for BinaryLike<'_> {
} }
} }
const fn is_simple_power_expression(left: &Expr, right: &Expr) -> bool { fn is_simple_power_expression(left: &Expr, right: &Expr, source: &str) -> bool {
is_simple_power_operand(left) && is_simple_power_operand(right) is_simple_power_operand(left)
&& is_simple_power_operand(right)
&& !is_expression_parenthesized(left.into(), source)
&& !is_expression_parenthesized(right.into(), source)
} }
/// Return `true` if an [`Expr`] adheres to [Black's definition](https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-breaks-binary-operators) /// Return `true` if an [`Expr`] adheres to [Black's definition](https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-breaks-binary-operators)
@ -661,6 +664,7 @@ impl Format<PyFormatContext<'_>> for FlatBinaryExpressionSlice<'_> {
&& is_simple_power_expression( && is_simple_power_expression(
left.last_operand().expression(), left.last_operand().expression(),
right.first_operand().expression(), right.first_operand().expression(),
f.context().source(),
); );
if let Some(leading) = left.first_operand().leading_binary_comments() { if let Some(leading) = left.first_operand().leading_binary_comments() {

10
crates/ruff_python_formatter/tests/snapshots/format@expression__binary.py.snap
View file

@ -212,6 +212,11 @@ if (
for user_id in set(target_user_ids) - {u.user_id for u in updates}: for user_id in set(target_user_ids) - {u.user_id for u in updates}:
updates.append(UserPresenceState.default(user_id)) updates.append(UserPresenceState.default(user_id))
# If either operator is parenthesized, use non-simple formatting.
# See: https://github.com/astral-sh/ruff/issues/7318.
10**(2)
10**2
# Keeps parenthesized left hand sides # Keeps parenthesized left hand sides
( (
log(self.price / self.strike) log(self.price / self.strike)
@ -657,6 +662,11 @@ if (
for user_id in set(target_user_ids) - {u.user_id for u in updates}: for user_id in set(target_user_ids) - {u.user_id for u in updates}:
updates.append(UserPresenceState.default(user_id)) updates.append(UserPresenceState.default(user_id))
# If either operator is parenthesized, use non-simple formatting.
# See: https://github.com/astral-sh/ruff/issues/7318.
10 ** (2)
10**2
# Keeps parenthesized left hand sides # Keeps parenthesized left hand sides
( (
log(self.price / self.strike) log(self.price / self.strike)