Commit a677713e authored by Łukasz Langa's avatar Łukasz Langa
Browse files

Re-use indexes of current iteration in `comments_after()`

parent 5db5697e
Loading
Loading
Loading
Loading
+12 −8
Changes for black.py: 12 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -975,9 +975,13 @@ def append_comment(self, comment: Leaf) -> bool:
            self.comments.append((after, comment))
            return True

    def comments_after(self, leaf: Leaf) -> Iterator[Leaf]:
        """Generate comments that should appear directly after `leaf`."""
        for _leaf_index, _leaf in enumerate(self.leaves):
    def comments_after(self, leaf: Leaf, _index: int = -1) -> Iterator[Leaf]:
        """Generate comments that should appear directly after `leaf`.

        Provide a non-negative leaf `_index` to speed up the function.
        """
        if _index == -1:
            for _index, _leaf in enumerate(self.leaves):
                if leaf is _leaf:
                    break

@@ -985,7 +989,7 @@ def comments_after(self, leaf: Leaf) -> Iterator[Leaf]:
                return

        for index, comment_after in self.comments:
            if _leaf_index == index:
            if _index == index:
                yield comment_after

    def remove_trailing_comma(self) -> None:
@@ -2055,10 +2059,10 @@ def append_to_line(leaf: Leaf) -> Iterator[Line]:
            current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets)
            current_line.append(leaf)

    for leaf in line.leaves:
    for index, leaf in enumerate(line.leaves):
        yield from append_to_line(leaf)

        for comment_after in line.comments_after(leaf):
        for comment_after in line.comments_after(leaf, index):
            yield from append_to_line(comment_after)

        lowest_depth = min(lowest_depth, leaf.bracket_depth)
@@ -2102,10 +2106,10 @@ def append_to_line(leaf: Leaf) -> Iterator[Line]:
            current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets)
            current_line.append(leaf)

    for leaf in line.leaves:
    for index, leaf in enumerate(line.leaves):
        yield from append_to_line(leaf)

        for comment_after in line.comments_after(leaf):
        for comment_after in line.comments_after(leaf, index):
            yield from append_to_line(comment_after)

    if current_line: