Fix type param formatting in funcdef with trailing comma #4255
Conversation
This file contains 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
sumezulike
changed the title
Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com>
Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com>
Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com>
…ype-param-comma # Conflicts: # CHANGES.md
|
I thought it might be best to just submit a fix for the bug and work on the other changes in a separate PR. |
CHANGES.md
Outdated
| @@ -10,6 +10,11 @@ | |||
|
|
|||
| <!-- Changes that affect Black's stable style --> | |||
|
|
|||
| - Don't move comments along with delimiters, which could cause crashes (#4248) | |||
|
|
|||
| - Fixed a bug where lines were split incorrectly for function definitions with type | |||
There was a problem hiding this comment.
This needs to be a change to the preview style instead.
There was a problem hiding this comment.
(And to be clear, the bigger ask here is that the style change itself should only be applied in the preview style, not just that the changelog entry be moved.)
There was a problem hiding this comment.
Oh, so sorry about that, I misunderstood.
|
Closing this in favor of #4272 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This change adds additional checks to the decision whether to split a funcdef from the left or right-hand side.
Specifically, this adds the following condition to
should_split_funcdef_with_rhs:If a funcdef has type parameters and its parameters also have a trailing comma, return
True, to indicate that the funcdef should not be split from the left first.This fixes the bug described in #4254.
I am currently trying to also fix #3929 and #4071 since they seem related, but that seems to require a little more work. Any suggestions are appreciated.
Checklist - did you ...
CHANGES.mdif necessary?