FormatWriter: accumulate align shift correctly #3615
Merged
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
Alignment logic accumulates alignment shift for matching lines, with the assumption that the extra space will definitely be added. However, we don't add extra spaces to no-split cases, instead attempting to delay them until the next token... but if the next token is also a no-split, then the extra alignment space is lost, leading to incorrect formatting. One such example is `(` which typically has no spaces before or after.
Closed
tgodzik
approved these changes
Aug 18, 2023
srowen
pushed a commit
to apache/spark
that referenced
this pull request
Sep 2, 2023
### What changes were proposed in this pull request? The pr aims to upgrade `scalafmt` from 3.7.5 to 3.7.13. ### Why are the changes needed? 1.The newest version include some bug fixed, eg: - FormatWriter: accumulate align shift correctly (scalameta/scalafmt#3615) - Indents: ignore fewerBraces if indentation is 1 (scalameta/scalafmt#3592) - RemoveScala3OptionalBraces: handle infix on rbrace (scalameta/scalafmt#3576) 2.The full release notes: https://github.com/scalameta/scalafmt/releases/tag/v3.7.13 https://github.com/scalameta/scalafmt/releases/tag/v3.7.12 https://github.com/scalameta/scalafmt/releases/tag/v3.7.11 https://github.com/scalameta/scalafmt/releases/tag/v3.7.10 https://github.com/scalameta/scalafmt/releases/tag/v3.7.9 https://github.com/scalameta/scalafmt/releases/tag/v3.7.8 https://github.com/scalameta/scalafmt/releases/tag/v3.7.7 https://github.com/scalameta/scalafmt/releases/tag/v3.7.6 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #42764 from panbingkun/SPARK-45043. Authored-by: panbingkun <pbk1982@gmail.com> Signed-off-by: Sean Owen <srowen@gmail.com>
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.
Alignment logic accumulates alignment shift for matching lines, with the assumption that the extra space will definitely be added.
However, we don't add extra spaces to no-split cases, instead attempting to delay them until the next token... but if the next token is also a no-split, then the extra alignment space is lost, leading to incorrect formatting.
One such example is
(which typically has no spaces before or after.Helps with #3614.