Expected Line break to be put before logical operators, even when some parentheses are added

[nicolas-chan-42]

Black v21.12b0

Playground link

Options

--line-length=88
--safe

Input

# Long if-statement with 2 parentheses.
if (currency == "JPY" and 100_000 <= x <= 500_000) or (currency == "USD" and 1_000 <= x <= 5_000):
    print("Line breaks AFTER Logical operator `or`.")

Output

# Long if-statement with 2 parentheses.
if (currency == "JPY" and 100_000 <= x <= 500_000) or (
    currency == "USD" and 1_000 <= x <= 5_000
):
    print("Line breaks AFTER Logical operator `or`.")

Expected

The logical operator (or in this case) would be put in the front of the second line of conditionals after formatting.
For example,

# Long if-statement with 2 parentheses.
if (
    (currency == "JPY" and 100_000 <= x <= 500_000)
    or (currency == "USD" and 1_000 <= x <= 5_000)
):
    print("Line breaks AFTER Logical operator `or`.")

[nicolas-chan-42]

The following are two examples to supplement my original example for a more comprehensive look of how Black currently handles long if-statements with parentheses added by the programmer to group related conditions.

Black v21.12b0

Playground link

Options

--line-length=88
--safe

Input

# Long if-statement with 2 parentheses, with some long names.
if (currency == "JPY" and 100_000 <= somelonglonglonglonglonglonglonglonglonglonglongname <= 500_000) or (currency == "USD" and 1_000 <= somelonglonglonglonglonglonglonglonglonglonglongname <= 5_000):
    pass

# When there are 3 groups of parentheses.
if (currency == "JPY" and 100_000 <= x <= 500_000) or (currency == "USD" and 1_000 <= x <= 5_000) or (currency == "EUR" and 1_000 <= x <= 5_000):
    pass

Output

# Long if-statement with 2 parentheses, with some long names.
if (
    currency == "JPY"
    and 100_000 <= somelonglonglonglonglonglonglonglonglonglonglongname <= 500_000
) or (
    currency == "USD"
    and 1_000 <= somelonglonglonglonglonglonglonglonglonglonglongname <= 5_000
):
    pass

# When there are 3 groups of parentheses.
if (
    (currency == "JPY" and 100_000 <= x <= 500_000)
    or (currency == "USD" and 1_000 <= x <= 5_000)
    or (currency == "EUR" and 1_000 <= x <= 5_000)
):
    pass

[felix-hilden]

Hi, this is very similar to #2156 and other issues linked to it. I'll close this and let's continue discussion there!