Merge pull request #138 from Matejkob/update-gh-action

Update lib to swift-syntax 601

Author: Matejkob

.github/workflows/ci.yml

@@ -19,16 +19,22 @@ concurrency:
 jobs:
   macos:
     name: macOS - ${{ matrix.package }} (Xcode ${{ matrix.xcode }})
-    runs-on: macos-14
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        xcode:
-          - '16.1'
-          - '16.0'
-          - '15.4'
-        package:
-          - 'main'
-          - 'Examples'
+        include:
+          - os: macos-15
+            xcode: '16.2'
+            package: 'main'
+          - os: macos-15
+            xcode: '16.2'
+            package: 'Examples'
+          - os: macos-14
+            xcode: '15.4'
+            package: 'main'
+          - os: macos-14
+            xcode: '15.4'
+            package: 'Examples'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -82,37 +88,37 @@ jobs:
       - name: Run tests
         run: swift test
 
-  windows:
-    name: Windows - ${{ matrix.package }} (Swift ${{ matrix.swift }})
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        swift:
-          - '6.0'
-          - '5.10'
-          - '5.9.1' # Macros has been added to Swift on Windows in 5.9.1 version
-        package:
-          - 'main'
-          - 'Examples'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Swift
-        uses: compnerd/gha-setup-swift@main
-        with:
-          branch: swift-${{ matrix.swift }}-release
-          tag: ${{ matrix.swift }}-RELEASE
-
-      # Set working directory to Examples if testing the examples package
-      - name: Set working directory
-        run: |
-          if ("${{ matrix.package }}" -eq "Examples") {
-            cd Examples
-          }
-
-      - name: Build package
-        run: swift build
+#  windows:
+#    name: Windows - ${{ matrix.package }} (Swift ${{ matrix.swift }})
+#    runs-on: windows-latest
+#    strategy:
+#      matrix:
+#        swift:
+#          - '6.0'
+#          - '5.10'
+#          - '5.9.1' # Macros has been added to Swift on Windows in 5.9.1 version
+#        package:
+#          - 'main'
+#          - 'Examples'
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@v4
+#
+#      - name: Install Swift
+#        uses: compnerd/gha-setup-swift@main
+#        with:
+#          branch: swift-${{ matrix.swift }}-release
+#          tag: ${{ matrix.swift }}-RELEASE
+#
+#      # Set working directory to Examples if testing the examples package
+#      - name: Set working directory
+#        run: |
+#          if ("${{ matrix.package }}" -eq "Examples") {
+#            cd Examples
+#          }
+#
+#      - name: Build package
+#        run: swift build
 
 # Looks like tests don't work on Windows
       # - name: Run tests
@@ -121,13 +127,13 @@ jobs:
   code-coverage:
     name: Gather Code Coverage
     needs: macos
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Select latest Xcode
-        run: sudo xcode-select -s /Applications/Xcode_15.4.app
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app
 
       - name: Build and test with coverage
         run: swift test -Xswiftc -Xfrontend -Xswiftc -dump-macro-expansions --enable-code-coverage
@@ -157,9 +163,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Swift versions
+        run: swift --version
+        
       - name: Run Swift Macro Compatibility Check
         uses: Matejkob/swift-macro-compatibility-check@v1
         with:
           run-tests: true
-          major-versions-only: false
+          major-versions-only: true
 

Package.resolved

@@ -19,7 +19,7 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0")
+    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0")
   ],
   targets: [
     .macro(

Package.swift

@@ -19,7 +19,7 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0")
+    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0")
   ],
   targets: [
     .macro(

Package@swift-6.0.swift

@@ -107,19 +107,46 @@ extension ArrayTypeSyntax: TypeSyntaxSupportingGenerics {
 
 extension GenericArgumentClauseSyntax: TypeSyntaxSupportingGenerics {
   fileprivate var nestedTypeSyntaxes: [TypeSyntax] {
-    arguments.map { $0.argument }
+    arguments.compactMap {
+      #if canImport(SwiftSyntax601)
+        if case let .type(type) = $0.argument {
+            return type
+        } else {
+          return nil
+        }
+      #else
+        return $0.argument
+      #endif
+    }
   }
+  
   fileprivate func erasingGenericTypes(_ genericTypes: Set<String>) -> Self {
-    with(
-      \.arguments,
-      GenericArgumentListSyntax {
-        for argumentElement in arguments {
-          argumentElement.with(
-            \.argument,
-            argumentElement.argument.erasingGenericTypes(genericTypes)
-          )
+    var newArgumentElements: [GenericArgumentSyntax] = []
+    
+    for argumentElement in arguments {
+      #if canImport(SwiftSyntax601)
+        let newArgument: TypeSyntax
+        switch argumentElement.argument {
+        case let .type(type):
+          newArgument = type.erasingGenericTypes(genericTypes)
+        default: continue
         }
-      }
+      #else
+        let newArgument: TypeSyntax = argumentElement.argument.erasingGenericTypes(genericTypes)
+      #endif
+      let newArgumentElement = GenericArgumentSyntax(
+        argument: newArgument,
+        trailingComma: argumentElement.trailingComma
+      )
+      newArgumentElements.append(newArgumentElement)
+    }
+    
+    let newArguments = GenericArgumentListSyntax(newArgumentElements)
+    
+    return Self(
+      leftAngle: self.leftAngle,
+      arguments: newArguments,
+      rightAngle: self.rightAngle
     )
   }
 }
@@ -128,6 +155,7 @@ extension TupleTypeSyntax: TypeSyntaxSupportingGenerics {
   fileprivate var nestedTypeSyntaxes: [TypeSyntax] {
     elements.map { $0.type }
   }
+  
   fileprivate func erasingGenericTypes(_ genericTypes: Set<String>) -> Self {
     with(
       \.elements,