Unverified Commit 820f3870 authored by David Szotten's avatar David Szotten Committed by GitHub
Browse files

fix unary op detection (#1600)

parent d1ad8730
Loading
Loading
Loading
Loading
+8 −8
Changes for src/black/__init__.py: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -3297,12 +3297,12 @@ def do_match(self, line: Line) -> TMatchResult:
            # if the leaves in the parsed string include a PERCENT, we need to
            # make sure the initial LPAR is NOT preceded by an operator with
            # higher or equal precedence to PERCENT
            if (
                is_valid_index(idx - 2)
                and token.PERCENT in {leaf.type for leaf in LL[idx - 1 : next_idx]}
                and (
            if is_valid_index(idx - 2):
                # mypy can't quite follow unless we name this
                before_lpar = LL[idx - 2]
                if token.PERCENT in {leaf.type for leaf in LL[idx - 1 : next_idx]} and (
                    (
                        LL[idx - 2].type
                        before_lpar.type
                        in {
                            token.STAR,
                            token.AT,
@@ -3318,9 +3318,9 @@ def do_match(self, line: Line) -> TMatchResult:
                    )
                    or (
                        # only unary PLUS/MINUS
                        not is_valid_index(idx - 3)
                        and (LL[idx - 2].type in {token.PLUS, token.MINUS})
                    )
                        before_lpar.parent
                        and before_lpar.parent.type == syms.factor
                        and (before_lpar.type in {token.PLUS, token.MINUS})
                    )
                ):
                    continue
+2 −0
Changes for tests/data/percent_precedence.py: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@
b + ("" % a)
-("" % a)
b - ("" % a)
b + -("" % a)
~("" % a)
2 ** ("" % a)
await ("" % a)
@@ -32,6 +33,7 @@
b + "" % a
-("" % a)
b - "" % a
b + -("" % a)
~("" % a)
2 ** ("" % a)
await ("" % a)