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.
1 from dataclasses import dataclass, field
16 from blib2to3.pytree import Node, Leaf
17 from blib2to3.pgen2 import token
19 from black.brackets import BracketTracker, DOT_PRIORITY
20 from black.mode import Mode, Preview
21 from black.nodes import STANDALONE_COMMENT, TEST_DESCENDANTS
22 from black.nodes import BRACKETS, OPENING_BRACKETS, CLOSING_BRACKETS
23 from black.nodes import syms, whitespace, replace_child, child_towards
24 from black.nodes import is_multiline_string, is_import, is_type_comment
25 from black.nodes import is_one_sequence_between
35 """Holds leaves and comments. Can be printed with `str(line)`."""
39 leaves: List[Leaf] = field(default_factory=list)
40 # keys ordered like `leaves`
41 comments: Dict[LeafID, List[Leaf]] = field(default_factory=dict)
42 bracket_tracker: BracketTracker = field(default_factory=BracketTracker)
43 inside_brackets: bool = False
44 should_split_rhs: bool = False
45 magic_trailing_comma: Optional[Leaf] = None
47 def append(self, leaf: Leaf, preformatted: bool = False) -> None:
48 """Add a new `leaf` to the end of the line.
50 Unless `preformatted` is True, the `leaf` will receive a new consistent
51 whitespace prefix and metadata applied by :class:`BracketTracker`.
52 Trailing commas are maybe removed, unpacked for loop variables are
53 demoted from being delimiters.
55 Inline comments are put aside.
57 has_value = leaf.type in BRACKETS or bool(leaf.value.strip())
61 if token.COLON == leaf.type and self.is_class_paren_empty:
63 if self.leaves and not preformatted:
64 # Note: at this point leaf.prefix should be empty except for
65 # imports, for which we only preserve newlines.
66 leaf.prefix += whitespace(
67 leaf, complex_subscript=self.is_complex_subscript(leaf)
69 if self.inside_brackets or not preformatted:
70 self.bracket_tracker.mark(leaf)
71 if self.mode.magic_trailing_comma:
72 if self.has_magic_trailing_comma(leaf):
73 self.magic_trailing_comma = leaf
74 elif self.has_magic_trailing_comma(leaf, ensure_removable=True):
75 self.remove_trailing_comma()
76 if not self.append_comment(leaf):
77 self.leaves.append(leaf)
79 def append_safe(self, leaf: Leaf, preformatted: bool = False) -> None:
80 """Like :func:`append()` but disallow invalid standalone comment structure.
82 Raises ValueError when any `leaf` is appended after a standalone comment
83 or when a standalone comment is not the first leaf on the line.
85 if self.bracket_tracker.depth == 0:
87 raise ValueError("cannot append to standalone comments")
89 if self.leaves and leaf.type == STANDALONE_COMMENT:
91 "cannot append standalone comments to a populated line"
94 self.append(leaf, preformatted=preformatted)
97 def is_comment(self) -> bool:
98 """Is this line a standalone comment?"""
99 return len(self.leaves) == 1 and self.leaves[0].type == STANDALONE_COMMENT
102 def is_decorator(self) -> bool:
103 """Is this line a decorator?"""
104 return bool(self) and self.leaves[0].type == token.AT
107 def is_import(self) -> bool:
108 """Is this an import line?"""
109 return bool(self) and is_import(self.leaves[0])
112 def is_class(self) -> bool:
113 """Is this line a class definition?"""
116 and self.leaves[0].type == token.NAME
117 and self.leaves[0].value == "class"
121 def is_stub_class(self) -> bool:
122 """Is this line a class definition with a body consisting only of "..."?"""
123 return self.is_class and self.leaves[-3:] == [
124 Leaf(token.DOT, ".") for _ in range(3)
128 def is_def(self) -> bool:
129 """Is this a function definition? (Also returns True for async defs.)"""
131 first_leaf = self.leaves[0]
136 second_leaf: Optional[Leaf] = self.leaves[1]
139 return (first_leaf.type == token.NAME and first_leaf.value == "def") or (
140 first_leaf.type == token.ASYNC
141 and second_leaf is not None
142 and second_leaf.type == token.NAME
143 and second_leaf.value == "def"
147 def is_class_paren_empty(self) -> bool:
148 """Is this a class with no base classes but using parentheses?
150 Those are unnecessary and should be removed.
154 and len(self.leaves) == 4
156 and self.leaves[2].type == token.LPAR
157 and self.leaves[2].value == "("
158 and self.leaves[3].type == token.RPAR
159 and self.leaves[3].value == ")"
163 def is_triple_quoted_string(self) -> bool:
164 """Is the line a triple quoted string?"""
167 and self.leaves[0].type == token.STRING
168 and self.leaves[0].value.startswith(('"""', "'''"))
172 def opens_block(self) -> bool:
173 """Does this line open a new level of indentation."""
174 if len(self.leaves) == 0:
176 return self.leaves[-1].type == token.COLON
178 def contains_standalone_comments(self, depth_limit: int = sys.maxsize) -> bool:
179 """If so, needs to be split before emitting."""
180 for leaf in self.leaves:
181 if leaf.type == STANDALONE_COMMENT and leaf.bracket_depth <= depth_limit:
186 def contains_uncollapsable_type_comments(self) -> bool:
189 last_leaf = self.leaves[-1]
190 ignored_ids.add(id(last_leaf))
191 if last_leaf.type == token.COMMA or (
192 last_leaf.type == token.RPAR and not last_leaf.value
194 # When trailing commas or optional parens are inserted by Black for
195 # consistency, comments after the previous last element are not moved
196 # (they don't have to, rendering will still be correct). So we ignore
197 # trailing commas and invisible.
198 last_leaf = self.leaves[-2]
199 ignored_ids.add(id(last_leaf))
203 # A type comment is uncollapsable if it is attached to a leaf
204 # that isn't at the end of the line (since that could cause it
205 # to get associated to a different argument) or if there are
206 # comments before it (since that could cause it to get hidden
209 for leaf_id, comments in self.comments.items():
210 for comment in comments:
211 if is_type_comment(comment):
213 not is_type_comment(comment, " ignore")
214 and leaf_id not in ignored_ids
222 def contains_unsplittable_type_ignore(self) -> bool:
226 # If a 'type: ignore' is attached to the end of a line, we
227 # can't split the line, because we can't know which of the
228 # subexpressions the ignore was meant to apply to.
230 # We only want this to apply to actual physical lines from the
231 # original source, though: we don't want the presence of a
232 # 'type: ignore' at the end of a multiline expression to
233 # justify pushing it all onto one line. Thus we
234 # (unfortunately) need to check the actual source lines and
235 # only report an unsplittable 'type: ignore' if this line was
236 # one line in the original code.
238 # Grab the first and last line numbers, skipping generated leaves
239 first_line = next((leaf.lineno for leaf in self.leaves if leaf.lineno != 0), 0)
241 (leaf.lineno for leaf in reversed(self.leaves) if leaf.lineno != 0), 0
244 if first_line == last_line:
245 # We look at the last two leaves since a comma or an
246 # invisible paren could have been added at the end of the
248 for node in self.leaves[-2:]:
249 for comment in self.comments.get(id(node), []):
250 if is_type_comment(comment, " ignore"):
255 def contains_multiline_strings(self) -> bool:
256 return any(is_multiline_string(leaf) for leaf in self.leaves)
258 def has_magic_trailing_comma(
259 self, closing: Leaf, ensure_removable: bool = False
261 """Return True if we have a magic trailing comma, that is when:
262 - there's a trailing comma here
263 - it's not a one-tuple
264 - it's not a single-element subscript
265 Additionally, if ensure_removable:
266 - it's not from square bracket indexing
269 closing.type in CLOSING_BRACKETS
271 and self.leaves[-1].type == token.COMMA
275 if closing.type == token.RBRACE:
278 if closing.type == token.RSQB:
280 Preview.one_element_subscript in self.mode
282 and closing.parent.type == syms.trailer
283 and closing.opening_bracket
284 and is_one_sequence_between(
285 closing.opening_bracket,
288 brackets=(token.LSQB, token.RSQB),
293 if not ensure_removable:
295 comma = self.leaves[-1]
296 return bool(comma.parent and comma.parent.type == syms.listmaker)
301 if closing.opening_bracket is not None and not is_one_sequence_between(
302 closing.opening_bracket, closing, self.leaves
308 def append_comment(self, comment: Leaf) -> bool:
309 """Add an inline or standalone comment to the line."""
311 comment.type == STANDALONE_COMMENT
312 and self.bracket_tracker.any_open_brackets()
317 if comment.type != token.COMMENT:
321 comment.type = STANDALONE_COMMENT
325 last_leaf = self.leaves[-1]
327 last_leaf.type == token.RPAR
328 and not last_leaf.value
330 and len(list(last_leaf.parent.leaves())) <= 3
331 and not is_type_comment(comment)
333 # Comments on an optional parens wrapping a single leaf should belong to
334 # the wrapped node except if it's a type comment. Pinning the comment like
335 # this avoids unstable formatting caused by comment migration.
336 if len(self.leaves) < 2:
337 comment.type = STANDALONE_COMMENT
341 last_leaf = self.leaves[-2]
342 self.comments.setdefault(id(last_leaf), []).append(comment)
345 def comments_after(self, leaf: Leaf) -> List[Leaf]:
346 """Generate comments that should appear directly after `leaf`."""
347 return self.comments.get(id(leaf), [])
349 def remove_trailing_comma(self) -> None:
350 """Remove the trailing comma and moves the comments attached to it."""
351 trailing_comma = self.leaves.pop()
352 trailing_comma_comments = self.comments.pop(id(trailing_comma), [])
353 self.comments.setdefault(id(self.leaves[-1]), []).extend(
354 trailing_comma_comments
357 def is_complex_subscript(self, leaf: Leaf) -> bool:
358 """Return True iff `leaf` is part of a slice with non-trivial exprs."""
359 open_lsqb = self.bracket_tracker.get_open_lsqb()
360 if open_lsqb is None:
363 subscript_start = open_lsqb.next_sibling
365 if isinstance(subscript_start, Node):
366 if subscript_start.type == syms.listmaker:
369 if subscript_start.type == syms.subscriptlist:
370 subscript_start = child_towards(subscript_start, leaf)
371 return subscript_start is not None and any(
372 n.type in TEST_DESCENDANTS for n in subscript_start.pre_order()
375 def enumerate_with_length(
376 self, reversed: bool = False
377 ) -> Iterator[Tuple[Index, Leaf, int]]:
378 """Return an enumeration of leaves with their length.
380 Stops prematurely on multiline strings and standalone comments.
383 Callable[[Sequence[Leaf]], Iterator[Tuple[Index, Leaf]]],
384 enumerate_reversed if reversed else enumerate,
386 for index, leaf in op(self.leaves):
387 length = len(leaf.prefix) + len(leaf.value)
388 if "\n" in leaf.value:
389 return # Multiline strings, we can't continue.
391 for comment in self.comments_after(leaf):
392 length += len(comment.value)
394 yield index, leaf, length
396 def clone(self) -> "Line":
400 inside_brackets=self.inside_brackets,
401 should_split_rhs=self.should_split_rhs,
402 magic_trailing_comma=self.magic_trailing_comma,
405 def __str__(self) -> str:
406 """Render the line."""
410 indent = " " * self.depth
411 leaves = iter(self.leaves)
413 res = f"{first.prefix}{indent}{first.value}"
416 for comment in itertools.chain.from_iterable(self.comments.values()):
421 def __bool__(self) -> bool:
422 """Return True if the line has leaves or comments."""
423 return bool(self.leaves or self.comments)
427 class EmptyLineTracker:
428 """Provides a stateful method that returns the number of potential extra
429 empty lines needed before and after the currently processed line.
431 Note: this tracker works on lines that haven't been split yet. It assumes
432 the prefix of the first leaf consists of optional newlines. Those newlines
433 are consumed by `maybe_empty_lines()` and included in the computation.
437 previous_line: Optional[Line] = None
438 previous_after: int = 0
439 previous_defs: List[int] = field(default_factory=list)
441 def maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:
442 """Return the number of extra empty lines before and after the `current_line`.
444 This is for separating `def`, `async def` and `class` with extra empty
445 lines (two on module-level).
447 before, after = self._maybe_empty_lines(current_line)
449 # Black should not insert empty lines at the beginning
452 if self.previous_line is None
453 else before - self.previous_after
455 self.previous_after = after
456 self.previous_line = current_line
459 def _maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:
461 if current_line.depth == 0:
462 max_allowed = 1 if self.is_pyi else 2
463 if current_line.leaves:
464 # Consume the first leaf's extra newlines.
465 first_leaf = current_line.leaves[0]
466 before = first_leaf.prefix.count("\n")
467 before = min(before, max_allowed)
468 first_leaf.prefix = ""
471 depth = current_line.depth
472 while self.previous_defs and self.previous_defs[-1] >= depth:
474 assert self.previous_line is not None
475 if depth and not current_line.is_def and self.previous_line.is_def:
476 # Empty lines between attributes and methods should be preserved.
477 before = min(1, before)
487 and self.previous_defs[-1]
488 and current_line.leaves[-1].type == token.COLON
490 current_line.leaves[0].value
491 not in ("with", "try", "for", "while", "if", "match")
494 # We shouldn't add two newlines between an indented function and
495 # a dependent non-indented clause. This is to avoid issues with
496 # conditional function definitions that are technically top-level
497 # and therefore get two trailing newlines, but look weird and
498 # inconsistent when they're followed by elif, else, etc. This is
499 # worse because these functions only get *one* preceding newline
504 self.previous_defs.pop()
505 if current_line.is_decorator or current_line.is_def or current_line.is_class:
506 return self._maybe_empty_lines_for_class_or_def(current_line, before)
510 and self.previous_line.is_import
511 and not current_line.is_import
512 and depth == self.previous_line.depth
514 return (before or 1), 0
518 and self.previous_line.is_class
519 and current_line.is_triple_quoted_string
524 Preview.remove_block_trailing_newline in current_line.mode
525 and self.previous_line
526 and self.previous_line.opens_block
531 def _maybe_empty_lines_for_class_or_def(
532 self, current_line: Line, before: int
533 ) -> Tuple[int, int]:
534 if not current_line.is_decorator:
535 self.previous_defs.append(current_line.depth)
536 if self.previous_line is None:
537 # Don't insert empty lines before the first line in the file.
540 if self.previous_line.is_decorator:
541 if self.is_pyi and current_line.is_stub_class:
542 # Insert an empty line after a decorated stub class
547 if self.previous_line.depth < current_line.depth and (
548 self.previous_line.is_class or self.previous_line.is_def
553 self.previous_line.is_comment
554 and self.previous_line.depth == current_line.depth
560 if current_line.is_class or self.previous_line.is_class:
561 if self.previous_line.depth < current_line.depth:
563 elif self.previous_line.depth > current_line.depth:
565 elif current_line.is_stub_class and self.previous_line.is_stub_class:
566 # No blank line between classes with an empty body
571 current_line.is_def or current_line.is_decorator
572 ) and not self.previous_line.is_def:
573 if current_line.depth:
574 # In classes empty lines between attributes and methods should
576 newlines = min(1, before)
578 # Blank line between a block of functions (maybe with preceding
579 # decorators) and a block of non-functions
581 elif self.previous_line.depth > current_line.depth:
586 newlines = 1 if current_line.depth else 2
590 def enumerate_reversed(sequence: Sequence[T]) -> Iterator[Tuple[Index, T]]:
591 """Like `reversed(enumerate(sequence))` if that were possible."""
592 index = len(sequence) - 1
593 for element in reversed(sequence):
594 yield (index, element)
599 new_line: Line, old_line: Line, leaves: List[Leaf], preformatted: bool = False
602 Append leaves (taken from @old_line) to @new_line, making sure to fix the
603 underlying Node structure where appropriate.
605 All of the leaves in @leaves are duplicated. The duplicates are then
606 appended to @new_line and used to replace their originals in the underlying
607 Node structure. Any comments attached to the old leaves are reattached to
611 set(@leaves) is a subset of set(@old_line.leaves).
613 for old_leaf in leaves:
614 new_leaf = Leaf(old_leaf.type, old_leaf.value)
615 replace_child(old_leaf, new_leaf)
616 new_line.append(new_leaf, preformatted=preformatted)
618 for comment_leaf in old_line.comments_after(old_leaf):
619 new_line.append(comment_leaf, preformatted=True)
622 def is_line_short_enough(line: Line, *, line_length: int, line_str: str = "") -> bool:
623 """Return True if `line` is no longer than `line_length`.
625 Uses the provided `line_str` rendering, if any, otherwise computes a new one.
628 line_str = line_to_string(line)
630 len(line_str) <= line_length
631 and "\n" not in line_str # multiline strings
632 and not line.contains_standalone_comments()
636 def can_be_split(line: Line) -> bool:
637 """Return False if the line cannot be split *for sure*.
639 This is not an exhaustive search but a cheap heuristic that we can use to
640 avoid some unfortunate formattings (mostly around wrapping unsplittable code
641 in unnecessary parentheses).
647 if leaves[0].type == token.STRING and leaves[1].type == token.DOT:
651 for leaf in leaves[-2::-1]:
652 if leaf.type in OPENING_BRACKETS:
653 if next.type not in CLOSING_BRACKETS:
657 elif leaf.type == token.DOT:
659 elif leaf.type == token.NAME:
660 if not (next.type == token.DOT or next.type in OPENING_BRACKETS):
663 elif leaf.type not in CLOSING_BRACKETS:
666 if dot_count > 1 and call_count > 1:
672 def can_omit_invisible_parens(
676 """Does `line` have a shape safe to reformat without optional parens around it?
678 Returns True for only a subset of potentially nice looking formattings but
679 the point is to not return false positives that end up producing lines that
682 bt = line.bracket_tracker
683 if not bt.delimiters:
684 # Without delimiters the optional parentheses are useless.
687 max_priority = bt.max_delimiter_priority()
688 if bt.delimiter_count_with_priority(max_priority) > 1:
689 # With more than one delimiter of a kind the optional parentheses read better.
692 if max_priority == DOT_PRIORITY:
693 # A single stranded method call doesn't require optional parentheses.
696 assert len(line.leaves) >= 2, "Stranded delimiter"
698 # With a single delimiter, omit if the expression starts or ends with
700 first = line.leaves[0]
701 second = line.leaves[1]
702 if first.type in OPENING_BRACKETS and second.type not in CLOSING_BRACKETS:
703 if _can_omit_opening_paren(line, first=first, line_length=line_length):
706 # Note: we are not returning False here because a line might have *both*
707 # a leading opening bracket and a trailing closing bracket. If the
708 # opening bracket doesn't match our rule, maybe the closing will.
710 penultimate = line.leaves[-2]
711 last = line.leaves[-1]
714 last.type == token.RPAR
715 or last.type == token.RBRACE
717 # don't use indexing for omitting optional parentheses;
719 last.type == token.RSQB
721 and last.parent.type != syms.trailer
724 if penultimate.type in OPENING_BRACKETS:
725 # Empty brackets don't help.
728 if is_multiline_string(first):
729 # Additional wrapping of a multiline string in this situation is
733 if _can_omit_closing_paren(line, last=last, line_length=line_length):
739 def _can_omit_opening_paren(line: Line, *, first: Leaf, line_length: int) -> bool:
740 """See `can_omit_invisible_parens`."""
742 length = 4 * line.depth
744 for _index, leaf, leaf_length in line.enumerate_with_length():
745 if leaf.type in CLOSING_BRACKETS and leaf.opening_bracket is first:
748 length += leaf_length
749 if length > line_length:
752 if leaf.type in OPENING_BRACKETS:
753 # There are brackets we can further split on.
757 # checked the entire string and line length wasn't exceeded
758 if len(line.leaves) == _index + 1:
764 def _can_omit_closing_paren(line: Line, *, last: Leaf, line_length: int) -> bool:
765 """See `can_omit_invisible_parens`."""
766 length = 4 * line.depth
767 seen_other_brackets = False
768 for _index, leaf, leaf_length in line.enumerate_with_length():
769 length += leaf_length
770 if leaf is last.opening_bracket:
771 if seen_other_brackets or length <= line_length:
774 elif leaf.type in OPENING_BRACKETS:
775 # There are brackets we can further split on.
776 seen_other_brackets = True
781 def line_to_string(line: Line) -> str:
782 """Returns the string representation of @line.
784 WARNING: This is known to be computationally expensive.
786 return str(line).strip("\n")