Support SwiftSyntax 601

.github/workflows/ci.yml

@@ -27,6 +27,7 @@ jobs:
             "509.0.0..<510.0.0",
             "510.0.0..<511.0.0",
             "511.0.0..<601.0.0",
+            "601.0.0..<602.0.0",
           ]
 
     steps:

Package.swift

@@ -30,7 +30,7 @@ let package = Package(
     .conditionalPackage(
       url: "https://github.com/swiftlang/swift-syntax",
       envVar: "SWIFT_SYNTAX_VERSION",
-      default: "509.0.0..<601.0.0"
+      default: "509.0.0..<602.0.0"
     ),
   ],
   targets: [

Sources/MacroTesting/AssertMacro.swift

@@ -549,14 +549,14 @@ public func assertMacro(
   }
 }
 
-// From: https://github.com/apple/swift-syntax/blob/d647052/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift
-extension FixIt.Change {
+// From: https://github.com/swiftlang/swift-syntax/blob/601.0.1/Sources/SwiftSyntaxMacrosGenericTestSupport/Assertions.swift
+fileprivate extension FixIt.Change {
   /// Returns the edit for this change, translating positions from detached nodes
   /// to the corresponding locations in the original source file based on
   /// `expansionContext`.
   ///
   /// - SeeAlso: `FixIt.Change.edit`
-  fileprivate func edit(in expansionContext: BasicMacroExpansionContext) -> SourceEdit {
+  func edit(in expansionContext: BasicMacroExpansionContext) -> SourceEdit {
     switch self {
     case .replace(let oldNode, let newNode):
       let start = expansionContext.position(of: oldNode.position, anchoredAt: oldNode)
@@ -568,21 +568,30 @@ extension FixIt.Change {
 
     case .replaceLeadingTrivia(let token, let newTrivia):
       let start = expansionContext.position(of: token.position, anchoredAt: token)
-      let end = expansionContext.position(
-        of: token.positionAfterSkippingLeadingTrivia, anchoredAt: token)
+      let end = expansionContext.position(of: token.positionAfterSkippingLeadingTrivia, anchoredAt: token)
       return SourceEdit(
         range: start..<end,
         replacement: newTrivia.description
       )
 
     case .replaceTrailingTrivia(let token, let newTrivia):
-      let start = expansionContext.position(
-        of: token.endPositionBeforeTrailingTrivia, anchoredAt: token)
+      let start = expansionContext.position(of: token.endPositionBeforeTrailingTrivia, anchoredAt: token)
       let end = expansionContext.position(of: token.endPosition, anchoredAt: token)
       return SourceEdit(
         range: start..<end,
         replacement: newTrivia.description
       )
+
+#if canImport(SwiftSyntax601)
+    case .replaceChild(let replacingChildData):
+      let range = replacingChildData.replacementRange
+      let start = expansionContext.position(of: range.lowerBound, anchoredAt: replacingChildData.parent)
+      let end = expansionContext.position(of: range.upperBound, anchoredAt: replacingChildData.parent)
+      return SourceEdit(
+        range: start..<end,
+        replacement: replacingChildData.newChild.description
+      )
+#endif
     }
   }
 }

Tests/MacroTestingTests/MacroExamples/AddAsyncMacro.swift

@@ -74,7 +74,7 @@ public struct AddAsyncMacro: PeerMacro {
     let isResultReturn = returnType?.children(viewMode: .all).first?.description == "Result"
     let successReturnType =
       isResultReturn
-      ? returnType!.as(IdentifierTypeSyntax.self)!.genericArgumentClause?.arguments.first!.argument
+      ? returnType!.as(IdentifierTypeSyntax.self)!.genericArgumentClause?.arguments.first!.argumentCompat600
       : returnType
 
     // Remove completionHandler and comma from the previous parameter

Tests/MacroTestingTests/MacroExamples/OptionSetMacro.swift

@@ -129,7 +129,7 @@ public struct OptionSetMacro {
     guard
       let genericArgs = attribute.attributeName.as(IdentifierTypeSyntax.self)?
         .genericArgumentClause,
-      let rawType = genericArgs.arguments.first?.argument
+      let rawType = genericArgs.arguments.first?.argumentCompat600
     else {
       context.diagnose(OptionSetMacroDiagnostic.requiresOptionsEnumRawType.diagnose(at: attribute))
       return nil

Tests/MacroTestingTests/SwiftSyntaxCompatibilityHelpers.swift

@@ -0,0 +1,11 @@
+import SwiftSyntax
+
+extension GenericArgumentSyntax {
+    var argumentCompat600: TypeSyntax? {
+#if canImport(SwiftSyntax601)
+        argument.as(TypeSyntax.self)
+#else
+        argument
+#endif
+    }
+}