yapf --style=pep8 continuation line may not distinguish itself from next line

The following code:

class Foo(object):

    def bar(self):
        if self.solo_generator is None and len(
                self.generators + self.next_batch) == 1:
            pass

reformats as

class Foo(object):
    def bar(self):
        if self.solo_generator is None and len(
            self.generators + self.next_batch) == 1:
            pass

Which the pep8 error checker says “E125 continuation line with same indent as next logical line” to

[tschaub]

It looks to me like this is still an issue when dedent_closing_brackets: true is used.

This code aligns with PEP 8 recommendations:

if (
    0X000000000000000000000000 or 0X000000000000000000000000
) and (
    0X000000000000000000000000 or 0X000000000000000000000000
):
    pass

Passing it through yapf --style "{based_on_style: pep8, dedent_closing_brackets: true}" check.py yields this:

if (0X000000000000000000000000 or 0X000000000000000000000000
    ) and (0X000000000000000000000000 or 0X000000000000000000000000):
    pass

Which doesn’t align with PEP 8’s indentation recommendation and raises flake8’s “continuation line with same indent as next logical line” E125 error.

[joaoportela]

I’m having the same issue, is this fixed in version 0.3.1?

$ yapf --version
yapf 0.3.1

$ yapf datasync/server.py --diff
--- datasync/server.py  (original)
+++ datasync/server.py  (reformatted)
@@ -82,7 +82,7 @@
def validate_message_structure(message):
    """Check if the message contains all keys."""
    if ("op" in message and "args" in message and "api" in message and
-            "orig" in message):
+        "orig" in message):
        return True
    else:
        return False