Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Sources/MockoloFramework/Utils/SwiftType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -633,9 +633,16 @@ extension SwiftType {

case .memberType(let syntax):
// T.U
let name = syntax.name.trimmedDescription
let generics = syntax.genericArgumentClause?.arguments.compactMap {
$0.argument.as(TypeSyntax.self).flatMap {
SwiftType(typeSyntax: $0)
}
}
self.kind = .nominal(.init(
namespace: SwiftType(typeSyntax: syntax.baseType),
name: syntax.name.trimmedDescription
name: name,
genericParameterTypes: generics ?? []
))

case .attributedType(let syntax):
Expand Down
26 changes: 24 additions & 2 deletions Tests/TestFuncs/TestGenericFuncs/FixtureGenericFunc.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ import MockoloFramework
func pull<U: ObservableType>(events: [SomeEvent], until: U?, closure: @escaping () -> ())
func optionalPull<T>(events: [SomeEvent], value: T, once: Bool, closure: ((T?) -> ())?)
func add<T: FixedWidthInteger>(n1: T, n2: T?)
func add<T: Sequence> (a: T?, b: T?)
func add<T: Collection> (a: T, b: T)
func add<T: Sequence>(a: T?, b: T?)
func add<T: Collection>(a: T, b: T)
func useMetatype<T>(type: T.Type) -> T.Type
func useAssociatedType<I: Identifiable>(value: I, id: I.ID) -> I.ID
func foo<T: Body>() -> Result<T, any Error>
func bar<T: Body>() -> Swift.Result<T, any Error>
}

@Fixture enum expected {
Expand Down Expand Up @@ -206,6 +208,26 @@ import MockoloFramework
}
fatalError("useAssociatedTypeHandler returns can't have a default value thus its handler must be set")
}

private(set) var fooCallCount = 0
var fooHandler: (() -> Any)?
func foo<T: Body>() -> Result<T, any Error> {
fooCallCount += 1
if let fooHandler = fooHandler {
return fooHandler() as! Result<T, any Error>
}
fatalError("fooHandler returns can't have a default value thus its handler must be set")
}

private(set) var barCallCount = 0
var barHandler: (() -> Any)?
func bar<T: Body>() -> Swift.Result<T, any Error> {
barCallCount += 1
if let barHandler = barHandler {
return barHandler() as! Swift.Result<T, any Error>
}
fatalError("barHandler returns can't have a default value thus its handler must be set")
}
}
}
}
Expand Down