From 0608d6bb932348cb390ce748dd86468fcb945de0 Mon Sep 17 00:00:00 2001
From: hauntsaninja <>
Date: Fri, 21 Jan 2022 22:42:28 -0800
Subject: [PATCH] Refactor logic for stub empty lines

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.
---
 src/black/lines.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/black/lines.py b/src/black/lines.py
index d8617d83bf7..212a0f7b286 100644
--- a/src/black/lines.py
+++ b/src/black/lines.py
@@ -529,8 +529,10 @@ def _maybe_empty_lines_for_class_or_def(
 
         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.depth:
+                    newlines = 0
                 if current_line.is_stub_class and self.previous_line.is_stub_class:
                     # No blank line between classes with an empty body
                     newlines = 0
@@ -539,21 +541,18 @@ def _maybe_empty_lines_for_class_or_def(
             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