actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-use indexes of current iteration in comments_after()

Browse Source
This commit is contained in:
Łukasz Langa 2018-05-14 11:17:56 -07:00
parent 5db5697eb1
commit a677713ebf
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
black.py
View File

@ -975,17 +975,21 @@ def append_comment(self, comment: Leaf) -> bool:
self.comments.append((after, comment)) self.comments.append((after, comment))
return True return True
def comments_after(self, leaf: Leaf) -> Iterator[Leaf]: def comments_after(self, leaf: Leaf, _index: int = -1) -> Iterator[Leaf]:
"""Generate comments that should appear directly after `leaf`.""" """Generate comments that should appear directly after `leaf`.
for _leaf_index, _leaf in enumerate(self.leaves):
if leaf is _leaf:
break
else: Provide a non-negative leaf `_index` to speed up the function.
return """
if _index == -1:
for _index, _leaf in enumerate(self.leaves):
if leaf is _leaf:
break
else:
return
for index, comment_after in self.comments: for index, comment_after in self.comments:
if _leaf_index == index: if _index == index:
yield comment_after yield comment_after
def remove_trailing_comma(self) -> None: 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 = Line(depth=line.depth, inside_brackets=line.inside_brackets)
current_line.append(leaf) current_line.append(leaf)
for leaf in line.leaves: for index, leaf in enumerate(line.leaves):
yield from append_to_line(leaf) 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) yield from append_to_line(comment_after)
lowest_depth = min(lowest_depth, leaf.bracket_depth) 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 = Line(depth=line.depth, inside_brackets=line.inside_brackets)
current_line.append(leaf) current_line.append(leaf)
for leaf in line.leaves: for index, leaf in enumerate(line.leaves):
yield from append_to_line(leaf) 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) yield from append_to_line(comment_after)
if current_line: if current_line: