FormatWriter: traverse align owner up infix chain #4904
Merged
Conversation
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
Since an infix chain usually looks like one expression, especially when spanning multiple lines, let's get the outer one.
tgodzik
approved these changes
May 16, 2025
kitbellew
added a commit
to kitbellew/scalafmt
that referenced
this pull request
May 19, 2025
Keep the owner unchanged but apply this special logic mapping operator (Term.Name) to parent infix tree (Term.ApplyInfix) only when checking if the operator token is to be aligned using configured matchers. If an infix expression starts with a multiline subexpression but ends with a single line of tokens to be aligned, then subsequent single-line statements are properly aligned with it. However, in the opposite case, when an infix expression starts with a single line of tokens to be aligned and continues with a multiline part, then it was not aligned with previous statements. By keeping the owner, we fix this inconsistency. Includes undo of scalameta#4904.
kitbellew
added a commit
to kitbellew/scalafmt
that referenced
this pull request
May 19, 2025
Keep the owner unchanged but apply this special logic mapping operator (Term.Name) to parent infix tree (Term.ApplyInfix) only when checking if the operator token is to be aligned using configured matchers. If an infix expression starts with a multiline subexpression but ends with a single line of tokens to be aligned, then subsequent single-line statements are properly aligned with it. However, in the opposite case, when an infix expression starts with a single line of tokens to be aligned and continues with a multiline part, then it was not aligned with previous statements. By keeping the owner, we fix this inconsistency. Includes undo of scalameta#4904.
kitbellew
added a commit
that referenced
this pull request
May 19, 2025
Keep the owner unchanged but apply this special logic mapping operator (Term.Name) to parent infix tree (Term.ApplyInfix) only when checking if the operator token is to be aligned using configured matchers. If an infix expression starts with a multiline subexpression but ends with a single line of tokens to be aligned, then subsequent single-line statements are properly aligned with it. However, in the opposite case, when an infix expression starts with a single line of tokens to be aligned and continues with a multiline part, then it was not aligned with previous statements. By keeping the owner, we fix this inconsistency. Includes undo of #4904.
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.
Since an infix chain usually looks like one expression, especially when spanning multiple lines, let's get the outer one.