Fix CodeGenerationFormat to correctly indent LabeledExprListSyntax in method calls that start on a new line
#2851
Conversation
| let inMethodCallThatStartsOnNewline = | ||
| if let functionCallExpr = node.parent?.as(FunctionCallExprSyntax.self), | ||
| let memberAccessExpr = functionCallExpr.calledExpression.as(MemberAccessExprSyntax.self), | ||
| startsOnNewline(memberAccessExpr.period) | ||
| { | ||
| true | ||
| } else { | ||
| false | ||
| } |
There was a problem hiding this comment.
If you mad startsOnNewline an extension on SyntaxProtocol this could be done without an if expression:
node.parent?.as(FunctionCallExprSyntax.self).calledExpression.as(MemberAccessExprSyntax.self)?.startsOnNewline ?? falseWhy does this only apply if the called expression is a MemberAccessExprSyntax? Shouldn’t the same be true for top level function calls as well?
There was a problem hiding this comment.
If you mad
startsOnNewlinean extension onSyntaxProtocolthis could be done without anifexpression:node.parent?.as(FunctionCallExprSyntax.self).calledExpression.as(MemberAccessExprSyntax.self)?.startsOnNewline ?? false
Done 👍
Why does this only apply if the called expression is a
MemberAccessExprSyntax? Shouldn’t the same be true for top level function calls as well?
If you mean top level function calls by specifying the module, they also parse into MemberAccessExprSyntax. Example:
Swift
.print(
"1",
"2",
separator: ",",
terminator: ";"
)
There was a problem hiding this comment.
I mean if you have something like
print(
"1",
"2"
)Or do we format that correctly already?
There was a problem hiding this comment.
Or do we format that correctly already?
Yes we do.
There was a problem hiding this comment.
Oh, great. Thanks for confirming
|
Should I squash the commits to remove the use of the |
|
Yes, that would be good |
…` in method calls that start on a new line
roopekv
force-pushed
the
fix-code-gen-newline-method-call-indentation
branch
from
9676296 to
0dcb6df
Compare
|
Done 👍 |
|
@swift-ci Please test |
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
1 similar comment
|
@swift-ci Please test Windows |
This fixes a case where
CodeGenerationFormatwould incorrectly indent the arguments (LabeledExprListSyntax) and the right parenthesis of method calls that start on a new line when formatting children to be separated by a newline.