Add blank line formatting for class members

Author: knutwannheden

rewrite/rewrite/python/format/blank_lines.py

@@ -3,7 +3,7 @@
 from typing import Optional, TypeVar, cast
 
 from rewrite import Tree, P, Cursor
-from rewrite.java import J, Space, Statement, JRightPadded
+from rewrite.java import J, Space, Statement, JRightPadded, Block, ClassDeclaration, MethodDeclaration
 from rewrite.python import PythonVisitor, BlankLinesStyle, CompilationUnit
 from rewrite.visitor import T
 
@@ -30,6 +30,15 @@ def visit_statement(self, statement: Statement, p: P) -> J:
             statement = minimum_lines_for_tree(statement, self._style.minimum.around_top_level_classes_functions)
         elif top_level:
             statement = statement.with_prefix(statement.prefix.with_whitespace(''))
+        else:
+            in_block = isinstance(parent_cursor.value, Block)
+            in_class = in_block and isinstance(parent_cursor.parent_tree_cursor().value, ClassDeclaration)
+            if in_class:
+                is_first = cast(Block, parent_cursor.value).statements[0] is statement
+                if not is_first and isinstance(statement, MethodDeclaration):
+                    statement = minimum_lines_for_tree(statement, self._style.minimum._around_method)
+                elif not is_first and isinstance(statement, ClassDeclaration):
+                    statement = minimum_lines_for_tree(statement, self._style.minimum._around_class)
         return statement
 
     def post_visit(self, tree: T, p: P) -> Optional[T]:

rewrite/tests/python/all/format/blank_lines_test.py

@@ -51,3 +51,35 @@ def f():
             from_visitor(BlankLinesVisitor(IntelliJ.blank_lines()))
         )
     )
+
+
+def test_blank_lines_between_class_methods():
+    rewrite_run(
+        # language=python
+        python(
+            """\
+            class Foo:
+                def foo(self):
+                    pass
+                def bar(self):
+                    pass
+                class Nested:
+                    pass
+            """,
+            """\
+            class Foo:
+                def foo(self):
+                    pass
+
+                def bar(self):
+                    pass
+
+                class Nested:
+                    pass
+            """
+        ),
+        spec=RecipeSpec()
+        .with_recipes(
+            from_visitor(BlankLinesVisitor(IntelliJ.blank_lines()))
+        )
+    )