fix: Skip multiple binding variables to support Swift 5.10

Mr-Alirezaa · Mar 6, 2024 · 26e4afd · 26e4afd
1 parent 514d3ee
commit 26e4afd
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 23 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "69270a6b1bddfc649cf1685316d802eb52d2b76bec9743b3de4fba94d65d11e4",
   "pins" : [
     {
       "identity" : "swift-macro-testing",
@@ -28,5 +29,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Sources/BuildableMacros/Buildable/BuildableMacro.swift b/Sources/BuildableMacros/Buildable/BuildableMacro.swift
@@ -18,10 +18,12 @@ public struct BuildableMacro: MemberAttributeMacro {
 
         guard let variableDecl = member.as(VariableDeclSyntax.self),
               variableDecl.bindingSpecifier.tokenKind == .keyword(.var),
-              !variableDecl.modifiers.lazy.map(\.name.tokenKind).contains(anyOf: [.keyword(.static), .keyword(.class)])
+              !variableDecl.modifiers.lazy.map(\.name.tokenKind).contains(anyOf: [.keyword(.static), .keyword(.class)]),
+              variableDecl.bindings.count == 1
         else { return [] }
 
-        if let firstBinding = variableDecl.bindings.first, let accessors = firstBinding.accessorBlock?.accessors {
+        let firstBinding = variableDecl.bindings.first!
+        if let accessors = firstBinding.accessorBlock?.accessors {
             switch accessors {
             case let .accessors(accessorList):
                 let specifiers = accessorList.lazy.map(\.accessorSpecifier.tokenKind)

diff --git a/Sources/BuildableMacros/SwiftSyntax+Extensions.swift b/Sources/BuildableMacros/SwiftSyntax+Extensions.swift
@@ -25,7 +25,7 @@ extension TypeSyntaxProtocol {
         } else if
             let tuple = self.as(TupleTypeSyntax.self),
             tuple.elements.count == 1,
-            let type = tuple.elements.first?.type.as(TypeSyntax.self) {
+            let type = (tuple.elements.first?.type).flatMap(TypeSyntax.init) {
             return type.requiresEscaping()
         }
         return false

diff --git a/Tests/BuildableMacroTests/BuildableIngoredMacroTests.swift b/Tests/BuildableMacroTests/BuildableIngoredMacroTests.swift
@@ -9,7 +9,7 @@ import BuildableMacros
 final class BuildableIngoredMacroTests: XCTestCase {
     override func invokeTest() {
         withMacroTesting(
-            isRecording: false,
+//            isRecording: true,
             macros: ["BuildableIgnored": BuildableIgnoredMacro.self]
         ) {
             super.invokeTest()

diff --git a/Tests/BuildableMacroTests/BuildableMacroTests.swift b/Tests/BuildableMacroTests/BuildableMacroTests.swift
@@ -37,24 +37,6 @@ final class BuildableMacroTests: XCTestCase {
         }
     }
 
-    func testAddingSingleBuildableTrackedToSettableOneForMultipleBindings() throws {
-        assertMacro {
-            """
-            @Buildable
-            struct Sample {
-                var p1: String, p2: Int
-            }
-            """
-        } expansion: {
-            """
-            struct Sample {
-                @BuildableTracked
-                var p1: String, p2: Int
-            }
-            """
-        }
-    }
-
     func testPublicAccessControl() throws {
         assertMacro {
             """
@@ -274,6 +256,23 @@ final class BuildableMacroTests: XCTestCase {
         }
     }
 
+    func testSkippingMultipleBindingsProperties() {
+        assertMacro {
+            """
+            @Buildable
+            struct Sample {
+                var p1: String, p2: Int
+            }
+            """
+        } expansion: {
+            """
+            struct Sample {
+                var p1: String, p2: Int
+            }
+            """
+        }
+    }
+
     func testHandlingSettableComputedProperties() {
         assertMacro {
             """

diff --git a/Tests/BuildableMacroTests/BuildableTrackedMacroTests.swift b/Tests/BuildableMacroTests/BuildableTrackedMacroTests.swift
@@ -115,6 +115,7 @@ final class BuildableTrackedMacroTests: XCTestCase {
     }
 
     func testMultipleSettersForMultiBindings() throws {
+#if SWIFT_SYNTAX_509
         assertMacro {
             """
             struct Sample {
@@ -141,6 +142,33 @@ final class BuildableTrackedMacroTests: XCTestCase {
             }
             """
         }
+#else
+        throw XCTSkip("\(#function) is only testable with SwiftSyntax 509")
+#endif
+    }
+
+    func testErrorOnMultiBindings() throws {
+#if SWIFT_SYNTAX_510
+        assertMacro {
+            """
+            struct Sample {
+                @BuildableTracked
+                var p1: String, p2: Int
+            }
+            """
+        } diagnostics: {
+            """
+            struct Sample {
+                @BuildableTracked
+                ┬────────────────
+                ╰─ 🛑 peer macro can only be applied to a single variable
+                var p1: String, p2: Int
+            }
+            """
+        }
+#else
+        throw XCTSkip("\(#function) is only testable with SwiftSyntax 510")
+#endif
     }
 
     func testOpenAccessControlSetters() throws {