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 Generating lines of code.
5 from enum import Enum, auto
6 from functools import partial, wraps
7 from typing import Collection, Iterator, List, Optional, Set, Union, cast
9 from black.brackets import (
12 get_leaves_inside_matching_brackets,
13 max_delimiter_priority_in_atom,
15 from black.comments import FMT_OFF, generate_comments, list_comments
16 from black.lines import (
20 can_omit_invisible_parens,
24 from black.mode import Feature, Mode, Preview
25 from black.nodes import (
36 is_atom_with_invisible_parens,
42 is_one_sequence_between,
53 from black.numerics import normalize_numeric_literal
54 from black.strings import (
57 normalize_string_prefix,
58 normalize_string_quotes,
60 from black.trans import (
69 from blib2to3.pgen2 import token
70 from blib2to3.pytree import Leaf, Node
74 LN = Union[Leaf, Node]
77 class CannotSplit(CannotTransform):
78 """A readable split that fits the allotted line length is impossible."""
81 # This isn't a dataclass because @dataclass + Generic breaks mypyc.
82 # See also https://github.com/mypyc/mypyc/issues/827.
83 class LineGenerator(Visitor[Line]):
84 """Generates reformatted Line objects. Empty lines are not emitted.
86 Note: destroys the tree it's visiting by mutating prefixes of its leaves
87 in ways that will no longer stringify to valid Python code on the tree.
90 def __init__(self, mode: Mode) -> None:
92 self.current_line: Line
95 def line(self, indent: int = 0) -> Iterator[Line]:
98 If the line is empty, only emit if it makes sense.
99 If the line is too long, split it first and then generate.
101 If any lines were generated, set up a new current_line.
103 if not self.current_line:
104 self.current_line.depth += indent
105 return # Line is empty, don't emit. Creating a new one unnecessary.
107 complete_line = self.current_line
108 self.current_line = Line(mode=self.mode, depth=complete_line.depth + indent)
111 def visit_default(self, node: LN) -> Iterator[Line]:
112 """Default `visit_*()` implementation. Recurses to children of `node`."""
113 if isinstance(node, Leaf):
114 any_open_brackets = self.current_line.bracket_tracker.any_open_brackets()
115 for comment in generate_comments(node, preview=self.mode.preview):
116 if any_open_brackets:
117 # any comment within brackets is subject to splitting
118 self.current_line.append(comment)
119 elif comment.type == token.COMMENT:
120 # regular trailing comment
121 self.current_line.append(comment)
122 yield from self.line()
125 # regular standalone comment
126 yield from self.line()
128 self.current_line.append(comment)
129 yield from self.line()
131 normalize_prefix(node, inside_brackets=any_open_brackets)
132 if self.mode.string_normalization and node.type == token.STRING:
133 node.value = normalize_string_prefix(node.value)
134 node.value = normalize_string_quotes(node.value)
135 if node.type == token.NUMBER:
136 normalize_numeric_literal(node)
137 if node.type not in WHITESPACE:
138 self.current_line.append(node)
139 yield from super().visit_default(node)
141 def visit_INDENT(self, node: Leaf) -> Iterator[Line]:
142 """Increase indentation level, maybe yield a line."""
143 # In blib2to3 INDENT never holds comments.
144 yield from self.line(+1)
145 yield from self.visit_default(node)
147 def visit_DEDENT(self, node: Leaf) -> Iterator[Line]:
148 """Decrease indentation level, maybe yield a line."""
149 # The current line might still wait for trailing comments. At DEDENT time
150 # there won't be any (they would be prefixes on the preceding NEWLINE).
151 # Emit the line then.
152 yield from self.line()
154 # While DEDENT has no value, its prefix may contain standalone comments
155 # that belong to the current indentation level. Get 'em.
156 yield from self.visit_default(node)
158 # Finally, emit the dedent.
159 yield from self.line(-1)
162 self, node: Node, keywords: Set[str], parens: Set[str]
164 """Visit a statement.
166 This implementation is shared for `if`, `while`, `for`, `try`, `except`,
167 `def`, `with`, `class`, `assert`, and assignments.
169 The relevant Python language `keywords` for a given statement will be
170 NAME leaves within it. This methods puts those on a separate line.
172 `parens` holds a set of string leaf values immediately after which
173 invisible parens should be put.
175 normalize_invisible_parens(node, parens_after=parens, preview=self.mode.preview)
176 for child in node.children:
177 if is_name_token(child) and child.value in keywords:
178 yield from self.line()
180 yield from self.visit(child)
182 def visit_dictsetmaker(self, node: Node) -> Iterator[Line]:
183 if Preview.wrap_long_dict_values_in_parens in self.mode:
184 for i, child in enumerate(node.children):
187 if node.children[i - 1].type == token.COLON:
188 if child.type == syms.atom and child.children[0].type == token.LPAR:
189 if maybe_make_parens_invisible_in_atom(
192 remove_brackets_around_comma=False,
194 wrap_in_parentheses(node, child, visible=False)
196 wrap_in_parentheses(node, child, visible=False)
197 yield from self.visit_default(node)
199 def visit_funcdef(self, node: Node) -> Iterator[Line]:
200 """Visit function definition."""
201 if Preview.annotation_parens not in self.mode:
202 yield from self.visit_stmt(node, keywords={"def"}, parens=set())
204 yield from self.line()
206 # Remove redundant brackets around return type annotation.
207 is_return_annotation = False
208 for child in node.children:
209 if child.type == token.RARROW:
210 is_return_annotation = True
211 elif is_return_annotation:
212 if child.type == syms.atom and child.children[0].type == token.LPAR:
213 if maybe_make_parens_invisible_in_atom(
216 remove_brackets_around_comma=False,
218 wrap_in_parentheses(node, child, visible=False)
220 wrap_in_parentheses(node, child, visible=False)
221 is_return_annotation = False
223 for child in node.children:
224 yield from self.visit(child)
226 def visit_match_case(self, node: Node) -> Iterator[Line]:
227 """Visit either a match or case statement."""
228 normalize_invisible_parens(node, parens_after=set(), preview=self.mode.preview)
230 yield from self.line()
231 for child in node.children:
232 yield from self.visit(child)
234 def visit_suite(self, node: Node) -> Iterator[Line]:
236 if self.mode.is_pyi and is_stub_suite(node):
237 yield from self.visit(node.children[2])
239 yield from self.visit_default(node)
241 def visit_simple_stmt(self, node: Node) -> Iterator[Line]:
242 """Visit a statement without nested statements."""
243 prev_type: Optional[int] = None
244 for child in node.children:
245 if (prev_type is None or prev_type == token.SEMI) and is_arith_like(child):
246 wrap_in_parentheses(node, child, visible=False)
247 prev_type = child.type
249 is_suite_like = node.parent and node.parent.type in STATEMENT
251 if self.mode.is_pyi and is_stub_body(node):
252 yield from self.visit_default(node)
254 yield from self.line(+1)
255 yield from self.visit_default(node)
256 yield from self.line(-1)
262 or not is_stub_suite(node.parent)
264 yield from self.line()
265 yield from self.visit_default(node)
267 def visit_async_stmt(self, node: Node) -> Iterator[Line]:
268 """Visit `async def`, `async for`, `async with`."""
269 yield from self.line()
271 children = iter(node.children)
272 for child in children:
273 yield from self.visit(child)
275 if child.type == token.ASYNC or child.type == STANDALONE_COMMENT:
276 # STANDALONE_COMMENT happens when `# fmt: skip` is applied on the async
280 internal_stmt = next(children)
281 for child in internal_stmt.children:
282 yield from self.visit(child)
284 def visit_decorators(self, node: Node) -> Iterator[Line]:
285 """Visit decorators."""
286 for child in node.children:
287 yield from self.line()
288 yield from self.visit(child)
290 def visit_power(self, node: Node) -> Iterator[Line]:
291 for idx, leaf in enumerate(node.children[:-1]):
292 next_leaf = node.children[idx + 1]
294 if not isinstance(leaf, Leaf):
297 value = leaf.value.lower()
299 leaf.type == token.NUMBER
300 and next_leaf.type == syms.trailer
301 # Ensure that we are in an attribute trailer
302 and next_leaf.children[0].type == token.DOT
303 # It shouldn't wrap hexadecimal, binary and octal literals
304 and not value.startswith(("0x", "0b", "0o"))
305 # It shouldn't wrap complex literals
308 wrap_in_parentheses(node, leaf)
310 if Preview.remove_redundant_parens in self.mode:
311 remove_await_parens(node)
313 yield from self.visit_default(node)
315 def visit_SEMI(self, leaf: Leaf) -> Iterator[Line]:
316 """Remove a semicolon and put the other statement on a separate line."""
317 yield from self.line()
319 def visit_ENDMARKER(self, leaf: Leaf) -> Iterator[Line]:
320 """End of file. Process outstanding comments and end with a newline."""
321 yield from self.visit_default(leaf)
322 yield from self.line()
324 def visit_STANDALONE_COMMENT(self, leaf: Leaf) -> Iterator[Line]:
325 if not self.current_line.bracket_tracker.any_open_brackets():
326 yield from self.line()
327 yield from self.visit_default(leaf)
329 def visit_factor(self, node: Node) -> Iterator[Line]:
330 """Force parentheses between a unary op and a binary power:
334 _operator, operand = node.children
336 operand.type == syms.power
337 and len(operand.children) == 3
338 and operand.children[1].type == token.DOUBLESTAR
340 lpar = Leaf(token.LPAR, "(")
341 rpar = Leaf(token.RPAR, ")")
342 index = operand.remove() or 0
343 node.insert_child(index, Node(syms.atom, [lpar, operand, rpar]))
344 yield from self.visit_default(node)
346 def visit_STRING(self, leaf: Leaf) -> Iterator[Line]:
347 if is_docstring(leaf) and "\\\n" not in leaf.value:
348 # We're ignoring docstrings with backslash newline escapes because changing
349 # indentation of those changes the AST representation of the code.
350 if Preview.normalize_docstring_quotes_and_prefixes_properly in self.mode:
351 # There was a bug where --skip-string-normalization wouldn't stop us
352 # from normalizing docstring prefixes. To maintain stability, we can
353 # only address this buggy behaviour while the preview style is enabled.
354 if self.mode.string_normalization:
355 docstring = normalize_string_prefix(leaf.value)
356 # visit_default() does handle string normalization for us, but
357 # since this method acts differently depending on quote style (ex.
358 # see padding logic below), there's a possibility for unstable
359 # formatting as visit_default() is called *after*. To avoid a
360 # situation where this function formats a docstring differently on
361 # the second pass, normalize it early.
362 docstring = normalize_string_quotes(docstring)
364 docstring = leaf.value
366 # ... otherwise, we'll keep the buggy behaviour >.<
367 docstring = normalize_string_prefix(leaf.value)
368 prefix = get_string_prefix(docstring)
369 docstring = docstring[len(prefix) :] # Remove the prefix
370 quote_char = docstring[0]
371 # A natural way to remove the outer quotes is to do:
372 # docstring = docstring.strip(quote_char)
373 # but that breaks on """""x""" (which is '""x').
374 # So we actually need to remove the first character and the next two
375 # characters but only if they are the same as the first.
376 quote_len = 1 if docstring[1] != quote_char else 3
377 docstring = docstring[quote_len:-quote_len]
378 docstring_started_empty = not docstring
379 indent = " " * 4 * self.current_line.depth
381 if is_multiline_string(leaf):
382 docstring = fix_docstring(docstring, indent)
384 docstring = docstring.strip()
387 # Add some padding if the docstring starts / ends with a quote mark.
388 if docstring[0] == quote_char:
389 docstring = " " + docstring
390 if docstring[-1] == quote_char:
392 if docstring[-1] == "\\":
393 backslash_count = len(docstring) - len(docstring.rstrip("\\"))
394 if backslash_count % 2:
395 # Odd number of tailing backslashes, add some padding to
396 # avoid escaping the closing string quote.
398 elif not docstring_started_empty:
401 # We could enforce triple quotes at this point.
402 quote = quote_char * quote_len
404 # It's invalid to put closing single-character quotes on a new line.
405 if Preview.long_docstring_quotes_on_newline in self.mode and quote_len == 3:
406 # We need to find the length of the last line of the docstring
407 # to find if we can add the closing quotes to the line without
408 # exceeding the maximum line length.
409 # If docstring is one line, we don't put the closing quotes on a
410 # separate line because it looks ugly (#3320).
411 lines = docstring.splitlines()
412 last_line_length = len(lines[-1]) if docstring else 0
414 # If adding closing quotes would cause the last line to exceed
415 # the maximum line length then put a line break before the
419 and last_line_length + quote_len > self.mode.line_length
421 leaf.value = prefix + quote + docstring + "\n" + indent + quote
423 leaf.value = prefix + quote + docstring + quote
425 leaf.value = prefix + quote + docstring + quote
427 yield from self.visit_default(leaf)
429 def __post_init__(self) -> None:
430 """You are in a twisty little maze of passages."""
431 self.current_line = Line(mode=self.mode)
435 self.visit_assert_stmt = partial(v, keywords={"assert"}, parens={"assert", ","})
436 self.visit_if_stmt = partial(
437 v, keywords={"if", "else", "elif"}, parens={"if", "elif"}
439 self.visit_while_stmt = partial(v, keywords={"while", "else"}, parens={"while"})
440 self.visit_for_stmt = partial(v, keywords={"for", "else"}, parens={"for", "in"})
441 self.visit_try_stmt = partial(
442 v, keywords={"try", "except", "else", "finally"}, parens=Ø
444 if self.mode.preview:
445 self.visit_except_clause = partial(
446 v, keywords={"except"}, parens={"except"}
448 self.visit_with_stmt = partial(v, keywords={"with"}, parens={"with"})
450 self.visit_except_clause = partial(v, keywords={"except"}, parens=Ø)
451 self.visit_with_stmt = partial(v, keywords={"with"}, parens=Ø)
452 self.visit_classdef = partial(v, keywords={"class"}, parens=Ø)
453 self.visit_expr_stmt = partial(v, keywords=Ø, parens=ASSIGNMENTS)
454 self.visit_return_stmt = partial(v, keywords={"return"}, parens={"return"})
455 self.visit_import_from = partial(v, keywords=Ø, parens={"import"})
456 self.visit_del_stmt = partial(v, keywords=Ø, parens={"del"})
457 self.visit_async_funcdef = self.visit_async_stmt
458 self.visit_decorated = self.visit_decorators
461 self.visit_match_stmt = self.visit_match_case
462 self.visit_case_block = self.visit_match_case
466 line: Line, mode: Mode, features: Collection[Feature] = ()
468 """Transform a `line`, potentially splitting it into many lines.
470 They should fit in the allotted `line_length` but might not be able to.
472 `features` are syntactical features that may be used in the output.
478 line_str = line_to_string(line)
480 ll = mode.line_length
481 sn = mode.string_normalization
482 string_merge = StringMerger(ll, sn)
483 string_paren_strip = StringParenStripper(ll, sn)
484 string_split = StringSplitter(ll, sn)
485 string_paren_wrap = StringParenWrapper(ll, sn)
487 transformers: List[Transformer]
489 not line.contains_uncollapsable_type_comments()
490 and not line.should_split_rhs
491 and not line.magic_trailing_comma
493 is_line_short_enough(line, line_length=mode.line_length, line_str=line_str)
494 or line.contains_unsplittable_type_ignore()
496 and not (line.inside_brackets and line.contains_standalone_comments())
498 # Only apply basic string preprocessing, since lines shouldn't be split here.
499 if Preview.string_processing in mode:
500 transformers = [string_merge, string_paren_strip]
504 transformers = [left_hand_split]
508 self: object, line: Line, features: Collection[Feature]
510 """Wraps calls to `right_hand_split`.
512 The calls increasingly `omit` right-hand trailers (bracket pairs with
513 content), meaning the trailers get glued together to split on another
514 bracket pair instead.
516 for omit in generate_trailers_to_omit(line, mode.line_length):
518 right_hand_split(line, mode.line_length, features, omit=omit)
520 # Note: this check is only able to figure out if the first line of the
521 # *current* transformation fits in the line length. This is true only
522 # for simple cases. All others require running more transforms via
523 # `transform_line()`. This check doesn't know if those would succeed.
524 if is_line_short_enough(lines[0], line_length=mode.line_length):
528 # All splits failed, best effort split with no omits.
529 # This mostly happens to multiline strings that are by definition
530 # reported as not fitting a single line, as well as lines that contain
531 # trailing commas (those have to be exploded).
532 yield from right_hand_split(
533 line, line_length=mode.line_length, features=features
536 # HACK: nested functions (like _rhs) compiled by mypyc don't retain their
537 # __name__ attribute which is needed in `run_transformer` further down.
538 # Unfortunately a nested class breaks mypyc too. So a class must be created
539 # via type ... https://github.com/mypyc/mypyc/issues/884
540 rhs = type("rhs", (), {"__call__": _rhs})()
542 if Preview.string_processing in mode:
543 if line.inside_brackets:
549 standalone_comment_split,
562 if line.inside_brackets:
563 transformers = [delimiter_split, standalone_comment_split, rhs]
566 # It's always safe to attempt hugging of power operations and pretty much every line
568 transformers.append(hug_power_op)
570 for transform in transformers:
571 # We are accumulating lines in `result` because we might want to abort
572 # mission and return the original line in the end, or attempt a different
575 result = run_transformer(line, transform, mode, features, line_str=line_str)
576 except CannotTransform:
586 class _BracketSplitComponent(Enum):
592 def left_hand_split(line: Line, _features: Collection[Feature] = ()) -> Iterator[Line]:
593 """Split line into many lines, starting with the first matching bracket pair.
595 Note: this usually looks weird, only use this for function definitions.
596 Prefer RHS otherwise. This is why this function is not symmetrical with
597 :func:`right_hand_split` which also handles optional parentheses.
599 tail_leaves: List[Leaf] = []
600 body_leaves: List[Leaf] = []
601 head_leaves: List[Leaf] = []
602 current_leaves = head_leaves
603 matching_bracket: Optional[Leaf] = None
604 for leaf in line.leaves:
606 current_leaves is body_leaves
607 and leaf.type in CLOSING_BRACKETS
608 and leaf.opening_bracket is matching_bracket
609 and isinstance(matching_bracket, Leaf)
612 ensure_visible(matching_bracket)
613 current_leaves = tail_leaves if body_leaves else head_leaves
614 current_leaves.append(leaf)
615 if current_leaves is head_leaves:
616 if leaf.type in OPENING_BRACKETS:
617 matching_bracket = leaf
618 current_leaves = body_leaves
619 if not matching_bracket:
620 raise CannotSplit("No brackets found")
622 head = bracket_split_build_line(
623 head_leaves, line, matching_bracket, component=_BracketSplitComponent.head
625 body = bracket_split_build_line(
626 body_leaves, line, matching_bracket, component=_BracketSplitComponent.body
628 tail = bracket_split_build_line(
629 tail_leaves, line, matching_bracket, component=_BracketSplitComponent.tail
631 bracket_split_succeeded_or_raise(head, body, tail)
632 for result in (head, body, tail):
637 def right_hand_split(
640 features: Collection[Feature] = (),
641 omit: Collection[LeafID] = (),
643 """Split line into many lines, starting with the last matching bracket pair.
645 If the split was by optional parentheses, attempt splitting without them, too.
646 `omit` is a collection of closing bracket IDs that shouldn't be considered for
649 Note: running this function modifies `bracket_depth` on the leaves of `line`.
651 tail_leaves: List[Leaf] = []
652 body_leaves: List[Leaf] = []
653 head_leaves: List[Leaf] = []
654 current_leaves = tail_leaves
655 opening_bracket: Optional[Leaf] = None
656 closing_bracket: Optional[Leaf] = None
657 for leaf in reversed(line.leaves):
658 if current_leaves is body_leaves:
659 if leaf is opening_bracket:
660 current_leaves = head_leaves if body_leaves else tail_leaves
661 current_leaves.append(leaf)
662 if current_leaves is tail_leaves:
663 if leaf.type in CLOSING_BRACKETS and id(leaf) not in omit:
664 opening_bracket = leaf.opening_bracket
665 closing_bracket = leaf
666 current_leaves = body_leaves
667 if not (opening_bracket and closing_bracket and head_leaves):
668 # If there is no opening or closing_bracket that means the split failed and
669 # all content is in the tail. Otherwise, if `head_leaves` are empty, it means
670 # the matching `opening_bracket` wasn't available on `line` anymore.
671 raise CannotSplit("No brackets found")
673 tail_leaves.reverse()
674 body_leaves.reverse()
675 head_leaves.reverse()
676 head = bracket_split_build_line(
677 head_leaves, line, opening_bracket, component=_BracketSplitComponent.head
679 body = bracket_split_build_line(
680 body_leaves, line, opening_bracket, component=_BracketSplitComponent.body
682 tail = bracket_split_build_line(
683 tail_leaves, line, opening_bracket, component=_BracketSplitComponent.tail
685 bracket_split_succeeded_or_raise(head, body, tail)
687 Feature.FORCE_OPTIONAL_PARENTHESES not in features
688 # the opening bracket is an optional paren
689 and opening_bracket.type == token.LPAR
690 and not opening_bracket.value
691 # the closing bracket is an optional paren
692 and closing_bracket.type == token.RPAR
693 and not closing_bracket.value
694 # it's not an import (optional parens are the only thing we can split on
695 # in this case; attempting a split without them is a waste of time)
696 and not line.is_import
697 # there are no standalone comments in the body
698 and not body.contains_standalone_comments(0)
699 # and we can actually remove the parens
700 and can_omit_invisible_parens(body, line_length)
702 omit = {id(closing_bracket), *omit}
704 yield from right_hand_split(line, line_length, features=features, omit=omit)
707 except CannotSplit as e:
710 or is_line_short_enough(body, line_length=line_length)
713 "Splitting failed, body is still too long and can't be split."
716 elif head.contains_multiline_strings() or tail.contains_multiline_strings():
718 "The current optional pair of parentheses is bound to fail to"
719 " satisfy the splitting algorithm because the head or the tail"
720 " contains multiline strings which by definition never fit one"
724 ensure_visible(opening_bracket)
725 ensure_visible(closing_bracket)
726 for result in (head, body, tail):
731 def bracket_split_succeeded_or_raise(head: Line, body: Line, tail: Line) -> None:
732 """Raise :exc:`CannotSplit` if the last left- or right-hand split failed.
734 Do nothing otherwise.
736 A left- or right-hand split is based on a pair of brackets. Content before
737 (and including) the opening bracket is left on one line, content inside the
738 brackets is put on a separate line, and finally content starting with and
739 following the closing bracket is put on a separate line.
741 Those are called `head`, `body`, and `tail`, respectively. If the split
742 produced the same line (all content in `head`) or ended up with an empty `body`
743 and the `tail` is just the closing bracket, then it's considered failed.
745 tail_len = len(str(tail).strip())
748 raise CannotSplit("Splitting brackets produced the same line")
752 f"Splitting brackets on an empty body to save {tail_len} characters is"
757 def bracket_split_build_line(
760 opening_bracket: Leaf,
762 component: _BracketSplitComponent,
764 """Return a new line with given `leaves` and respective comments from `original`.
766 If it's the head component, brackets will be tracked so trailing commas are
769 If it's the body component, the result line is one-indented inside brackets and as
770 such has its first leaf's prefix normalized and a trailing comma added when
773 result = Line(mode=original.mode, depth=original.depth)
774 if component is _BracketSplitComponent.body:
775 result.inside_brackets = True
778 # Since body is a new indent level, remove spurious leading whitespace.
779 normalize_prefix(leaves[0], inside_brackets=True)
780 # Ensure a trailing comma for imports and standalone function arguments, but
781 # be careful not to add one after any comments or within type annotations.
784 and opening_bracket.value == "("
785 and not any(leaf.type == token.COMMA for leaf in leaves)
786 # In particular, don't add one within a parenthesized return annotation.
787 # Unfortunately the indicator we're in a return annotation (RARROW) may
788 # be defined directly in the parent node, the parent of the parent ...
789 # and so on depending on how complex the return annotation is.
790 # This isn't perfect and there's some false negatives but they are in
791 # contexts were a comma is actually fine.
793 node.prev_sibling.type == RARROW
796 getattr(leaves[0].parent, "parent", None),
798 if isinstance(node, Node) and isinstance(node.prev_sibling, Leaf)
802 if original.is_import or no_commas:
803 for i in range(len(leaves) - 1, -1, -1):
804 if leaves[i].type == STANDALONE_COMMENT:
807 if leaves[i].type != token.COMMA:
808 new_comma = Leaf(token.COMMA, ",")
809 leaves.insert(i + 1, new_comma)
812 leaves_to_track: Set[LeafID] = set()
814 Preview.handle_trailing_commas_in_head in original.mode
815 and component is _BracketSplitComponent.head
817 leaves_to_track = get_leaves_inside_matching_brackets(leaves)
823 track_bracket=id(leaf) in leaves_to_track,
825 for comment_after in original.comments_after(leaf):
826 result.append(comment_after, preformatted=True)
827 if component is _BracketSplitComponent.body and should_split_line(
828 result, opening_bracket
830 result.should_split_rhs = True
834 def dont_increase_indentation(split_func: Transformer) -> Transformer:
835 """Normalize prefix of the first leaf in every line returned by `split_func`.
837 This is a decorator over relevant split functions.
841 def split_wrapper(line: Line, features: Collection[Feature] = ()) -> Iterator[Line]:
842 for split_line in split_func(line, features):
843 normalize_prefix(split_line.leaves[0], inside_brackets=True)
849 @dont_increase_indentation
850 def delimiter_split(line: Line, features: Collection[Feature] = ()) -> Iterator[Line]:
851 """Split according to delimiters of the highest priority.
853 If the appropriate Features are given, the split will add trailing commas
854 also in function signatures and calls that contain `*` and `**`.
857 last_leaf = line.leaves[-1]
859 raise CannotSplit("Line empty") from None
861 bt = line.bracket_tracker
863 delimiter_priority = bt.max_delimiter_priority(exclude={id(last_leaf)})
865 raise CannotSplit("No delimiters found") from None
867 if delimiter_priority == DOT_PRIORITY:
868 if bt.delimiter_count_with_priority(delimiter_priority) == 1:
869 raise CannotSplit("Splitting a single attribute from its owner looks wrong")
872 mode=line.mode, depth=line.depth, inside_brackets=line.inside_brackets
874 lowest_depth = sys.maxsize
875 trailing_comma_safe = True
877 def append_to_line(leaf: Leaf) -> Iterator[Line]:
878 """Append `leaf` to current line or to new line if appending impossible."""
879 nonlocal current_line
881 current_line.append_safe(leaf, preformatted=True)
886 mode=line.mode, depth=line.depth, inside_brackets=line.inside_brackets
888 current_line.append(leaf)
890 for leaf in line.leaves:
891 yield from append_to_line(leaf)
893 for comment_after in line.comments_after(leaf):
894 yield from append_to_line(comment_after)
896 lowest_depth = min(lowest_depth, leaf.bracket_depth)
897 if leaf.bracket_depth == lowest_depth:
898 if is_vararg(leaf, within={syms.typedargslist}):
899 trailing_comma_safe = (
900 trailing_comma_safe and Feature.TRAILING_COMMA_IN_DEF in features
902 elif is_vararg(leaf, within={syms.arglist, syms.argument}):
903 trailing_comma_safe = (
904 trailing_comma_safe and Feature.TRAILING_COMMA_IN_CALL in features
907 leaf_priority = bt.delimiters.get(id(leaf))
908 if leaf_priority == delimiter_priority:
912 mode=line.mode, depth=line.depth, inside_brackets=line.inside_brackets
917 and delimiter_priority == COMMA_PRIORITY
918 and current_line.leaves[-1].type != token.COMMA
919 and current_line.leaves[-1].type != STANDALONE_COMMENT
921 new_comma = Leaf(token.COMMA, ",")
922 current_line.append(new_comma)
926 @dont_increase_indentation
927 def standalone_comment_split(
928 line: Line, features: Collection[Feature] = ()
930 """Split standalone comments from the rest of the line."""
931 if not line.contains_standalone_comments(0):
932 raise CannotSplit("Line does not have any standalone comments")
935 mode=line.mode, depth=line.depth, inside_brackets=line.inside_brackets
938 def append_to_line(leaf: Leaf) -> Iterator[Line]:
939 """Append `leaf` to current line or to new line if appending impossible."""
940 nonlocal current_line
942 current_line.append_safe(leaf, preformatted=True)
947 line.mode, depth=line.depth, inside_brackets=line.inside_brackets
949 current_line.append(leaf)
951 for leaf in line.leaves:
952 yield from append_to_line(leaf)
954 for comment_after in line.comments_after(leaf):
955 yield from append_to_line(comment_after)
961 def normalize_prefix(leaf: Leaf, *, inside_brackets: bool) -> None:
962 """Leave existing extra newlines if not `inside_brackets`. Remove everything
965 Note: don't use backslashes for formatting or you'll lose your voting rights.
967 if not inside_brackets:
968 spl = leaf.prefix.split("#")
969 if "\\" not in spl[0]:
970 nl_count = spl[-1].count("\n")
973 leaf.prefix = "\n" * nl_count
979 def normalize_invisible_parens(
980 node: Node, parens_after: Set[str], *, preview: bool
982 """Make existing optional parentheses invisible or create new ones.
984 `parens_after` is a set of string leaf values immediately after which parens
987 Standardizes on visible parentheses for single-element tuples, and keeps
988 existing visible parentheses for other tuples and generator expressions.
990 for pc in list_comments(node.prefix, is_endmarker=False, preview=preview):
991 if pc.value in FMT_OFF:
992 # This `node` has a prefix with `# fmt: off`, don't mess with parens.
995 for index, child in enumerate(list(node.children)):
996 # Fixes a bug where invisible parens are not properly stripped from
997 # assignment statements that contain type annotations.
998 if isinstance(child, Node) and child.type == syms.annassign:
999 normalize_invisible_parens(
1000 child, parens_after=parens_after, preview=preview
1003 # Add parentheses around long tuple unpacking in assignments.
1006 and isinstance(child, Node)
1007 and child.type == syms.testlist_star_expr
1014 and child.type == syms.atom
1015 and node.type == syms.for_stmt
1016 and isinstance(child.prev_sibling, Leaf)
1017 and child.prev_sibling.type == token.NAME
1018 and child.prev_sibling.value == "for"
1020 if maybe_make_parens_invisible_in_atom(
1023 remove_brackets_around_comma=True,
1025 wrap_in_parentheses(node, child, visible=False)
1026 elif preview and isinstance(child, Node) and node.type == syms.with_stmt:
1027 remove_with_parens(child, node)
1028 elif child.type == syms.atom:
1029 if maybe_make_parens_invisible_in_atom(
1033 wrap_in_parentheses(node, child, visible=False)
1034 elif is_one_tuple(child):
1035 wrap_in_parentheses(node, child, visible=True)
1036 elif node.type == syms.import_from:
1037 # "import from" nodes store parentheses directly as part of
1039 if is_lpar_token(child):
1040 assert is_rpar_token(node.children[-1])
1041 # make parentheses invisible
1043 node.children[-1].value = ""
1044 elif child.type != token.STAR:
1045 # insert invisible parentheses
1046 node.insert_child(index, Leaf(token.LPAR, ""))
1047 node.append_child(Leaf(token.RPAR, ""))
1051 and child.type == token.STAR
1052 and node.type == syms.except_clause
1054 # In except* (PEP 654), the star is actually part of
1055 # of the keyword. So we need to skip the insertion of
1056 # invisible parentheses to work more precisely.
1059 elif not (isinstance(child, Leaf) and is_multiline_string(child)):
1060 wrap_in_parentheses(node, child, visible=False)
1062 comma_check = child.type == token.COMMA if preview else False
1064 check_lpar = isinstance(child, Leaf) and (
1065 child.value in parens_after or comma_check
1069 def remove_await_parens(node: Node) -> None:
1070 if node.children[0].type == token.AWAIT and len(node.children) > 1:
1072 node.children[1].type == syms.atom
1073 and node.children[1].children[0].type == token.LPAR
1075 if maybe_make_parens_invisible_in_atom(
1078 remove_brackets_around_comma=True,
1080 wrap_in_parentheses(node, node.children[1], visible=False)
1082 # Since await is an expression we shouldn't remove
1083 # brackets in cases where this would change
1084 # the AST due to operator precedence.
1085 # Therefore we only aim to remove brackets around
1086 # power nodes that aren't also await expressions themselves.
1087 # https://peps.python.org/pep-0492/#updated-operator-precedence-table
1088 # N.B. We've still removed any redundant nested brackets though :)
1089 opening_bracket = cast(Leaf, node.children[1].children[0])
1090 closing_bracket = cast(Leaf, node.children[1].children[-1])
1091 bracket_contents = cast(Node, node.children[1].children[1])
1092 if bracket_contents.type != syms.power:
1093 ensure_visible(opening_bracket)
1094 ensure_visible(closing_bracket)
1096 bracket_contents.type == syms.power
1097 and bracket_contents.children[0].type == token.AWAIT
1099 ensure_visible(opening_bracket)
1100 ensure_visible(closing_bracket)
1101 # If we are in a nested await then recurse down.
1102 remove_await_parens(bracket_contents)
1105 def remove_with_parens(node: Node, parent: Node) -> None:
1106 """Recursively hide optional parens in `with` statements."""
1107 # Removing all unnecessary parentheses in with statements in one pass is a tad
1108 # complex as different variations of bracketed statements result in pretty
1109 # different parse trees:
1111 # with (open("file")) as f: # this is an asexpr_test
1114 # with (open("file") as f): # this is an atom containing an
1117 # with (open("file")) as f, (open("file")) as f: # this is asexpr_test, COMMA,
1120 # with (open("file") as f, open("file") as f): # an atom containing a
1121 # ... # testlist_gexp which then
1122 # # contains multiple asexpr_test(s)
1123 if node.type == syms.atom:
1124 if maybe_make_parens_invisible_in_atom(
1127 remove_brackets_around_comma=True,
1129 wrap_in_parentheses(parent, node, visible=False)
1130 if isinstance(node.children[1], Node):
1131 remove_with_parens(node.children[1], node)
1132 elif node.type == syms.testlist_gexp:
1133 for child in node.children:
1134 if isinstance(child, Node):
1135 remove_with_parens(child, node)
1136 elif node.type == syms.asexpr_test and not any(
1137 leaf.type == token.COLONEQUAL for leaf in node.leaves()
1139 if maybe_make_parens_invisible_in_atom(
1142 remove_brackets_around_comma=True,
1144 wrap_in_parentheses(node, node.children[0], visible=False)
1147 def maybe_make_parens_invisible_in_atom(
1150 remove_brackets_around_comma: bool = False,
1152 """If it's safe, make the parens in the atom `node` invisible, recursively.
1153 Additionally, remove repeated, adjacent invisible parens from the atom `node`
1154 as they are redundant.
1156 Returns whether the node should itself be wrapped in invisible parentheses.
1159 node.type != syms.atom
1160 or is_empty_tuple(node)
1161 or is_one_tuple(node)
1162 or (is_yield(node) and parent.type != syms.expr_stmt)
1164 # This condition tries to prevent removing non-optional brackets
1165 # around a tuple, however, can be a bit overzealous so we provide
1166 # and option to skip this check for `for` and `with` statements.
1167 not remove_brackets_around_comma
1168 and max_delimiter_priority_in_atom(node) >= COMMA_PRIORITY
1173 if is_walrus_assignment(node):
1179 # these ones aren't useful to end users, but they do please fuzzers
1185 first = node.children[0]
1186 last = node.children[-1]
1187 if is_lpar_token(first) and is_rpar_token(last):
1188 middle = node.children[1]
1189 # make parentheses invisible
1192 maybe_make_parens_invisible_in_atom(
1195 remove_brackets_around_comma=remove_brackets_around_comma,
1198 if is_atom_with_invisible_parens(middle):
1199 # Strip the invisible parens from `middle` by replacing
1200 # it with the child in-between the invisible parens
1201 middle.replace(middle.children[1])
1208 def should_split_line(line: Line, opening_bracket: Leaf) -> bool:
1209 """Should `line` be immediately split with `delimiter_split()` after RHS?"""
1211 if not (opening_bracket.parent and opening_bracket.value in "[{("):
1214 # We're essentially checking if the body is delimited by commas and there's more
1215 # than one of them (we're excluding the trailing comma and if the delimiter priority
1216 # is still commas, that means there's more).
1218 trailing_comma = False
1220 last_leaf = line.leaves[-1]
1221 if last_leaf.type == token.COMMA:
1222 trailing_comma = True
1223 exclude.add(id(last_leaf))
1224 max_priority = line.bracket_tracker.max_delimiter_priority(exclude=exclude)
1225 except (IndexError, ValueError):
1228 return max_priority == COMMA_PRIORITY and (
1229 (line.mode.magic_trailing_comma and trailing_comma)
1230 # always explode imports
1231 or opening_bracket.parent.type in {syms.atom, syms.import_from}
1235 def generate_trailers_to_omit(line: Line, line_length: int) -> Iterator[Set[LeafID]]:
1236 """Generate sets of closing bracket IDs that should be omitted in a RHS.
1238 Brackets can be omitted if the entire trailer up to and including
1239 a preceding closing bracket fits in one line.
1241 Yielded sets are cumulative (contain results of previous yields, too). First
1242 set is empty, unless the line should explode, in which case bracket pairs until
1243 the one that needs to explode are omitted.
1246 omit: Set[LeafID] = set()
1247 if not line.magic_trailing_comma:
1250 length = 4 * line.depth
1251 opening_bracket: Optional[Leaf] = None
1252 closing_bracket: Optional[Leaf] = None
1253 inner_brackets: Set[LeafID] = set()
1254 for index, leaf, leaf_length in line.enumerate_with_length(reversed=True):
1255 length += leaf_length
1256 if length > line_length:
1259 has_inline_comment = leaf_length > len(leaf.value) + len(leaf.prefix)
1260 if leaf.type == STANDALONE_COMMENT or has_inline_comment:
1264 if leaf is opening_bracket:
1265 opening_bracket = None
1266 elif leaf.type in CLOSING_BRACKETS:
1267 prev = line.leaves[index - 1] if index > 0 else None
1270 and prev.type == token.COMMA
1271 and leaf.opening_bracket is not None
1272 and not is_one_sequence_between(
1273 leaf.opening_bracket, leaf, line.leaves
1276 # Never omit bracket pairs with trailing commas.
1277 # We need to explode on those.
1280 inner_brackets.add(id(leaf))
1281 elif leaf.type in CLOSING_BRACKETS:
1282 prev = line.leaves[index - 1] if index > 0 else None
1283 if prev and prev.type in OPENING_BRACKETS:
1284 # Empty brackets would fail a split so treat them as "inner"
1285 # brackets (e.g. only add them to the `omit` set if another
1286 # pair of brackets was good enough.
1287 inner_brackets.add(id(leaf))
1291 omit.add(id(closing_bracket))
1292 omit.update(inner_brackets)
1293 inner_brackets.clear()
1298 and prev.type == token.COMMA
1299 and leaf.opening_bracket is not None
1300 and not is_one_sequence_between(leaf.opening_bracket, leaf, line.leaves)
1302 # Never omit bracket pairs with trailing commas.
1303 # We need to explode on those.
1307 opening_bracket = leaf.opening_bracket
1308 closing_bracket = leaf
1311 def run_transformer(
1313 transform: Transformer,
1315 features: Collection[Feature],
1320 line_str = line_to_string(line)
1321 result: List[Line] = []
1322 for transformed_line in transform(line, features):
1323 if str(transformed_line).strip("\n") == line_str:
1324 raise CannotTransform("Line transformer returned an unchanged result")
1326 result.extend(transform_line(transformed_line, mode=mode, features=features))
1329 transform.__class__.__name__ != "rhs"
1330 or not line.bracket_tracker.invisible
1331 or any(bracket.value for bracket in line.bracket_tracker.invisible)
1332 or line.contains_multiline_strings()
1333 or result[0].contains_uncollapsable_type_comments()
1334 or result[0].contains_unsplittable_type_ignore()
1335 or is_line_short_enough(result[0], line_length=mode.line_length)
1336 # If any leaves have no parents (which _can_ occur since
1337 # `transform(line)` potentially destroys the line's underlying node
1338 # structure), then we can't proceed. Doing so would cause the below
1339 # call to `append_leaves()` to fail.
1340 or any(leaf.parent is None for leaf in line.leaves)
1344 line_copy = line.clone()
1345 append_leaves(line_copy, line, line.leaves)
1346 features_fop = set(features) | {Feature.FORCE_OPTIONAL_PARENTHESES}
1347 second_opinion = run_transformer(
1348 line_copy, transform, mode, features_fop, line_str=line_str
1351 is_line_short_enough(ln, line_length=mode.line_length) for ln in second_opinion
1353 result = second_opinion