Fix crash on assert and parenthesized % format (fixes #1597, fixes #1605)#1681
Merged
JelleZijlstra merged 1 commit intopsf:masterfrom Sep 6, 2020
Conversation
JelleZijlstra
approved these changes
Sep 6, 2020
| try: | ||
| append_leaves(new_line, line, LL[: string_idx - 1]) | ||
| except BracketMatchError as e: | ||
| # HACK: I believe there is currently a bug somewhere in |
Collaborator
There was a problem hiding this comment.
This is unfortunate, but it's better than a crash, and the formatting in the newly added test cases looks reasonable.
Contributor
Author
There was a problem hiding this comment.
On second thought, I don't think this will do. The append_leaves() function modifies the Node structure of the leaves and so must be atomic. I will have to come up with a different solution.
Contributor
Author
There was a problem hiding this comment.
Ok. This is fixed. The corrected version of this fix, though still not ideal, has the benefit of stripping the parens as is consistent with blacks style after #1132.
ccc7723 to
d55a5f4
Compare
JelleZijlstra
approved these changes
Sep 6, 2020
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1597. Fixes #1605.