fix crashes on docstring whitespace changes (#1417)

Fixes #1415

diff --git a/src/black/__init__.py b/src/black/__init__.py
index 41c688b53998005c2a359c29a30d8cd2e59d91f8..77dda2b52cc4bbebc3a57f4ed272f42071d45cfe 100644 (file)
--- a/src/black/__init__.py
+++ b/src/black/__init__.py
@@ -6006,13 +6006,14 @@ def _stringify_ast(
 
         else:
             # Constant strings may be indented across newlines, if they are
 
         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)
             ):
             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__}"
             else:
                 normalized = value
             yield f"{'  ' * (depth+2)}{normalized!r},  # {value.__class__.__name__}"

diff --git a/tests/data/docstring.py b/tests/data/docstring.py
index dd5bab73bd6fae2e04cea009367b4587229d331c..f5adeb7bb7b63e33d16c3436b27420ef4c6d30d5 100644 (file)
--- a/tests/data/docstring.py
+++ b/tests/data/docstring.py
@@ -1,5 +1,5 @@
 class MyClass:
 class MyClass:

-  """Multiline
+  """ Multiline

   class docstring
   """
 
   class docstring
   """
 


@@ -11,7 +11,7 @@ class MyClass:
 
 
 def foo():
 
 
 def foo():

-  """This is a docstring with
+  """This is a docstring with             

   some lines of text here
   """
   return
   some lines of text here
   """
   return


@@ -66,6 +66,13 @@ def over_indent():
     """
   pass
 
     """
   pass
 

+
+def single_line():
+    """But with a newline after it!
+
+    """
+    pass
+

 # output
 
 class MyClass:
 # output
 
 class MyClass:


@@ -136,3 +143,8 @@ def over_indent():
       - And the closing quote is too deep
     """
     pass
       - And the closing quote is too deep
     """
     pass

+
+
+def single_line():
+    """But with a newline after it!"""
+    pass