Skip to content

Commit 127e915

Browse files
daniel-murphy-neurovalensdaniel-murphy-neurovalens
committed
fix: Adding Swift base type to Sendable inherited type definition
1 parent 68f3ed6 commit 127e915

15 files changed

+38
-34
lines changed

‎Sources/MockableMacro/Factory/EnumFactory.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ extension EnumFactory {
4040
)
4141
)
4242
InheritedTypeSyntax(
43-
type: IdentifierTypeSyntax(name: NS.Sendable)
43+
type: MemberTypeSyntax(
44+
baseType: IdentifierTypeSyntax(name: NS.Swift),
45+
name: NS.Sendable
46+
)
4447
)
4548
}
4649
}

‎Sources/MockableMacro/Utils/Namespace.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ enum NS {
8181
static let Error: TokenSyntax = "Error"
8282
static let NSObjectProtocol: String = "NSObjectProtocol"
8383
static let NSObject: TokenSyntax = "NSObject"
84+
static let Swift: TokenSyntax = "Swift"
8485
static let Sendable: TokenSyntax = "Sendable"
8586

8687
static func Parameter(_ type: String) -> TokenSyntax { "Parameter<\(raw: type)>" }

‎Tests/MockableMacroTests/AccessModifierTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ final class AccessModifierTests: MockableMacroTestCase {
7171
}
7272
}
7373
}
74-
public enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
74+
public enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
7575
case m1_foo
7676
case m2_bar(number: Parameter<Int>)
7777
public func match(_ other: Member) -> Bool {
@@ -183,7 +183,7 @@ final class AccessModifierTests: MockableMacroTestCase {
183183
}
184184
}
185185
}
186-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
186+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
187187
case m1_foo
188188
case m2_bar(number: Parameter<Int>)
189189
func match(_ other: Member) -> Bool {
@@ -284,7 +284,7 @@ final class AccessModifierTests: MockableMacroTestCase {
284284
return producer()
285285
}
286286
}
287-
public enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
287+
public enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
288288
case m1_foo
289289
public func match(_ other: Member) -> Bool {
290290
switch (self, other) {

‎Tests/MockableMacroTests/ActorConformanceTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ final class ActorConformanceTests: MockableMacroTestCase {
8989
}
9090
}
9191
}
92-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
92+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
9393
case m1_foo
9494
case m2_quz
9595
case m3_bar(number: Parameter<Int>)
@@ -244,7 +244,7 @@ final class ActorConformanceTests: MockableMacroTestCase {
244244
}
245245
}
246246
}
247-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
247+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
248248
case m1_foo
249249
case m2_quz
250250
case m3_bar(number: Parameter<Int>)

‎Tests/MockableMacroTests/AssociatedTypeTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ final class AssociatedTypeTests: MockableMacroTestCase {
5656
return producer(item)
5757
}
5858
}
59-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
59+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
6060
case m1_foo(item: Parameter<Item>)
6161
func match(_ other: Member) -> Bool {
6262
switch (self, other) {
@@ -145,7 +145,7 @@ final class AssociatedTypeTests: MockableMacroTestCase {
145145
return producer(item)
146146
}
147147
}
148-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
148+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
149149
case m1_foo(item: Parameter<Item>)
150150
func match(_ other: Member) -> Bool {
151151
switch (self, other) {
@@ -234,7 +234,7 @@ final class AssociatedTypeTests: MockableMacroTestCase {
234234
return producer(item)
235235
}
236236
}
237-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
237+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
238238
case m1_foo(item: Parameter<Item>)
239239
func match(_ other: Member) -> Bool {
240240
switch (self, other) {

‎Tests/MockableMacroTests/AttributesTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ final class AttributesTests: MockableMacroTestCase {
115115
}
116116
}
117117
}
118-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
118+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
119119
case m1_prop
120120
case m2_prop2
121121
case m3_test

‎Tests/MockableMacroTests/DocCommentsTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class DocCommentsTests: MockableMacroTestCase {
6262
}
6363
}
6464
}
65-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
65+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
6666
case m1_foo
6767
func match(_ other: Member) -> Bool {
6868
switch (self, other) {

‎Tests/MockableMacroTests/ExoticParameterTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ final class ExoticParameterTests: MockableMacroTestCase {
5454
return producer(&value)
5555
}
5656
}
57-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
57+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
5858
case m1_modifyValue(Parameter<Int>)
5959
func match(_ other: Member) -> Bool {
6060
switch (self, other) {
@@ -141,7 +141,7 @@ final class ExoticParameterTests: MockableMacroTestCase {
141141
return producer(values)
142142
}
143143
}
144-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
144+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
145145
case m1_printValues(Parameter<[Int]>)
146146
func match(_ other: Member) -> Bool {
147147
switch (self, other) {
@@ -228,7 +228,7 @@ final class ExoticParameterTests: MockableMacroTestCase {
228228
return producer(operation)
229229
}
230230
}
231-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
231+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
232232
case m1_execute(operation: Parameter<() throws -> Void>)
233233
func match(_ other: Member) -> Bool {
234234
switch (self, other) {

‎Tests/MockableMacroTests/FunctionEffectTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ final class FunctionEffectTests: MockableMacroTestCase {
6363
return try producer()
6464
}
6565
}
66-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
66+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
6767
case m1_returnsAndThrows
6868
case m2_canThrowError
6969
func match(_ other: Member) -> Bool {
@@ -164,7 +164,7 @@ final class FunctionEffectTests: MockableMacroTestCase {
164164
return producer(operation)
165165
}
166166
}
167-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
167+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
168168
case m1_execute(operation: Parameter<() throws -> Void>)
169169
func match(_ other: Member) -> Bool {
170170
switch (self, other) {
@@ -269,7 +269,7 @@ final class FunctionEffectTests: MockableMacroTestCase {
269269
return try producer(param)
270270
}
271271
}
272-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
272+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
273273
case m1_asyncFunction
274274
case m2_asyncThrowingFunction
275275
case m3_asyncParamFunction(param: Parameter<() async throws -> Void>)

‎Tests/MockableMacroTests/GenericFunctionTests.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
5454
return producer(item)
5555
}
5656
}
57-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
57+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
5858
case m1_foo(item: Parameter<GenericValue>)
5959
func match(_ other: Member) -> Bool {
6060
switch (self, other) {
@@ -141,7 +141,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
141141
return producer(item)
142142
}
143143
}
144-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
144+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
145145
case m1_genericFunc(item: Parameter<GenericValue>)
146146
func match(_ other: Member) -> Bool {
147147
switch (self, other) {
@@ -235,7 +235,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
235235
return producer(p1, p2, p3, p4)
236236
}
237237
}
238-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
238+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
239239
case m1_method1(p1: Parameter<GenericValue>, p2: Parameter<GenericValue>, p3: Parameter<GenericValue>, p4: Parameter<GenericValue>)
240240
func match(_ other: Member) -> Bool {
241241
switch (self, other) {
@@ -331,7 +331,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
331331
}
332332
}
333333
}
334-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
334+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
335335
case m1_prop
336336
func match(_ other: Member) -> Bool {
337337
switch (self, other) {
@@ -421,7 +421,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
421421
}
422422
}
423423
}
424-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
424+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
425425
case m1_prop
426426
func match(_ other: Member) -> Bool {
427427
switch (self, other) {
@@ -509,7 +509,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
509509
return producer()
510510
}
511511
}
512-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
512+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
513513
case m1_foo
514514
func match(_ other: Member) -> Bool {
515515
switch (self, other) {
@@ -597,7 +597,7 @@ final class GenericFunctionTests: MockableMacroTestCase {
597597
return producer()
598598
}
599599
}
600-
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Sendable {
600+
enum Member: Mockable.Matchable, Mockable.CaseIdentifiable, Swift.Sendable {
601601
case m1_foo
602602
func match(_ other: Member) -> Bool {
603603
switch (self, other) {

0 commit comments

Comments
 (0)