Merge pull request #1043 from asottile/unstring-annotation-multiline

fix unstringing multiline string annotations

Author: asottile

pyupgrade/_plugins/typing_pep563.py

@@ -6,6 +6,7 @@
 from collections.abc import Iterable
 from collections.abc import Sequence
 
+from tokenize_rt import NON_CODING_TOKENS
 from tokenize_rt import Offset
 
 from pyupgrade._ast_helpers import ast_to_offset
@@ -23,7 +24,15 @@ def _supported_version(state: State) -> bool:
 
 
 def _dequote(i: int, tokens: list[Token], *, new: str) -> None:
-    tokens[i] = tokens[i]._replace(src=new)
+    end = i + 1
+    for j in range(end, len(tokens)):
+        if tokens[j].name == 'STRING':
+            end = j + 1
+        elif tokens[j].name not in NON_CODING_TOKENS:
+            break
+    else:
+        raise AssertionError('past end?')
+    tokens[i:end] = [tokens[i]._replace(src=new)]
 
 
 def _get_name(node: ast.expr) -> str:

tests/features/typing_pep563_test.py

@@ -365,6 +365,20 @@ def test_fix_typing_pep563_noop(s):
 
             id='posonly args',
         ),
+        pytest.param(
+            'from __future__ import annotations\n'
+            'x: (\n'
+            '    "int | "\n'
+            '    "str"\n'
+            ')\n',
+
+            'from __future__ import annotations\n'
+            'x: (\n'
+            '    int | str\n'
+            ')\n',
+
+            id='multiline implicit-concat annotation',
+        ),
     ),
 )
 def test_fix_typing_pep563(s, expected):