Merge pull request #31 from apple/jgrynspan/113853493-drop-trivia

grynspan · web-flow · commit f759bd4e90e3 · 2023-09-27T12:41:29.000-04:00
Do not re-add leading/trailing trivia when expanding condition macros.
diff --git a/Sources/TestingMacros/ConditionMacro.swift b/Sources/TestingMacros/ConditionMacro.swift
@@ -137,9 +137,9 @@ extension _ConditionMacro {
     // Construct and return the call to __check().
     let call: ExprSyntax = "Testing.\(expandedFunctionName)(\(LabeledExprListSyntax(checkArguments)))"
     if isThrowing {
-      return "\(raw: macro.leadingTrivia)\(call).__required()\(raw: macro.trailingTrivia)"
+      return "\(call).__required()"
     }
-    return "\(raw: macro.leadingTrivia)\(call).__expected()\(raw: macro.trailingTrivia)"
+    return "\(call).__expected()"
   }
 
   /// Get the complete argument list for a given macro, including any trailing

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,9 @@ extension _ConditionMacro {`
`137`	`137`	`// Construct and return the call to __check().`
`138`	`138`	`let call: ExprSyntax = "Testing.\(expandedFunctionName)(\(LabeledExprListSyntax(checkArguments)))"`
`139`	`139`	`if isThrowing {`
`140`		`- return "\(raw: macro.leadingTrivia)\(call).__required()\(raw: macro.trailingTrivia)"`
	`140`	`+ return "\(call).__required()"`
`141`	`141`	`}`
`142`		`- return "\(raw: macro.leadingTrivia)\(call).__expected()\(raw: macro.trailingTrivia)"`
	`142`	`+ return "\(call).__expected()"`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`/// Get the complete argument list for a given macro, including any trailing`