]> git.madduck.net Git - etc/vim.git/commit

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

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.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Address pre-existing trailing commas when not in the rightmost bracket pair
authorŁukasz Langa <lukasz@langa.pl>
Mon, 24 Aug 2020 16:29:59 +0000 (18:29 +0200)
committerŁukasz Langa <lukasz@langa.pl>
Tue, 25 Aug 2020 20:10:05 +0000 (22:10 +0200)
commit586d24236e6b57bc3b5da85fdbe2563835021076
treef401a252bb12cc7de86c64bede52321062c3948c
parentd46268cd671760d4c370476006795919951b1076
Address pre-existing trailing commas when not in the rightmost bracket pair

This required some hackery.  Long story short, we need to reuse the ability to
omit rightmost bracket pairs (which glues them together and splits on something
else instead), for use with pre-existing trailing commas.

This form of user-controlled formatting is brittle so we have to be careful not
to cause a scenario where Black first formats code without trailing commas in
one way, and then looks at the same file with pre-existing trailing commas
(that it itself put on the previous run) and decides to format the code again.

One particular ugly edge case here is handling of optional parentheses.  In
particular, the long-standing `line_length=1` hack got in the way of
pre-existing trailing commas and had to be removed.  Instead, a more
intelligent but costly solution was put in place: a "second opinion" if the
formatting that omits optional parentheses ended up causing lines to be too
long.  Again, for efficiency purposes, Black reuses Leaf objects from blib2to3
and modifies them in place, which was invalid for having two separate
formattings.  Line cloning was used to mitigate this.

Fixes #1619
src/black/__init__.py
tests/data/cantfit.py
tests/data/function_trailing_comma.py
tests/data/function_trailing_comma_wip.py [deleted file]
tests/data/long_strings_flag_disabled.py
tests/test_black.py