• Fix XCode 15.2 and SwiftSyntax issues

Author: theangelperalta

Package.swift

@@ -20,7 +20,7 @@ let package = Package(
     ],
     dependencies: [
         // Depend on the latest Swift 5.9 prerelease of SwiftSyntax
-        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0-swift-5.9-DEVELOPMENT-SNAPSHOT-2023-04-25-b"),
+        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.1.1"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

Sources/ModifiedCopyMacros/ModifiedCopyMacro.swift

@@ -46,17 +46,17 @@ public struct ModifiedCopyMacro: MemberMacro {
             return []
         }
 
-        let structVisibility = structDeclSyntax.modifiers?.visibilityText() ?? "internal"
+        let structVisibility = structDeclSyntax.modifiers.visibilityText() ?? "internal"
 
         let variables = structDeclSyntax.memberBlock.members.compactMap { $0.decl.as(VariableDeclSyntax.self) }
 
-        let bindings = variables.flatMap(\.bindings).filter { accessorIsAllowed($0.accessor) }
+        let bindings = variables.flatMap(\.bindings).filter { accessorIsAllowed($0.accessorBlock?.accessors) }
 
         return variables.flatMap { variable in
-            let variableVisibility = variable.modifiers?.visibilityText() ?? structVisibility
+            let variableVisibility = variable.modifiers.visibilityText() ?? structVisibility
 
             return variable.bindings
-                .filter { accessorIsAllowed($0.accessor) }
+                .filter { accessorIsAllowed($0.accessorBlock?.accessors) }
                 .compactMap { binding -> DeclSyntax? in
                     let propertyName = binding.pattern
                 guard let typeName = binding.typeAnnotation?.type else {
@@ -75,20 +75,20 @@ public struct ModifiedCopyMacro: MemberMacro {
         }
     }
 
-    private static func accessorIsAllowed(_ accessor: PatternBindingSyntax.Accessor?) -> Bool {
+    private static func accessorIsAllowed(_ accessor: AccessorBlockSyntax.Accessors?) -> Bool {
         guard let accessor else { return true }
         return switch accessor {
         case .accessors(let accessorDeclListSyntax):
-            !accessorDeclListSyntax.accessors.contains {
-                $0.accessorKind.text == "get" || $0.accessorKind.text == "set"
+            !accessorDeclListSyntax.contains {
+                $0.accessorSpecifier.text == "get" || $0.accessorSpecifier.text == "set"
             }
         case .getter:
             false
         }
     }
 }
 
-extension ModifierListSyntax {
+extension DeclModifierListSyntax {
     private static let visibilityModifiers: Set = ["private", "fileprivate", "internal", "package", "public", "open"]
 
     func visibilityText() -> String? {

Tests/ModifiedCopyTests/ModifiedCopyTests.swift

@@ -45,7 +45,7 @@ final class ModifiedCopyTests: XCTestCase {
                 private(set) var name: String
                 
                 let age: Int
-                
+
                 private var favoriteColor: String
                 
                 /// This should not generate a copy function because it's not a stored property.
@@ -57,12 +57,12 @@ final class ModifiedCopyTests: XCTestCase {
                         name = newValue
                     }
                 }
-                
+
                 /// This should not generate a copy function because it's not a stored property.
                 var uppercasedName: String {
                     name.uppercased()
                 }
-                
+
                 var nickName: String? = "Bobby Tables" {
                     didSet {
                         print("nickName changed to \(nickName ?? "(nil)")")
@@ -80,12 +80,12 @@ final class ModifiedCopyTests: XCTestCase {
             expandedSource:
             #"""
             public struct Person {
-                private (set) var name: String
-
+                private(set) var name: String
+                
                 let age: Int
 
                 private var favoriteColor: String
-
+                
                 /// This should not generate a copy function because it's not a stored property.
                 var fullName: String {
                     get {
@@ -106,25 +106,29 @@ final class ModifiedCopyTests: XCTestCase {
                         print("nickName changed to \(nickName ?? "(nil)")")
                     }
                 }
-
+                
                 init(name: String, age: Int, favoriteColor: String, nickName: String? = nil) {
                     self.name = name
                     self.age = age
                     self.favoriteColor = favoriteColor
                     self.nickName = nickName
                 }
+
                 /// Returns a copy of the caller whose value for `name` is different.
                 private func copy(name: String) -> Self {
                     .init(name: name, age: age, favoriteColor: favoriteColor, nickName: nickName)
                 }
+
                 /// Returns a copy of the caller whose value for `age` is different.
                 public func copy(age: Int) -> Self {
                     .init(name: name, age: age, favoriteColor: favoriteColor, nickName: nickName)
                 }
+
                 /// Returns a copy of the caller whose value for `favoriteColor` is different.
                 private func copy(favoriteColor: String) -> Self {
                     .init(name: name, age: age, favoriteColor: favoriteColor, nickName: nickName)
                 }
+            
                 /// Returns a copy of the caller whose value for `nickName` is different.
                 public func copy(nickName: String?) -> Self {
                     .init(name: name, age: age, favoriteColor: favoriteColor, nickName: nickName)