Skip to content

Commit 9a3b6ce

Browse files
committed
Less modifying of nodes
1 parent 36f90b4 commit 9a3b6ce

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

Sources/TestingMacros/Support/ConditionArgumentParsing.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,18 @@ private final class _ContextInserter<C, M>: SyntaxRewriter where C: MacroExpansi
176176
ExprSyntax(expressionContextNameExpr)
177177
}
178178

179-
var result = FunctionCallExprSyntax(calledExpression: calledExpr) {
179+
var result = FunctionCallExprSyntax(
180+
calledExpression: calledExpr,
181+
leftParen: .leftParenToken(),
182+
rightParen: .rightParenToken()
183+
) {
180184
LabeledExprSyntax(expression: node.trimmed)
181185
LabeledExprSyntax(expression: originalNode.expressionID(rootedAt: effectiveRootNode))
182186
for argument in additionalArguments {
183187
LabeledExprSyntax(argument)
184188
}
185189
}
186190

187-
result.leftParen = .leftParenToken()
188-
result.rightParen = .rightParenToken()
189191
result.leadingTrivia = originalNode.leadingTrivia
190192
result.trailingTrivia = originalNode.trailingTrivia
191193

Sources/TestingMacros/Support/EffectfulExpressionHandling.swift

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,18 @@ func findEffectKeywords(in node: some SyntaxProtocol) -> Set<Keyword> {
7474
/// - Returns: An expression representing a call to the function named
7575
/// `thunkName`, passing `expr`.
7676
private func _makeCallToEffectfulThunk(_ thunkName: TokenSyntax, passing expr: some ExprSyntaxProtocol) -> ExprSyntax {
77-
var result = FunctionCallExprSyntax(
78-
calledExpression: MemberAccessExprSyntax(
79-
base: DeclReferenceExprSyntax(baseName: .identifier("Testing")),
80-
declName: DeclReferenceExprSyntax(baseName: thunkName)
81-
)
82-
) {
83-
LabeledExprSyntax(expression: expr.trimmed)
84-
}
85-
86-
result.leftParen = .leftParenToken()
87-
result.rightParen = .rightParenToken()
88-
89-
return ExprSyntax(result)
77+
ExprSyntax(
78+
FunctionCallExprSyntax(
79+
calledExpression: MemberAccessExprSyntax(
80+
base: DeclReferenceExprSyntax(baseName: .identifier("Testing")),
81+
declName: DeclReferenceExprSyntax(baseName: thunkName)
82+
),
83+
leftParen: .leftParenToken(),
84+
rightParen: .rightParenToken()
85+
) {
86+
LabeledExprSyntax(expression: expr.trimmed)
87+
}
88+
)
9089
}
9190

9291
/// Apply the given effectful keywords (i.e. `try` and `await`) to an expression

0 commit comments

Comments
 (0)