Less modifying of nodes

swiftlang · Dec 17, 2024 · 9a3b6ce · 9a3b6ce
1 parent 36f90b4
commit 9a3b6ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/Sources/TestingMacros/Support/ConditionArgumentParsing.swift b/Sources/TestingMacros/Support/ConditionArgumentParsing.swift
@@ -176,16 +176,18 @@ private final class _ContextInserter<C, M>: SyntaxRewriter where C: MacroExpansi
       ExprSyntax(expressionContextNameExpr)
     }
 
-    var result = FunctionCallExprSyntax(calledExpression: calledExpr) {
+    var result = FunctionCallExprSyntax(
+      calledExpression: calledExpr,
+      leftParen: .leftParenToken(),
+      rightParen: .rightParenToken()
+    ) {
       LabeledExprSyntax(expression: node.trimmed)
       LabeledExprSyntax(expression: originalNode.expressionID(rootedAt: effectiveRootNode))
       for argument in additionalArguments {
         LabeledExprSyntax(argument)
       }
     }
 
-    result.leftParen = .leftParenToken()
-    result.rightParen = .rightParenToken()
     result.leadingTrivia = originalNode.leadingTrivia
     result.trailingTrivia = originalNode.trailingTrivia
 

diff --git a/Sources/TestingMacros/Support/EffectfulExpressionHandling.swift b/Sources/TestingMacros/Support/EffectfulExpressionHandling.swift
@@ -74,19 +74,18 @@ func findEffectKeywords(in node: some SyntaxProtocol) -> Set<Keyword> {
 /// - Returns: An expression representing a call to the function named
 ///   `thunkName`, passing `expr`.
 private func _makeCallToEffectfulThunk(_ thunkName: TokenSyntax, passing expr: some ExprSyntaxProtocol) -> ExprSyntax {
-  var result = FunctionCallExprSyntax(
-    calledExpression: MemberAccessExprSyntax(
-      base: DeclReferenceExprSyntax(baseName: .identifier("Testing")),
-      declName: DeclReferenceExprSyntax(baseName: thunkName)
-    )
-  ) {
-    LabeledExprSyntax(expression: expr.trimmed)
-  }
-
-  result.leftParen = .leftParenToken()
-  result.rightParen = .rightParenToken()
-
-  return ExprSyntax(result)
+  ExprSyntax(
+    FunctionCallExprSyntax(
+      calledExpression: MemberAccessExprSyntax(
+        base: DeclReferenceExprSyntax(baseName: .identifier("Testing")),
+        declName: DeclReferenceExprSyntax(baseName: thunkName)
+      ),
+      leftParen: .leftParenToken(),
+      rightParen: .rightParenToken()
+    ) {
+      LabeledExprSyntax(expression: expr.trimmed)
+    }
+  )
 }
 
 /// Apply the given effectful keywords (i.e. `try` and `await`) to an expression