From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Sat, 22 Jan 2022 15:29:38 +0000 (-0800) Subject: Refactor logic for stub empty lines (#2796) X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/811de5f36bb1bb2bc7e14c186cf1af6badb77475?ds=inline Refactor logic for stub empty lines (#2796) This PR is intended to have no change to semantics. This is in preparation for #2784 which will likely introduce more logic that depends on `current_line.depth`. Inlining the subtraction gets rid of offsetting and makes it much easier to see what the result will be. --- diff --git a/src/black/lines.py b/src/black/lines.py index d8617d8..c602aa6 100644 --- a/src/black/lines.py +++ b/src/black/lines.py @@ -529,9 +529,11 @@ class EmptyLineTracker: if self.is_pyi: if self.previous_line.depth > current_line.depth: - newlines = 1 + newlines = 0 if current_line.depth else 1 elif current_line.is_class or self.previous_line.is_class: - if current_line.is_stub_class and self.previous_line.is_stub_class: + if current_line.depth: + newlines = 0 + elif current_line.is_stub_class and self.previous_line.is_stub_class: # No blank line between classes with an empty body newlines = 0 else: @@ -539,21 +541,18 @@ class EmptyLineTracker: elif ( current_line.is_def or current_line.is_decorator ) and not self.previous_line.is_def: - if not current_line.depth: + if current_line.depth: + # In classes empty lines between attributes and methods should + # be preserved. + newlines = min(1, before) + else: # Blank line between a block of functions (maybe with preceding # decorators) and a block of non-functions newlines = 1 - else: - # In classes empty lines between attributes and methods should - # be preserved. The +1 offset is to negate the -1 done later as - # this function is indented. - newlines = min(2, before + 1) else: newlines = 0 else: - newlines = 2 - if current_line.depth and newlines: - newlines -= 1 + newlines = 1 if current_line.depth else 2 return newlines, 0