Commit e5f82517 authored by Łukasz Langa's avatar Łukasz Langa
Browse files

Allow up to two empty lines on module level and single empty lines otherwise

Fixes #74
parent 1f445a01
Loading
Loading
Loading
Loading
+7 −4
Changes for README.md: 7 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -218,10 +218,10 @@ always emit an extra empty line after ``return``, ``raise``, ``break``,
``continue``, and ``yield``.  This is to make changes in control flow
more prominent to readers of your code.

*Black* will allow single empty lines left by the original editors,
except when they're added within parenthesized expressions.  Since such
expressions are always reformatted to fit minimal space, this whitespace
is lost.
*Black* will allow single empty lines inside functions, and single and
double empty lines on module level left by the original editors, except
when they're within parenthesized expressions.  Since such expressions
are always reformatted to fit minimal space, this whitespace is lost.

It will also insert proper spacing before and after function definitions.
It's one line before and after inner functions and two lines before and
@@ -338,6 +338,9 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
* fixed 18.3a4 regression: don't crash and burn on empty lines with
  trailing whitespace (#80)

* only allow up to two empty lines on module level and only single empty
  lines within functions (#74)


### 18.3a4

+2 −2
Changes for black.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -754,13 +754,13 @@ def maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:

    def _maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:
        max_allowed = 1
        if current_line.is_comment and current_line.depth == 0:
        if current_line.depth == 0:
            max_allowed = 2
        if current_line.leaves:
            # Consume the first leaf's extra newlines.
            first_leaf = current_line.leaves[0]
            before = first_leaf.prefix.count('\n')
            before = min(before, max(before, max_allowed))
            before = min(before, max_allowed)
            first_leaf.prefix = ''
        else:
            before = 0
+4 −0
Changes for tests/empty_lines.py: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,15 +12,19 @@ def f():
    if t == token.COMMENT:  # another trailing comment
        return DOUBLESPACE


    assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"


    prev = leaf.prev_sibling
    if not prev:
        prevp = preceding_leaf(p)
        if not prevp or prevp.type in OPENING_BRACKETS:


            return NO


        if prevp.type == token.EQUAL:
            if prevp.parent and prevp.parent.type in {
                syms.typedargslist,