[563] Fix standalone comments inside complex blocks crashing Black#4016
Merged
JelleZijlstra merged 9 commits intopsf:mainfrom Nov 7, 2023
Merged
[563] Fix standalone comments inside complex blocks crashing Black#4016JelleZijlstra merged 9 commits intopsf:mainfrom
JelleZijlstra merged 9 commits intopsf:mainfrom
Conversation
Bracket depth is not an accurate indicator of standalone comment position inside more complex blocks because bracket depth can be virtual (in loops' and lambdas' parameter blocks) or from optional parens. Here we try to stop cumulating lines upon standalone comments in complex blocks, and try to make standalone comment processing more simple. The fundamental idea is, that if we have a standalone comment, it needs to go on its own line, so we always have to split. This is not perfect, but at least a first step.
Contributor
Author
|
...aaand there seems to be some formatting changes in the stable style, so I'll convert this into a draft until those are resolved. edit: Resolved 🚀 |
JelleZijlstra
approved these changes
Nov 7, 2023
Contributor
Author
|
Can we also close the issue? |
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.
Description
As described here, and in referenced issues thereof, Black crashes when standalone comments are sprinkled inside complex multiline blocks. This PR takes a first step in fixing the most obvious cases and aims to get rid of blatant crashing. There are known issues with more nested expressions not being indented correctly, e.g.
currently becomes
I suggest we tackle those more cosmetic problems in a separate PR.
Checklist - did you ...
CHANGES.mdif necessary?