Adjust rhs shape width to account for next line indentation #5327
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
|
Need to think on this for a bit to determine whether it meets the criteria of a true bug or if it's at risk of violating our stability guarantee and would need to be gated. It's likely going to end up being the latter even though there's a reasonable case to be made for the former |
Fixes 5321 Previously the `Shape` returned from `expr::shape_from_rhs_tactic` would always return a `Shape` with a `width` == `config.max_width` when the `rhs_tactic` was `RhsTactics::ForceNextLineWithoutIndent` and the indentation was 0. For example, when rewriting generic trait bounds at the top level of a file. In this case, trait bounds that were between (`max_width` - `tab_spaces`) and `max_width`, would be considered properly formatted and wouldn't wrap. Now, the shape takes into account the whitespace to properly wrap when the `max_width` is exceeded.
Although the issue described in 5321 could be considered a bug, it might also lead to breaking formatting changes. For that reason the fix is only applied when `version=Two`
|
@calebcartwright I went ahead and version gated the changes. If we decide that It doesn't need to be version gated it should be easy to revert the 2nd commit. |
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 #5321
Previously the
Shapereturned fromexpr::shape_from_rhs_tacticwould always return aShapewith awidth==config.max_widthwhen therhs_tacticwasRhsTactics::ForceNextLineWithoutIndentand theindentation was 0. For example, when rewriting generic trait bounds at the top level of a file.
In this case, trait bounds that were between (
max_width-tab_spaces) andmax_width, would be considered properly formatted and wouldn't wrap.Now, the shape takes into account the whitespace to properly wrap when the
max_widthis exceeded.