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
17 from blib2to3.pytree import Node, Leaf
18 from blib2to3.pgen2 import token
20 from black.brackets import BracketTracker, DOT_PRIORITY
21 from black.mode import Mode
22 from black.nodes import STANDALONE_COMMENT, TEST_DESCENDANTS
23 from black.nodes import BRACKETS, OPENING_BRACKETS, CLOSING_BRACKETS
24 from black.nodes import syms, whitespace, replace_child, child_towards
25 from black.nodes import is_multiline_string, is_import, is_type_comment, last_two_except
26 from black.nodes import is_one_tuple_between
36 """Holds leaves and comments. Can be printed with `str(line)`."""
40 leaves: List[Leaf] = field(default_factory=list)
41 # keys ordered like `leaves`
42 comments: Dict[LeafID, List[Leaf]] = field(default_factory=dict)
43 bracket_tracker: BracketTracker = field(default_factory=BracketTracker)
44 inside_brackets: bool = False
45 should_split_rhs: bool = False
46 magic_trailing_comma: Optional[Leaf] = None
48 def append(self, leaf: Leaf, preformatted: bool = False) -> None:
49 """Add a new `leaf` to the end of the line.
51 Unless `preformatted` is True, the `leaf` will receive a new consistent
52 whitespace prefix and metadata applied by :class:`BracketTracker`.
53 Trailing commas are maybe removed, unpacked for loop variables are
54 demoted from being delimiters.
56 Inline comments are put aside.
58 has_value = leaf.type in BRACKETS or bool(leaf.value.strip())
62 if token.COLON == leaf.type and self.is_class_paren_empty:
64 if self.leaves and not preformatted:
65 # Note: at this point leaf.prefix should be empty except for
66 # imports, for which we only preserve newlines.
67 leaf.prefix += whitespace(
68 leaf, complex_subscript=self.is_complex_subscript(leaf)
70 if self.inside_brackets or not preformatted:
71 self.bracket_tracker.mark(leaf)
72 if self.mode.magic_trailing_comma:
73 if self.has_magic_trailing_comma(leaf):
74 self.magic_trailing_comma = leaf
75 elif self.has_magic_trailing_comma(leaf, ensure_removable=True):
76 self.remove_trailing_comma()
77 if not self.append_comment(leaf):
78 self.leaves.append(leaf)
80 def append_safe(self, leaf: Leaf, preformatted: bool = False) -> None:
81 """Like :func:`append()` but disallow invalid standalone comment structure.
83 Raises ValueError when any `leaf` is appended after a standalone comment
84 or when a standalone comment is not the first leaf on the line.
86 if self.bracket_tracker.depth == 0:
88 raise ValueError("cannot append to standalone comments")
90 if self.leaves and leaf.type == STANDALONE_COMMENT:
92 "cannot append standalone comments to a populated line"
95 self.append(leaf, preformatted=preformatted)
98 def is_comment(self) -> bool:
99 """Is this line a standalone comment?"""
100 return len(self.leaves) == 1 and self.leaves[0].type == STANDALONE_COMMENT
103 def is_decorator(self) -> bool:
104 """Is this line a decorator?"""
105 return bool(self) and self.leaves[0].type == token.AT
108 def is_import(self) -> bool:
109 """Is this an import line?"""
110 return bool(self) and is_import(self.leaves[0])
113 def is_class(self) -> bool:
114 """Is this line a class definition?"""
117 and self.leaves[0].type == token.NAME
118 and self.leaves[0].value == "class"
122 def is_stub_class(self) -> bool:
123 """Is this line a class definition with a body consisting only of "..."?"""
124 return self.is_class and self.leaves[-3:] == [
125 Leaf(token.DOT, ".") for _ in range(3)
129 def is_def(self) -> bool:
130 """Is this a function definition? (Also returns True for async defs.)"""
132 first_leaf = self.leaves[0]
137 second_leaf: Optional[Leaf] = self.leaves[1]
140 return (first_leaf.type == token.NAME and first_leaf.value == "def") or (
141 first_leaf.type == token.ASYNC
142 and second_leaf is not None
143 and second_leaf.type == token.NAME
144 and second_leaf.value == "def"
148 def is_class_paren_empty(self) -> bool:
149 """Is this a class with no base classes but using parentheses?
151 Those are unnecessary and should be removed.
155 and len(self.leaves) == 4
157 and self.leaves[2].type == token.LPAR
158 and self.leaves[2].value == "("
159 and self.leaves[3].type == token.RPAR
160 and self.leaves[3].value == ")"
164 def is_triple_quoted_string(self) -> bool:
165 """Is the line a triple quoted string?"""
168 and self.leaves[0].type == token.STRING
169 and self.leaves[0].value.startswith(('"""', "'''"))
172 def contains_standalone_comments(self, depth_limit: int = sys.maxsize) -> bool:
173 """If so, needs to be split before emitting."""
174 for leaf in self.leaves:
175 if leaf.type == STANDALONE_COMMENT and leaf.bracket_depth <= depth_limit:
180 def contains_uncollapsable_type_comments(self) -> bool:
183 last_leaf = self.leaves[-1]
184 ignored_ids.add(id(last_leaf))
185 if last_leaf.type == token.COMMA or (
186 last_leaf.type == token.RPAR and not last_leaf.value
188 # When trailing commas or optional parens are inserted by Black for
189 # consistency, comments after the previous last element are not moved
190 # (they don't have to, rendering will still be correct). So we ignore
191 # trailing commas and invisible.
192 last_leaf = self.leaves[-2]
193 ignored_ids.add(id(last_leaf))
197 # A type comment is uncollapsable if it is attached to a leaf
198 # that isn't at the end of the line (since that could cause it
199 # to get associated to a different argument) or if there are
200 # comments before it (since that could cause it to get hidden
203 for leaf_id, comments in self.comments.items():
204 for comment in comments:
205 if is_type_comment(comment):
207 not is_type_comment(comment, " ignore")
208 and leaf_id not in ignored_ids
216 def contains_unsplittable_type_ignore(self) -> bool:
220 # If a 'type: ignore' is attached to the end of a line, we
221 # can't split the line, because we can't know which of the
222 # subexpressions the ignore was meant to apply to.
224 # We only want this to apply to actual physical lines from the
225 # original source, though: we don't want the presence of a
226 # 'type: ignore' at the end of a multiline expression to
227 # justify pushing it all onto one line. Thus we
228 # (unfortunately) need to check the actual source lines and
229 # only report an unsplittable 'type: ignore' if this line was
230 # one line in the original code.
232 # Grab the first and last line numbers, skipping generated leaves
233 first_line = next((leaf.lineno for leaf in self.leaves if leaf.lineno != 0), 0)
235 (leaf.lineno for leaf in reversed(self.leaves) if leaf.lineno != 0), 0
238 if first_line == last_line:
239 # We look at the last two leaves since a comma or an
240 # invisible paren could have been added at the end of the
242 for node in self.leaves[-2:]:
243 for comment in self.comments.get(id(node), []):
244 if is_type_comment(comment, " ignore"):
249 def contains_multiline_strings(self) -> bool:
250 return any(is_multiline_string(leaf) for leaf in self.leaves)
252 def has_magic_trailing_comma(
253 self, closing: Leaf, ensure_removable: bool = False
255 """Return True if we have a magic trailing comma, that is when:
256 - there's a trailing comma here
257 - it's not a one-tuple
258 Additionally, if ensure_removable:
259 - it's not from square bracket indexing
262 closing.type in CLOSING_BRACKETS
264 and self.leaves[-1].type == token.COMMA
268 if closing.type == token.RBRACE:
271 if closing.type == token.RSQB:
272 if not ensure_removable:
274 comma = self.leaves[-1]
275 return bool(comma.parent and comma.parent.type == syms.listmaker)
280 if not is_one_tuple_between(closing.opening_bracket, closing, self.leaves):
285 def append_comment(self, comment: Leaf) -> bool:
286 """Add an inline or standalone comment to the line."""
288 comment.type == STANDALONE_COMMENT
289 and self.bracket_tracker.any_open_brackets()
294 if comment.type != token.COMMENT:
298 comment.type = STANDALONE_COMMENT
302 last_leaf = self.leaves[-1]
304 last_leaf.type == token.RPAR
305 and not last_leaf.value
307 and len(list(last_leaf.parent.leaves())) <= 3
308 and not is_type_comment(comment)
310 # Comments on an optional parens wrapping a single leaf should belong to
311 # the wrapped node except if it's a type comment. Pinning the comment like
312 # this avoids unstable formatting caused by comment migration.
313 if len(self.leaves) < 2:
314 comment.type = STANDALONE_COMMENT
318 last_leaf = self.leaves[-2]
319 self.comments.setdefault(id(last_leaf), []).append(comment)
322 def comments_after(self, leaf: Leaf) -> List[Leaf]:
323 """Generate comments that should appear directly after `leaf`."""
324 return self.comments.get(id(leaf), [])
326 def remove_trailing_comma(self) -> None:
327 """Remove the trailing comma and moves the comments attached to it."""
328 trailing_comma = self.leaves.pop()
329 trailing_comma_comments = self.comments.pop(id(trailing_comma), [])
330 self.comments.setdefault(id(self.leaves[-1]), []).extend(
331 trailing_comma_comments
334 def is_complex_subscript(self, leaf: Leaf) -> bool:
335 """Return True iff `leaf` is part of a slice with non-trivial exprs."""
336 open_lsqb = self.bracket_tracker.get_open_lsqb()
337 if open_lsqb is None:
340 subscript_start = open_lsqb.next_sibling
342 if isinstance(subscript_start, Node):
343 if subscript_start.type == syms.listmaker:
346 if subscript_start.type == syms.subscriptlist:
347 subscript_start = child_towards(subscript_start, leaf)
348 return subscript_start is not None and any(
349 n.type in TEST_DESCENDANTS for n in subscript_start.pre_order()
352 def enumerate_with_length(
353 self, reversed: bool = False
354 ) -> Iterator[Tuple[Index, Leaf, int]]:
355 """Return an enumeration of leaves with their length.
357 Stops prematurely on multiline strings and standalone comments.
360 Callable[[Sequence[Leaf]], Iterator[Tuple[Index, Leaf]]],
361 enumerate_reversed if reversed else enumerate,
363 for index, leaf in op(self.leaves):
364 length = len(leaf.prefix) + len(leaf.value)
365 if "\n" in leaf.value:
366 return # Multiline strings, we can't continue.
368 for comment in self.comments_after(leaf):
369 length += len(comment.value)
371 yield index, leaf, length
373 def clone(self) -> "Line":
377 inside_brackets=self.inside_brackets,
378 should_split_rhs=self.should_split_rhs,
379 magic_trailing_comma=self.magic_trailing_comma,
382 def __str__(self) -> str:
383 """Render the line."""
387 indent = " " * self.depth
388 leaves = iter(self.leaves)
390 res = f"{first.prefix}{indent}{first.value}"
393 for comment in itertools.chain.from_iterable(self.comments.values()):
398 def __bool__(self) -> bool:
399 """Return True if the line has leaves or comments."""
400 return bool(self.leaves or self.comments)
404 class EmptyLineTracker:
405 """Provides a stateful method that returns the number of potential extra
406 empty lines needed before and after the currently processed line.
408 Note: this tracker works on lines that haven't been split yet. It assumes
409 the prefix of the first leaf consists of optional newlines. Those newlines
410 are consumed by `maybe_empty_lines()` and included in the computation.
414 previous_line: Optional[Line] = None
415 previous_after: int = 0
416 previous_defs: List[int] = field(default_factory=list)
418 def maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:
419 """Return the number of extra empty lines before and after the `current_line`.
421 This is for separating `def`, `async def` and `class` with extra empty
422 lines (two on module-level).
424 before, after = self._maybe_empty_lines(current_line)
426 # Black should not insert empty lines at the beginning
429 if self.previous_line is None
430 else before - self.previous_after
432 self.previous_after = after
433 self.previous_line = current_line
436 def _maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:
438 if current_line.depth == 0:
439 max_allowed = 1 if self.is_pyi else 2
440 if current_line.leaves:
441 # Consume the first leaf's extra newlines.
442 first_leaf = current_line.leaves[0]
443 before = first_leaf.prefix.count("\n")
444 before = min(before, max_allowed)
445 first_leaf.prefix = ""
448 depth = current_line.depth
449 while self.previous_defs and self.previous_defs[-1] >= depth:
451 before = 0 if depth else 1
457 and self.previous_defs[-1]
458 and current_line.leaves[-1].type == token.COLON
460 current_line.leaves[0].value
461 not in ("with", "try", "for", "while", "if", "match")
464 # We shouldn't add two newlines between an indented function and
465 # a dependent non-indented clause. This is to avoid issues with
466 # conditional function definitions that are technically top-level
467 # and therefore get two trailing newlines, but look weird and
468 # inconsistent when they're followed by elif, else, etc. This is
469 # worse because these functions only get *one* preceding newline
474 self.previous_defs.pop()
475 if current_line.is_decorator or current_line.is_def or current_line.is_class:
476 return self._maybe_empty_lines_for_class_or_def(current_line, before)
480 and self.previous_line.is_import
481 and not current_line.is_import
482 and depth == self.previous_line.depth
484 return (before or 1), 0
488 and self.previous_line.is_class
489 and current_line.is_triple_quoted_string
495 def _maybe_empty_lines_for_class_or_def(
496 self, current_line: Line, before: int
497 ) -> Tuple[int, int]:
498 if not current_line.is_decorator:
499 self.previous_defs.append(current_line.depth)
500 if self.previous_line is None:
501 # Don't insert empty lines before the first line in the file.
504 if self.previous_line.is_decorator:
505 if self.is_pyi and current_line.is_stub_class:
506 # Insert an empty line after a decorated stub class
511 if self.previous_line.depth < current_line.depth and (
512 self.previous_line.is_class or self.previous_line.is_def
517 self.previous_line.is_comment
518 and self.previous_line.depth == current_line.depth
524 if self.previous_line.depth > current_line.depth:
526 elif current_line.is_class or self.previous_line.is_class:
527 if current_line.is_stub_class and self.previous_line.is_stub_class:
528 # No blank line between classes with an empty body
533 current_line.is_def or current_line.is_decorator
534 ) and not self.previous_line.is_def:
535 # Blank line between a block of functions (maybe with preceding
536 # decorators) and a block of non-functions
542 if current_line.depth and newlines:
547 def enumerate_reversed(sequence: Sequence[T]) -> Iterator[Tuple[Index, T]]:
548 """Like `reversed(enumerate(sequence))` if that were possible."""
549 index = len(sequence) - 1
550 for element in reversed(sequence):
551 yield (index, element)
556 new_line: Line, old_line: Line, leaves: List[Leaf], preformatted: bool = False
559 Append leaves (taken from @old_line) to @new_line, making sure to fix the
560 underlying Node structure where appropriate.
562 All of the leaves in @leaves are duplicated. The duplicates are then
563 appended to @new_line and used to replace their originals in the underlying
564 Node structure. Any comments attached to the old leaves are reattached to
568 set(@leaves) is a subset of set(@old_line.leaves).
570 for old_leaf in leaves:
571 new_leaf = Leaf(old_leaf.type, old_leaf.value)
572 replace_child(old_leaf, new_leaf)
573 new_line.append(new_leaf, preformatted=preformatted)
575 for comment_leaf in old_line.comments_after(old_leaf):
576 new_line.append(comment_leaf, preformatted=True)
579 def is_line_short_enough(line: Line, *, line_length: int, line_str: str = "") -> bool:
580 """Return True if `line` is no longer than `line_length`.
582 Uses the provided `line_str` rendering, if any, otherwise computes a new one.
585 line_str = line_to_string(line)
587 len(line_str) <= line_length
588 and "\n" not in line_str # multiline strings
589 and not line.contains_standalone_comments()
593 def can_be_split(line: Line) -> bool:
594 """Return False if the line cannot be split *for sure*.
596 This is not an exhaustive search but a cheap heuristic that we can use to
597 avoid some unfortunate formattings (mostly around wrapping unsplittable code
598 in unnecessary parentheses).
604 if leaves[0].type == token.STRING and leaves[1].type == token.DOT:
608 for leaf in leaves[-2::-1]:
609 if leaf.type in OPENING_BRACKETS:
610 if next.type not in CLOSING_BRACKETS:
614 elif leaf.type == token.DOT:
616 elif leaf.type == token.NAME:
617 if not (next.type == token.DOT or next.type in OPENING_BRACKETS):
620 elif leaf.type not in CLOSING_BRACKETS:
623 if dot_count > 1 and call_count > 1:
629 def can_omit_invisible_parens(
632 omit_on_explode: Collection[LeafID] = (),
634 """Does `line` have a shape safe to reformat without optional parens around it?
636 Returns True for only a subset of potentially nice looking formattings but
637 the point is to not return false positives that end up producing lines that
640 bt = line.bracket_tracker
641 if not bt.delimiters:
642 # Without delimiters the optional parentheses are useless.
645 max_priority = bt.max_delimiter_priority()
646 if bt.delimiter_count_with_priority(max_priority) > 1:
647 # With more than one delimiter of a kind the optional parentheses read better.
650 if max_priority == DOT_PRIORITY:
651 # A single stranded method call doesn't require optional parentheses.
654 assert len(line.leaves) >= 2, "Stranded delimiter"
656 # With a single delimiter, omit if the expression starts or ends with
658 first = line.leaves[0]
659 second = line.leaves[1]
660 if first.type in OPENING_BRACKETS and second.type not in CLOSING_BRACKETS:
661 if _can_omit_opening_paren(line, first=first, line_length=line_length):
664 # Note: we are not returning False here because a line might have *both*
665 # a leading opening bracket and a trailing closing bracket. If the
666 # opening bracket doesn't match our rule, maybe the closing will.
668 penultimate = line.leaves[-2]
669 last = line.leaves[-1]
670 if line.magic_trailing_comma:
672 penultimate, last = last_two_except(line.leaves, omit=omit_on_explode)
674 # Turns out we'd omit everything. We cannot skip the optional parentheses.
678 last.type == token.RPAR
679 or last.type == token.RBRACE
681 # don't use indexing for omitting optional parentheses;
683 last.type == token.RSQB
685 and last.parent.type != syms.trailer
688 if penultimate.type in OPENING_BRACKETS:
689 # Empty brackets don't help.
692 if is_multiline_string(first):
693 # Additional wrapping of a multiline string in this situation is
697 if line.magic_trailing_comma and penultimate.type == token.COMMA:
698 # The rightmost non-omitted bracket pair is the one we want to explode on.
701 if _can_omit_closing_paren(line, last=last, line_length=line_length):
707 def _can_omit_opening_paren(line: Line, *, first: Leaf, line_length: int) -> bool:
708 """See `can_omit_invisible_parens`."""
710 length = 4 * line.depth
712 for _index, leaf, leaf_length in line.enumerate_with_length():
713 if leaf.type in CLOSING_BRACKETS and leaf.opening_bracket is first:
716 length += leaf_length
717 if length > line_length:
720 if leaf.type in OPENING_BRACKETS:
721 # There are brackets we can further split on.
725 # checked the entire string and line length wasn't exceeded
726 if len(line.leaves) == _index + 1:
732 def _can_omit_closing_paren(line: Line, *, last: Leaf, line_length: int) -> bool:
733 """See `can_omit_invisible_parens`."""
734 length = 4 * line.depth
735 seen_other_brackets = False
736 for _index, leaf, leaf_length in line.enumerate_with_length():
737 length += leaf_length
738 if leaf is last.opening_bracket:
739 if seen_other_brackets or length <= line_length:
742 elif leaf.type in OPENING_BRACKETS:
743 # There are brackets we can further split on.
744 seen_other_brackets = True
749 def line_to_string(line: Line) -> str:
750 """Returns the string representation of @line.
752 WARNING: This is known to be computationally expensive.
754 return str(line).strip("\n")