Fixes for SwiftSyntax 601 (pointfreeco#42)

* wip

* wip

* wip

* wip

* Update ci.yml

---------

Co-authored-by: Stephen Celis <[email protected]>

Author: mbrandonw

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ concurrency:
 jobs:
   macos:
     name: macOS
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
-      - name: Select Xcode 15
-        run: sudo xcode-select -s /Applications/Xcode_15.0.app
+      - name: Select Xcode 16.2
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app
       - name: Run tests
         run: swift test
 
@@ -80,4 +80,4 @@ jobs:
       - uses: actions/checkout@v4
       - uses: skiptools/swift-android-action@v2
         with:
-          swift-version: ${{ matrix.swift }}
+          swift-version: ${{ matrix.swift }}

Package.resolved

@@ -470,6 +470,23 @@ extension FixIt.Change {
         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
     }
   }
 }

Sources/MacroTesting/AssertMacro.swift

@@ -53,7 +53,8 @@ public struct AddAsyncMacro: PeerMacro {
       let completionHandlerParameterAttribute = funcDecl.signature.parameterClause.parameters.last?
         .type.as(AttributedTypeSyntax.self),
       let completionHandlerParameter = completionHandlerParameterAttribute.baseType.as(
-        FunctionTypeSyntax.self)
+        FunctionTypeSyntax.self
+      )
     else {
       throw CustomError.message(
         "@addAsync requires an function that has a completion handler as last parameter"
@@ -70,12 +71,27 @@ public struct AddAsyncMacro: PeerMacro {
     }
 
     let returnType = completionHandlerParameter.parameters.first?.type
-
     let isResultReturn = returnType?.children(viewMode: .all).first?.description == "Result"
-    let successReturnType =
-      isResultReturn
-      ? returnType!.as(IdentifierTypeSyntax.self)!.genericArgumentClause?.arguments.first!.argument
-      : returnType
+
+    let successReturnType: TypeSyntax? = {
+      guard isResultReturn
+      else { return returnType }
+
+      let successType = returnType!.as(IdentifierTypeSyntax.self)!.genericArgumentClause?.arguments.first!
+        .argument
+      #if canImport(SwiftSyntax601)
+        switch successType {
+        case .none:
+          return nil
+        case .type(let syntax):
+          return syntax
+        default:
+          return nil
+        }
+      #else
+        return successType
+      #endif
+    }()
 
     // Remove completionHandler and comma from the previous parameter
     var newParameterList = funcDecl.signature.parameterClause.parameters
@@ -141,7 +157,9 @@ public struct AddAsyncMacro: PeerMacro {
     // add result type
     if let successReturnType {
       funcDecl.signature.returnClause = ReturnClauseSyntax(
-        leadingTrivia: .space, type: successReturnType.with(\.leadingTrivia, .space))
+        leadingTrivia: .space,
+        type: successReturnType.with(\.leadingTrivia, .space)
+      )
     } else {
       funcDecl.signature.returnClause = nil
     }

Tests/MacroTestingTests/MacroExamples/AddAsyncMacro.swift

@@ -93,7 +93,9 @@ public struct OptionSetMacro {
       else {
         context.diagnose(
           OptionSetMacroDiagnostic.requiresStringLiteral(optionsEnumNameArgumentLabel).diagnose(
-            at: optionEnumNameArg.expression))
+            at: optionEnumNameArg.expression
+          )
+        )
         return nil
       }
 
@@ -121,7 +123,8 @@ public struct OptionSetMacro {
       }).first
     else {
       context.diagnose(
-        OptionSetMacroDiagnostic.requiresOptionsEnum(optionsEnumName).diagnose(at: decl))
+        OptionSetMacroDiagnostic.requiresOptionsEnum(optionsEnumName).diagnose(at: decl)
+      )
       return nil
     }
 
@@ -135,7 +138,25 @@ public struct OptionSetMacro {
       return nil
     }
 
-    return (structDecl, optionsEnum, rawType)
+    let rawTypeSyntax: TypeSyntax?
+    #if canImport(SwiftSyntax601)
+      switch rawType {
+      case .type(let typeSyntax):
+        rawTypeSyntax = typeSyntax
+      default:
+        rawTypeSyntax = nil
+      }
+    #else
+      rawTypeSyntax = rawType
+    #endif
+
+    guard let rawTypeSyntax
+    else {
+      context.diagnose(OptionSetMacroDiagnostic.requiresOptionsEnumRawType.diagnose(at: attribute))
+      return nil
+    }
+
+    return (structDecl, optionsEnum, rawTypeSyntax)
   }
 }