Improve comprehension line break beheavior#5680
Merged
MichaReiser merged 1 commit intomainfrom Jul 11, 2023
Merged
Conversation
This was referenced Jul 11, 2023
Member
Author
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
MichaReiser
commented
Jul 11, 2023
| let comments = f.context().comments().clone(); | ||
|
|
||
| write!(f, [in_parentheses_only_group(&left.format())])?; | ||
| let inner = format_with(|f| { |
Member
Author
There was a problem hiding this comment.
No change other than that this gets all wrapped in an in_parentheses_only_group
Comment on lines
+95
to
+99
| for ( | ||
| ccccccccccccccccccccccccccccccccccccccc, | ||
| ddddddddddddddddddd, | ||
| [eeeeeeeeeeeeeeeeeeeeee, fffffffffffffffffffffffff], | ||
| ) in eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeffffffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhothermoreeand_even_moreddddddddddddddddddddd |
Member
Author
There was a problem hiding this comment.
Black doesn't insert parentheses here. I'll look into this next
Member
There was a problem hiding this comment.
yep i think that black remove tuple parentheses here same as for statements. i'd expect this is the same case for if-else expressions being analogous to if statements
71a4aa2 to
7357591
Compare
Contributor
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinuxWindows |
konstin
approved these changes
Jul 11, 2023
| Spacer(target), | ||
| target.format(), | ||
| soft_line_break_or_space(), | ||
| in_spacer, |
Member
There was a problem hiding this comment.
would the macros rules allow inlining the in_space as if expression?
Member
Author
There was a problem hiding this comment.
I don't think so because space and soft_line_break_or_space return different structs.
| i | ||
| in | ||
| aitertools._async_map(self.async_inc, arange(8), batch_size=3) | ||
| async for i in aitertools._async_map( |
| - and b != 9 # fmt: skip | ||
| + and b | ||
| + != 9 # fmt: skip | ||
| + and b != 9 # fmt: skip |
Comment on lines
+95
to
+99
| for ( | ||
| ccccccccccccccccccccccccccccccccccccccc, | ||
| ddddddddddddddddddd, | ||
| [eeeeeeeeeeeeeeeeeeeeee, fffffffffffffffffffffffff], | ||
| ) in eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeffffffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhothermoreeand_even_moreddddddddddddddddddddd |
Member
There was a problem hiding this comment.
yep i think that black remove tuple parentheses here same as for statements. i'd expect this is the same case for if-else expressions being analogous to if statements
a9c9dd5 to
3fbd025
Compare
7357591 to
3bce23a
Compare
3fbd025 to
30e7756
Compare
3bce23a to
e83b302
Compare
e83b302 to
6e5dc7b
Compare
Member
Author
|
@MichaReiser merged this pull request with Graphite. |
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.
Summary
This PR improves the Black compatibility when it comes to breaking comprehensions.
We want to avoid line breaks before the target and
inwhenever possible. Furthermore,if X is not Noneshould be grouped together, similar to other binary like expressionsTest Plan
cargo test