Merge pull request #142 from unsignedapps/fix/vexil3/sendable

bok- · web-flow · commit 938572d1ddc8 · 2025-12-01T21:08:43.000+11:00
Generate explicit Sendable conformance
diff --git a/Sources/VexilMacros/FlagContainerMacro.swift b/Sources/VexilMacros/FlagContainerMacro.swift
@@ -179,6 +179,17 @@ extension FlagContainerMacro: ExtensionMacro {
             ]
         }
 
+        if shouldGenerateConformance.sendable {
+            decls += [
+                ExtensionDeclSyntax(
+                    extendedType: type,
+                    inheritanceClause: .init(inheritedTypes: [ .init(type: TypeSyntax(stringLiteral: "Sendable")) ])
+                ) {
+                    // Member block intentionally left blank
+                },
+            ]
+        }
+
         return decls
     }
 
@@ -214,17 +225,14 @@ private extension TypeSyntax {
 
 private extension [TypeSyntax] {
 
-    var shouldGenerateConformance: (flagContainer: Bool, equatable: Bool) {
-        reduce(into: (false, false)) { result, type in
+    var shouldGenerateConformance: (flagContainer: Bool, equatable: Bool, sendable: Bool) {
+        reduce(into: (false, false, false)) { result, type in
             if type.identifier == "FlagContainer" {
-                result = (true, result.1)
+                result = (true, result.1, result.2)
             } else if type.identifier == "Equatable" {
-                result = (result.0, true)
-
-                // For some reason Swift 5.9 concatenates these into a single `IdentifierTypeSyntax`
-                // instead of providing them as array items
-            } else if type.identifier == "FlagContainerEquatable" {
-                result = (true, true)
+                result = (result.0, true, result.2)
+            } else if type.identifier == "Sendable" {
+                result = (result.0, result.1, true)
             }
         }
     }
@@ -233,11 +241,11 @@ private extension [TypeSyntax] {
 
 private extension AttributeSyntax {
 
-    var shouldGenerateConformance: (flagContainer: Bool, equatable: Bool) {
+    var shouldGenerateConformance: (flagContainer: Bool, equatable: Bool, sendable: Bool) {
         if attributeName.identifier == "FlagContainer" {
-            (true, true)
+            (true, true, true)
         } else {
-            (false, false)
+            (false, false, false)
         }
     }
 
diff --git a/Tests/VexilMacroTests/EquatableFlagContainerMacroTests.swift b/Tests/VexilMacroTests/EquatableFlagContainerMacroTests.swift
@@ -56,6 +56,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     true
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -156,6 +159,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     lhs.otherStoredProperty == rhs.otherStoredProperty
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -231,6 +237,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     lhs.someFlag == rhs.someFlag
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -309,6 +318,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     lhs.someFlag == rhs.someFlag
                 }
             }
+
+            extension SomeContainer.TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -383,6 +395,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     lhs.someFlag == rhs.someFlag
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -478,6 +493,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     lhs.second == rhs.second
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -572,6 +590,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {
                     lhs.second == rhs.second
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
diff --git a/Tests/VexilMacroTests/FlagContainerMacroTests.swift b/Tests/VexilMacroTests/FlagContainerMacroTests.swift
@@ -56,6 +56,9 @@ final class FlagContainerMacroTests: XCTestCase {
                     true
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -99,6 +102,9 @@ final class FlagContainerMacroTests: XCTestCase {
                     true
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -142,6 +148,9 @@ final class FlagContainerMacroTests: XCTestCase {
                     true
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,
@@ -238,6 +247,9 @@ final class FlagContainerMacroTests: XCTestCase {
                     lhs.second == rhs.second
                 }
             }
+
+            extension TestFlags: Sendable {
+            }
             """,
             macros: [
                 "FlagContainer": FlagContainerMacro.self,

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`56`	`56`	`true`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ extension TestFlags: Sendable {`
	`61`	`+ }`
`59`	`62`	`""",`
`60`	`63`	`macros: [`
`61`	`64`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -156,6 +159,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`156`	`159`	`lhs.otherStoredProperty == rhs.otherStoredProperty`
`157`	`160`	`}`
`158`	`161`	`}`
	`162`	`+`
	`163`	`+ extension TestFlags: Sendable {`
	`164`	`+ }`
`159`	`165`	`""",`
`160`	`166`	`macros: [`
`161`	`167`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -231,6 +237,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`231`	`237`	`lhs.someFlag == rhs.someFlag`
`232`	`238`	`}`
`233`	`239`	`}`
	`240`	`+`
	`241`	`+ extension TestFlags: Sendable {`
	`242`	`+ }`
`234`	`243`	`""",`
`235`	`244`	`macros: [`
`236`	`245`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -309,6 +318,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`309`	`318`	`lhs.someFlag == rhs.someFlag`
`310`	`319`	`}`
`311`	`320`	`}`
	`321`	`+`
	`322`	`+ extension SomeContainer.TestFlags: Sendable {`
	`323`	`+ }`
`312`	`324`	`""",`
`313`	`325`	`macros: [`
`314`	`326`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -383,6 +395,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`383`	`395`	`lhs.someFlag == rhs.someFlag`
`384`	`396`	`}`
`385`	`397`	`}`
	`398`	`+`
	`399`	`+ extension TestFlags: Sendable {`
	`400`	`+ }`
`386`	`401`	`""",`
`387`	`402`	`macros: [`
`388`	`403`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -478,6 +493,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`478`	`493`	`lhs.second == rhs.second`
`479`	`494`	`}`
`480`	`495`	`}`
	`496`	`+`
	`497`	`+ extension TestFlags: Sendable {`
	`498`	`+ }`
`481`	`499`	`""",`
`482`	`500`	`macros: [`
`483`	`501`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -572,6 +590,9 @@ final class EquatableFlagContainerMacroTests: XCTestCase {`
`572`	`590`	`lhs.second == rhs.second`
`573`	`591`	`}`
`574`	`592`	`}`
	`593`	`+`
	`594`	`+ extension TestFlags: Sendable {`
	`595`	`+ }`
`575`	`596`	`""",`
`576`	`597`	`macros: [`
`577`	`598`	`"FlagContainer": FlagContainerMacro.self,`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ final class FlagContainerMacroTests: XCTestCase {`
`56`	`56`	`true`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ extension TestFlags: Sendable {`
	`61`	`+ }`
`59`	`62`	`""",`
`60`	`63`	`macros: [`
`61`	`64`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -99,6 +102,9 @@ final class FlagContainerMacroTests: XCTestCase {`
`99`	`102`	`true`
`100`	`103`	`}`
`101`	`104`	`}`
	`105`	`+`
	`106`	`+ extension TestFlags: Sendable {`
	`107`	`+ }`
`102`	`108`	`""",`
`103`	`109`	`macros: [`
`104`	`110`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -142,6 +148,9 @@ final class FlagContainerMacroTests: XCTestCase {`
`142`	`148`	`true`
`143`	`149`	`}`
`144`	`150`	`}`
	`151`	`+`
	`152`	`+ extension TestFlags: Sendable {`
	`153`	`+ }`
`145`	`154`	`""",`
`146`	`155`	`macros: [`
`147`	`156`	`"FlagContainer": FlagContainerMacro.self,`
`@@ -238,6 +247,9 @@ final class FlagContainerMacroTests: XCTestCase {`
`238`	`247`	`lhs.second == rhs.second`
`239`	`248`	`}`
`240`	`249`	`}`
	`250`	`+`
	`251`	`+ extension TestFlags: Sendable {`
	`252`	`+ }`
`241`	`253`	`""",`
`242`	`254`	`macros: [`
`243`	`255`	`"FlagContainer": FlagContainerMacro.self,`