Avoid indent for single-line argument lists in BasicFormat#3334
Open
broken-circle wants to merge 1 commit into
Open
Avoid indent for single-line argument lists in BasicFormat#3334broken-circle wants to merge 1 commit into
BasicFormat#3334broken-circle wants to merge 1 commit into
Conversation
Treat argument-list keypaths as indentation scopes only when the argument list is multi-line at the argument level. That indentation only exists to lay out arguments that wrap onto their own lines. When arguments are all on the same line as `(`, any multi-line content comes from a nested expression that brings its own scope.
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
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.
Closes #1473.
Closes #2082.
FunctionCallExprSyntax.argumentsandTupleExprSyntax.elementswere unconditional indentation scopes inBasicFormat.requiresIndent. When the argument list itself was single-line (no argument starting on its own line) but contained a multi-line expression like a closure or collection literal, the inner expression's indentation got double-counted: once from the argument-list scope and once from the expression's own scope.For example:
formatted to:
This PR treats the argument-list keypaths as indentation scopes only when the argument list is multi-line at the argument level. That indentation only exists to lay out arguments that wrap onto their own lines. When arguments are all on the same line as
(, any multi-line content comes from a nested expression that brings its own scope.The same change is applied to
TupleExprSyntax.elements, which has the same structure (also aLabeledExprListSyntax), with the same bug (see updatedExpressionMacroTests.testStringifyExpression()).Testing
This PR adds three new tests in
BasicFormatTests, and updates 5 existing tests inCallToTrailingClosuresTest,VariableTests,DebugDescriptionTests, andExpressionMacroTeststo expect the correct format.