All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
2 from dataclasses import dataclass
3 from functools import lru_cache
5 from typing import Iterator, List, Optional, Union
7 if sys.version_info >= (3, 8):
8 from typing import Final
10 from typing_extensions import Final
12 from blib2to3.pytree import Node, Leaf
13 from blib2to3.pgen2 import token
15 from black.nodes import first_leaf_column, preceding_leaf, container_of
16 from black.nodes import STANDALONE_COMMENT, WHITESPACE
19 LN = Union[Leaf, Node]
21 FMT_OFF: Final = {"# fmt: off", "# fmt:off", "# yapf: disable"}
22 FMT_SKIP: Final = {"# fmt: skip", "# fmt:skip"}
23 FMT_PASS: Final = {*FMT_OFF, *FMT_SKIP}
24 FMT_ON: Final = {"# fmt: on", "# fmt:on", "# yapf: enable"}
26 COMMENT_EXCEPTIONS = {True: " !:#'", False: " !:#'%"}
31 """Describes a piece of syntax that is a comment.
33 It's not a :class:`blib2to3.pytree.Leaf` so that:
35 * it can be cached (`Leaf` objects should not be reused more than once as
36 they store their lineno, column, prefix, and parent information);
37 * `newlines` and `consumed` fields are kept separate from the `value`. This
38 simplifies handling of special marker comments like ``# fmt: off/on``.
41 type: int # token.COMMENT or STANDALONE_COMMENT
42 value: str # content of the comment
43 newlines: int # how many newlines before the comment
44 consumed: int # how many characters of the original leaf's prefix did we consume
47 def generate_comments(leaf: LN, *, preview: bool) -> Iterator[Leaf]:
48 """Clean the prefix of the `leaf` and generate comments from it, if any.
50 Comments in lib2to3 are shoved into the whitespace prefix. This happens
51 in `pgen2/driver.py:Driver.parse_tokens()`. This was a brilliant implementation
52 move because it does away with modifying the grammar to include all the
53 possible places in which comments can be placed.
55 The sad consequence for us though is that comments don't "belong" anywhere.
56 This is why this function generates simple parentless Leaf objects for
57 comments. We simply don't know what the correct parent should be.
59 No matter though, we can live without this. We really only need to
60 differentiate between inline and standalone comments. The latter don't
61 share the line with any code.
63 Inline comments are emitted as regular token.COMMENT leaves. Standalone
64 are emitted with a fake STANDALONE_COMMENT token identifier.
66 for pc in list_comments(
67 leaf.prefix, is_endmarker=leaf.type == token.ENDMARKER, preview=preview
69 yield Leaf(pc.type, pc.value, prefix="\n" * pc.newlines)
72 @lru_cache(maxsize=4096)
74 prefix: str, *, is_endmarker: bool, preview: bool
75 ) -> List[ProtoComment]:
76 """Return a list of :class:`ProtoComment` objects parsed from the given `prefix`."""
77 result: List[ProtoComment] = []
78 if not prefix or "#" not in prefix:
84 for index, line in enumerate(re.split("\r?\n", prefix)):
85 consumed += len(line) + 1 # adding the length of the split '\n'
89 if not line.startswith("#"):
90 # Escaped newlines outside of a comment are not really newlines at
91 # all. We treat a single-line comment following an escaped newline
92 # as a simple trailing comment.
93 if line.endswith("\\"):
97 if index == ignored_lines and not is_endmarker:
98 comment_type = token.COMMENT # simple trailing comment
100 comment_type = STANDALONE_COMMENT
101 comment = make_comment(line, preview=preview)
104 type=comment_type, value=comment, newlines=nlines, consumed=consumed
111 def make_comment(content: str, *, preview: bool) -> str:
112 """Return a consistently formatted comment from the given `content` string.
114 All comments (except for "##", "#!", "#:", '#'") should have a single
115 space between the hash sign and the content.
117 If `content` didn't start with a hash sign, one is provided.
119 content = content.rstrip()
123 if content[0] == "#":
124 content = content[1:]
125 NON_BREAKING_SPACE = " "
128 and content[0] == NON_BREAKING_SPACE
129 and not content.lstrip().startswith("type:")
131 content = " " + content[1:] # Replace NBSP by a simple space
132 if content and content[0] not in COMMENT_EXCEPTIONS[preview]:
133 content = " " + content
137 def normalize_fmt_off(node: Node, *, preview: bool) -> None:
138 """Convert content between `# fmt: off`/`# fmt: on` into standalone comments."""
141 try_again = convert_one_fmt_off_pair(node, preview=preview)
144 def convert_one_fmt_off_pair(node: Node, *, preview: bool) -> bool:
145 """Convert content of a single `# fmt: off`/`# fmt: on` into a standalone comment.
147 Returns True if a pair was converted.
149 for leaf in node.leaves():
150 previous_consumed = 0
151 for comment in list_comments(leaf.prefix, is_endmarker=False, preview=preview):
152 if comment.value not in FMT_PASS:
153 previous_consumed = comment.consumed
155 # We only want standalone comments. If there's no previous leaf or
156 # the previous leaf is indentation, it's a standalone comment in
158 if comment.value in FMT_PASS and comment.type != STANDALONE_COMMENT:
159 prev = preceding_leaf(leaf)
161 if comment.value in FMT_OFF and prev.type not in WHITESPACE:
163 if comment.value in FMT_SKIP and prev.type in WHITESPACE:
166 ignored_nodes = list(generate_ignored_nodes(leaf, comment, preview=preview))
167 if not ignored_nodes:
170 first = ignored_nodes[0] # Can be a container node with the `leaf`.
171 parent = first.parent
172 prefix = first.prefix
173 if comment.value in FMT_OFF:
174 first.prefix = prefix[comment.consumed :]
175 if comment.value in FMT_SKIP:
177 hidden_value = "".join(str(n) for n in ignored_nodes)
178 if comment.value in FMT_OFF:
179 hidden_value = comment.value + "\n" + hidden_value
180 if comment.value in FMT_SKIP:
181 hidden_value += " " + comment.value
182 if hidden_value.endswith("\n"):
183 # That happens when one of the `ignored_nodes` ended with a NEWLINE
184 # leaf (possibly followed by a DEDENT).
185 hidden_value = hidden_value[:-1]
186 first_idx: Optional[int] = None
187 for ignored in ignored_nodes:
188 index = ignored.remove()
189 if first_idx is None:
191 assert parent is not None, "INTERNAL ERROR: fmt: on/off handling (1)"
192 assert first_idx is not None, "INTERNAL ERROR: fmt: on/off handling (2)"
198 prefix=prefix[:previous_consumed] + "\n" * comment.newlines,
206 def generate_ignored_nodes(
207 leaf: Leaf, comment: ProtoComment, *, preview: bool
209 """Starting from the container of `leaf`, generate all leaves until `# fmt: on`.
211 If comment is skip, returns leaf only.
212 Stops at the end of the block.
214 container: Optional[LN] = container_of(leaf)
215 if comment.value in FMT_SKIP:
216 prev_sibling = leaf.prev_sibling
217 # Need to properly format the leaf prefix to compare it to comment.value,
218 # which is also formatted
219 comments = list_comments(leaf.prefix, is_endmarker=False, preview=preview)
220 if comments and comment.value == comments[0].value and prev_sibling is not None:
222 siblings = [prev_sibling]
224 "\n" not in prev_sibling.prefix
225 and prev_sibling.prev_sibling is not None
227 prev_sibling = prev_sibling.prev_sibling
228 siblings.insert(0, prev_sibling)
229 for sibling in siblings:
231 elif leaf.parent is not None:
234 while container is not None and container.type != token.ENDMARKER:
235 if is_fmt_on(container, preview=preview):
238 # fix for fmt: on in children
239 if contains_fmt_on_at_column(container, leaf.column, preview=preview):
240 for child in container.children:
241 if contains_fmt_on_at_column(child, leaf.column, preview=preview):
246 container = container.next_sibling
249 def is_fmt_on(container: LN, preview: bool) -> bool:
250 """Determine whether formatting is switched on within a container.
251 Determined by whether the last `# fmt:` comment is `on` or `off`.
254 for comment in list_comments(container.prefix, is_endmarker=False, preview=preview):
255 if comment.value in FMT_ON:
257 elif comment.value in FMT_OFF:
262 def contains_fmt_on_at_column(container: LN, column: int, *, preview: bool) -> bool:
263 """Determine if children at a given column have formatting switched on."""
264 for child in container.children:
266 isinstance(child, Node)
267 and first_leaf_column(child) == column
268 or isinstance(child, Leaf)
269 and child.column == column
271 if is_fmt_on(child, preview=preview):
277 def contains_pragma_comment(comment_list: List[Leaf]) -> bool:
280 True iff one of the comments in @comment_list is a pragma used by one
281 of the more common static analysis tools for python (e.g. mypy, flake8,
284 for comment in comment_list:
285 if comment.value.startswith(("# type:", "# noqa", "# pylint:")):