From: Richard Si <63936253+ichard26@users.noreply.github.com> Date: Thu, 10 Sep 2020 20:21:37 +0000 (-0400) Subject: Fix empty line handling when formatting typing stubs (#1646) X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/c0a8e4224360a6917dcb5d889b08d5fdcfaf7c2d?hp=c0a8e4224360a6917dcb5d889b08d5fdcfaf7c2d Fix empty line handling when formatting typing stubs (#1646) Black used to erroneously remove all empty lines between non-function code and decorators when formatting typing stubs. Now a single empty line is enforced. I chose for putting empty lines around decorated classes that have empty bodies since removing empty lines around such classes would cause a formatting issue that seems to be impossible to fix. For example: ``` class A: ... @some_decorator class B: ... class C: ... class D: ... @some_other_decorator def foo(): -> None: ... ``` It is easy to enforce no empty lines between class A, B, and C. Just return 0, 0 for a line that is a decorator and precedes an stub class. Fortunately before this commit, empty lines after that class would be removed already. Now let's look at the empty line between class D and function foo. In this case, there should be an empty line there since it's class code next to function code. The problem is that when deciding to add X empty lines before a decorator, you can't tell whether it's before a class or a function. If the decorator is before a function, then an empty line is needed, while no empty lines are needed when the decorator is before a class. So even though I personally prefer no empty lines around decorated classes, I had to go the other way surrounding decorated classes with empty lines. Co-authored-by: Jelle Zijlstra ---