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

Simplify the #606 patch

Browse Source 
Thanks for the original patch to solve #509, @hauntsaninja.
This commit is contained in:
Łukasz Langa 2019-03-14 13:18:12 +01:00
parent 227c2d77b4
commit 087fedb17e
No known key found for this signature in database
GPG Key ID: B26995E310250568
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -937,7 +937,7 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
## Change Log
### 19.2b0
### 19.3b0
* removed `--py36` (use `--target-version=py36` instead) (#724)
@ -948,6 +948,8 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
* new option `--target-version` to control which Python versions
*Black*-formatted code should target (#618)
* improved performance of formatting deeply nested data structures (#509)
### 18.9b0
* numeric literals are now formatted by *Black* (#452, #461, #464, #469):
@ -1354,6 +1356,7 @@ Multiple contributions by:
* [Christian Heimes](mailto:christian@python.org)
* [Daniel M. Capella](mailto:polycitizen@gmail.com)
* [Eli Treuherz](mailto:eli@treuherz.com)
* hauntsaninja
* Hugo van Kemenade
* [Ivan Katanić](mailto:ivan.katanic@gmail.com)
* [Jonas Obrist](mailto:ojiidotch@gmail.com)

27
black.py
View File

@ -1061,9 +1061,7 @@ class Line:
depth: int = 0
leaves: List[Leaf] = Factory(list)
# The LeafID keys of comments must remain ordered by the corresponding leaf's index
# in leaves
comments: Dict[LeafID, List[Leaf]] = Factory(dict)
comments: Dict[LeafID, List[Leaf]] = Factory(dict) # keys ordered like `leaves`
bracket_tracker: BracketTracker = Factory(BracketTracker)
inside_brackets: bool = False
should_explode: bool = False
@ -1275,13 +1273,8 @@ def append_comment(self, comment: Leaf) -> bool:
comment.prefix = ""
return False
else:
leaf_id = id(self.leaves[-1])
if leaf_id not in self.comments:
self.comments[leaf_id] = [comment]
else:
self.comments[leaf_id].append(comment)
return True
self.comments.setdefault(id(self.leaves[-1]), []).append(comment)
return True
def comments_after(self, leaf: Leaf) -> List[Leaf]:
"""Generate comments that should appear directly after `leaf`."""
@ -1289,17 +1282,11 @@ def comments_after(self, leaf: Leaf) -> List[Leaf]:
def remove_trailing_comma(self) -> None:
"""Remove the trailing comma and moves the comments attached to it."""
# Remember, the LeafID keys of self.comments are ordered by the
# corresponding leaf's index in self.leaves
# If id(self.leaves[-2]) is in self.comments, the order doesn't change.
# Otherwise, we insert it into self.comments, and it becomes the last entry.
# However, since we delete id(self.leaves[-1]) from self.comments, the invariant
# is maintained
self.comments.setdefault(id(self.leaves[-2]), []).extend(
self.comments.get(id(self.leaves[-1]), [])
trailing_comma = self.leaves.pop()
trailing_comma_comments = self.comments.pop(id(trailing_comma), [])
self.comments.setdefault(id(self.leaves[-1]), []).extend(
trailing_comma_comments
)
self.comments.pop(id(self.leaves[-1]), None)
self.leaves.pop()
def is_complex_subscript(self, leaf: Leaf) -> bool:
"""Return True iff `leaf` is part of a slice with non-trivial exprs."""