Add support to style function definitions with newlines before function stubs

[peterkra25]

Description

Per Issue #4291, Black previously failed to format function definitions that contained an empty line before an indented function stub. This change resolves this bug by removing any newlines in the prefix of the first dot in a function stub after a stub suite is found. We added this change in the visit_default() function of linegen.py.

Through this change, functions defined as below:

class C:
    def f(self):

        ...

are formatted as:

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

Checklist - did you ...

• [Y] Add an entry in CHANGES.md if necessary?
• [Y] Add / update tests if necessary?
• [Y] Add new / update outdated documentation?

This change was added by Peter Kraszulyak and Harvin Mumick.

[github-actions[bot]]

diff-shades reports zero changes comparing this PR (8dc6217c0a0350ad848d73bcea5ec8cb3dd1c59e) to main (f4b644b82f64d5aa2b8959277c9eb9ebcb16affe).

---

What is this? | Workflow run | diff-shades documentation

[peterkra25]

We are unsure as to why the “Lint + format ourselves / build” test fails on flake8 when running pre-commit. After first cloning the repo and before making any changes, we ran

pre-commit run -a

and it reported that flake8 failed. This message persisted after we made our changes, so we restarted by deleting our project folder and cloning the entire repo again, but we still received the same error. If anybody knows what may be causing flake8 to fail, please let us know!

[hauntsaninja]

It looks like flake8-bugbear made a new release including a new check that has some false positives. I filed https://github.com/PyCQA/flake8-bugbear/issues/467 , but we should just pin bugbear or maybe disable that error code

[harvinmumick]

Thanks for the PR! It's a little scary to me to be changing visit_default. Can we change it in a more targeted way (e.g. specifically at the call sites in #3796 when we know we're dealing with a stub body)?

As it stands, I think this will change formatting in other situations as well, for instance, if there are real statements after ....

One nit: let's move the test cases into tests/data/cases/dummy_implementations.py?

We are struggling to find a more targeted way to modify the prefix at the call site. The only call site at which we know we are dealing with a stub body in the provided test cases is here: https://github.com/psf/black/blob/40458d7568099f6ec249f2582c1cc4f6f1b4dfe0/src/black/linegen.py#L317-L320

This call site verifies a stub suite when visiting the "suite" node in the syntax tree, which is 2 levels higher than the node containing the first DOT token – the node whose prefix needs to be stripped of newlines. Between this call site and the point at which we visit the first DOT token in visit_default, the suite's prefix is stripped of all indentations, which enables further stripping of newline characters by the time at which the first DOT token is visited.

Since the indents are not cleaned at the call site, we don't see a way to clean the prefix at the call site.

[hauntsaninja]

Why can't we do something like this?

diff --git a/src/black/linegen.py b/src/black/linegen.py
index 4b29a04..f80140b 100644
--- a/src/black/linegen.py
+++ b/src/black/linegen.py
@@ -308,8 +308,11 @@ class LineGenerator(Visitor[Line]):
                 yield from self.line(-1)

         else:
-            if not node.parent or not is_stub_suite(node.parent):
-                yield from self.line()
+            if node.parent and is_stub_suite(node.parent):
+                node.prefix = ""
+                yield from self.visit_default(node)
+                return
+            yield from self.line()
             yield from self.visit_default(node)

     def visit_async_stmt(self, node: Node) -> Iterator[Line]:

Note Node.prefix has a setter that will set its children[0]'s prefix

[peterkra25]

Upon further review, that change works for the code snippet reported in https://github.com/psf/black/issues/4291. However, for a test as @JelleZijlstra recommended containing a comment on the line immediately after the function stub such as below:

class Class:
    def f(self):

        ...
        # Comment 3

The newline in between the function definition and stub is not removed and the file is left unchanged. In our previous implementation, the newline is stripped for this case, although the stub is not folded onto the same line as the function definition when possible (i.e: when there are no comments on the same line as the function definition).

Note: both implementations work as expected when there are real statements immediately following the function stub.

[JelleZijlstra]

It's fine to leave that case unchanged; in fact, per our stability policy, we must maintain the current formatting for the rest of the year.

I'm asking for those additional tests mostly because comments in unusual places tend to trigger bugs in Black. I want to make sure:

• Black doesn't crash on any inputs
• Black doesn't remove any comments
• Black preserves its existing formatting for any code that is currently formatted successfully (following the stability policy)

[harvinmumick]

Thank you both for your feedback and clarifications. We've relocated the implementation and added the extra tests to tests/data/cases/dummy_implementations.py