fix some docstring crashes (#1593)

Allow removing some trailing whitespace

diff --git a/src/black/__init__.py b/src/black/__init__.py
index 349da1e71e2f995c05bbd170746a03a827d82fdb..36c03946b550178de64207752bb0c0e47ecc9ad0 100644 (file)
--- a/src/black/__init__.py
+++ b/src/black/__init__.py
@@ -6063,7 +6063,7 @@ def _stringify_ast(
                 and field == "value"
                 and isinstance(value, str)
             ):
                 and field == "value"
                 and isinstance(value, str)
             ):

-                normalized = re.sub(r" *\n[ \t]+", "\n ", value).strip()
+                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 f5adeb7bb7b63e33d16c3436b27420ef4c6d30d5..fcb8eb12a787b8857a6387318b0b3e4318eae223 100644 (file)
--- a/tests/data/docstring.py
+++ b/tests/data/docstring.py
@@ -46,7 +46,7 @@ def zort():
 
 def poit():
   """
 
 def poit():
   """

-  Lorem ipsum dolor sit amet.
+  Lorem ipsum dolor sit amet.       

 
   Consectetur adipiscing elit:
    - sed do eiusmod tempor incididunt ut labore
 
   Consectetur adipiscing elit:
    - sed do eiusmod tempor incididunt ut labore


@@ -58,6 +58,14 @@ def poit():
   pass
 
 
   pass
 
 

+def under_indent():
+  """
+  These lines are indented in a way that does not
+make sense.
+  """
+  pass
+
+

 def over_indent():
   """
   This has a shallow indent
 def over_indent():
   """
   This has a shallow indent


@@ -136,6 +144,14 @@ def poit():
     pass
 
 
     pass
 
 

+def under_indent():
+    """
+      These lines are indented in a way that does not
+    make sense.
+    """
+    pass
+
+

 def over_indent():
     """
     This has a shallow indent
 def over_indent():
     """
     This has a shallow indent