]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

fix crashes on docstring whitespace changes (#1417)
authorJelle Zijlstra <jelle.zijlstra@gmail.com>
Sat, 16 May 2020 03:47:21 +0000 (20:47 -0700)
committerGitHub <noreply@github.com>
Sat, 16 May 2020 03:47:21 +0000 (20:47 -0700)
Fixes #1415

src/black/__init__.py
tests/data/docstring.py

index 41c688b53998005c2a359c29a30d8cd2e59d91f8..77dda2b52cc4bbebc3a57f4ed272f42071d45cfe 100644 (file)
@@ -6006,13 +6006,14 @@ def _stringify_ast(
 
         else:
             # Constant strings may be indented across newlines, if they are
-            # docstrings; fold spaces after newlines when comparing
+            # docstrings; fold spaces after newlines when comparing. Similarly,
+            # trailing and leading space may be removed.
             if (
                 isinstance(node, ast.Constant)
                 and field == "value"
                 and isinstance(value, str)
             ):
-                normalized = re.sub(r"\n[ \t]+", "\n ", value)
+                normalized = re.sub(r" *\n[ \t]+", "\n ", value).strip()
             else:
                 normalized = value
             yield f"{'  ' * (depth+2)}{normalized!r},  # {value.__class__.__name__}"
index dd5bab73bd6fae2e04cea009367b4587229d331c..f5adeb7bb7b63e33d16c3436b27420ef4c6d30d5 100644 (file)
@@ -1,5 +1,5 @@
 class MyClass:
-  """Multiline
+  """ Multiline
   class docstring
   """
 
@@ -11,7 +11,7 @@ class MyClass:
 
 
 def foo():
-  """This is a docstring with
+  """This is a docstring with             
   some lines of text here
   """
   return
@@ -66,6 +66,13 @@ def over_indent():
     """
   pass
 
+
+def single_line():
+    """But with a newline after it!
+
+    """
+    pass
+
 # output
 
 class MyClass:
@@ -136,3 +143,8 @@ def over_indent():
       - And the closing quote is too deep
     """
     pass
+
+
+def single_line():
+    """But with a newline after it!"""
+    pass