Fixed error caused by combination of match_arm_blocks and control_brace_style #5923
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
|
Code changes look good to me. The last thing I'd ask for is a test case similar to this one where we set |
|
Thanks for the review. I've added the test you requested. |
ytmimi
force-pushed
the
control_brace_style_error
branch
from
d9b6490 to
6ac4fdb
Compare
ytmimi
approved these changes
Oct 23, 2023
There was a problem hiding this comment.
Thanks again for your work on this! I think we're good to go here. Will likely get this merged after CI passes. Also running our Diff-Check job
ytmimi
added
release-notes
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.
Fixes #5912
When
control_brace_style = "AlwaysNextLine", the code seems to always assume thatbody_prefixis{. This is however not the case whenmatch_arm_blocks = false. This causesblock_septo introduce extra white space that causes the error.The fix was to check if
body_prefixis empty before matching onControlBraceStyle::AlwaysNextLine. If you prefer however, I can add a match guard instead of changing the ordering of the match arms.