Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treat blank lines in stubs the same inside top-level if statements #2820

Merged
merged 4 commits into from Jan 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -23,6 +23,7 @@ and the first release covered by our new stability policy.
- Use parentheses for attribute access on decimal float and int literals (#2799)
- Don't add whitespace for attribute access on hexadecimal, binary, octal, and complex
literals (#2799)
- Treat blank lines in stubs the same inside top-level `if` statements (#2820)

### Parser

Expand Down
10 changes: 6 additions & 4 deletions src/black/lines.py
Expand Up @@ -530,11 +530,11 @@ def _maybe_empty_lines_for_class_or_def(
return 0, 0

if self.is_pyi:
if self.previous_line.depth > current_line.depth:
newlines = 0 if current_line.depth else 1
elif current_line.is_class or self.previous_line.is_class:
if current_line.depth:
if current_line.is_class or self.previous_line.is_class:
if self.previous_line.depth < current_line.depth:
newlines = 0
elif self.previous_line.depth > current_line.depth:
newlines = 1
elif current_line.is_stub_class and self.previous_line.is_stub_class:
# No blank line between classes with an empty body
newlines = 0
Expand All @@ -551,6 +551,8 @@ def _maybe_empty_lines_for_class_or_def(
# Blank line between a block of functions (maybe with preceding
# decorators) and a block of non-functions
newlines = 1
elif self.previous_line.depth > current_line.depth:
newlines = 1
else:
newlines = 0
else:
Expand Down
93 changes: 93 additions & 0 deletions tests/data/stub.pyi
Expand Up @@ -32,6 +32,48 @@ def g():

def h(): ...

if sys.version_info >= (3, 8):
class E:
def f(self): ...
class F:

def f(self): ...
class G: ...
class H: ...
else:
class I: ...
class J: ...
def f(): ...

class K:
def f(self): ...
def f(): ...

class Nested:
class dirty: ...
class little: ...
class secret:
def who_has_to_know(self): ...
def verse(self): ...

class Conditional:
def f(self): ...
if sys.version_info >= (3, 8):
def g(self): ...
else:
def g(self): ...
def h(self): ...
def i(self): ...
if sys.version_info >= (3, 8):
def j(self): ...
def k(self): ...
if sys.version_info >= (3, 8):
class A: ...
class B: ...
class C:
def l(self): ...
def m(self): ...


# output
X: int
Expand All @@ -56,3 +98,54 @@ class A:

def g(): ...
def h(): ...

if sys.version_info >= (3, 8):
class E:
def f(self): ...

class F:
def f(self): ...

class G: ...
class H: ...

else:
class I: ...
class J: ...

def f(): ...

class K:
def f(self): ...

def f(): ...

class Nested:
class dirty: ...
class little: ...

class secret:
def who_has_to_know(self): ...

def verse(self): ...

class Conditional:
def f(self): ...
if sys.version_info >= (3, 8):
def g(self): ...
else:
def g(self): ...

def h(self): ...
def i(self): ...
if sys.version_info >= (3, 8):
def j(self): ...

def k(self): ...
if sys.version_info >= (3, 8):
class A: ...
class B: ...

class C:
def l(self): ...
def m(self): ...