Fix parser bug where "type" was misinterpreted as a keyword inside a match (#3950)

[etc/vim.git] / src / black / lines.py

diff --git a/src/black/lines.py b/src/black/lines.py
index 71b657a0654802ef0cc80772981c37907ac9c5d0..48fde88820853deec0e5b6405a8b4bf116bf9fe4 100644 (file)
--- a/src/black/lines.py
+++ b/src/black/lines.py
@@ -193,11 +193,16 @@ class Line:
     @property
     def is_triple_quoted_string(self) -> bool:
         """Is the line a triple quoted string?"""
     @property
     def is_triple_quoted_string(self) -> bool:
         """Is the line a triple quoted string?"""

-        return (
-            bool(self)
-            and self.leaves[0].type == token.STRING
-            and self.leaves[0].value.startswith(('"""', "'''"))
-        )
+        if not self or self.leaves[0].type != token.STRING:
+            return False
+        value = self.leaves[0].value
+        if value.startswith(('"""', "'''")):
+            return True
+        if Preview.accept_raw_docstrings in self.mode and value.startswith(
+            ("r'''", 'r"""', "R'''", 'R"""')
+        ):
+            return True
+        return False

 
     @property
     def opens_block(self) -> bool:
 
     @property
     def opens_block(self) -> bool:


@@ -550,6 +555,15 @@ class EmptyLineTracker:
             if self.previous_line is None
             else before - previous_after
         )
             if self.previous_line is None
             else before - previous_after
         )

+        if (
+            Preview.module_docstring_newlines in current_line.mode
+            and self.previous_block
+            and self.previous_block.previous_block is None
+            and len(self.previous_block.original_line.leaves) == 1
+            and self.previous_block.original_line.is_triple_quoted_string
+        ):
+            before = 1
+

         block = LinesBlock(
             mode=self.mode,
             previous_block=self.previous_block,
         block = LinesBlock(
             mode=self.mode,
             previous_block=self.previous_block,