X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/f01aaa63a0ff792b932205cbb539f70aca769d7d..bb588073ab286a9f1f8d839ab2cebe13011dd22c:/src/black/trans.py?ds=sidebyside diff --git a/src/black/trans.py b/src/black/trans.py index 4d40cb4..a2bff7f 100644 --- a/src/black/trans.py +++ b/src/black/trans.py @@ -1,8 +1,8 @@ """ String transformers that can split and merge strings. """ + import re -import sys from abc import ABC, abstractmethod from collections import defaultdict from dataclasses import dataclass @@ -12,9 +12,11 @@ from typing import ( ClassVar, Collection, Dict, + Final, Iterable, Iterator, List, + Literal, Optional, Sequence, Set, @@ -23,11 +25,6 @@ from typing import ( Union, ) -if sys.version_info < (3, 8): - from typing_extensions import Final, Literal -else: - from typing import Literal, Final - from mypy_extensions import trait from black.comments import contains_pragma_comment @@ -946,6 +943,9 @@ class StringParenStripper(StringTransformer): LL[lpar_or_rpar_idx].remove() # Remove lpar. replace_child(LL[idx], string_leaf) new_line.append(string_leaf) + # replace comments + old_comments = new_line.comments.pop(id(LL[idx]), []) + new_line.comments.setdefault(id(string_leaf), []).extend(old_comments) else: LL[lpar_or_rpar_idx].remove() # This is a rpar.