Use Full Generic

WhoopInc · Jan 12, 2024 · 7b7ba55 · 7b7ba55
1 parent 018dbec
commit 7b7ba55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Sources/WhoopDIKitMacros/InjectableMacro.swift b/Sources/WhoopDIKitMacros/InjectableMacro.swift
@@ -5,7 +5,7 @@ import SwiftSyntaxMacroExpansion
 
 private struct VariableDeclaration {
     let name: String
-    let type: String
+    let type: IdentifierTypeSyntax
     let defaultExpression: ExprSyntax?
     let injectedName: String?
 }
@@ -199,7 +199,7 @@ extension VariableDeclSyntax {
         self.bindings.first?.pattern.as(IdentifierPatternSyntax.self)?.identifier.text
     }
 
-    var typeName: String? {
-        self.bindings.first?.typeAnnotation?.type.as(IdentifierTypeSyntax.self)?.name.text
+    var typeName: IdentifierTypeSyntax? {
+        self.bindings.first?.typeAnnotation?.type.as(IdentifierTypeSyntax.self)?.trimmed
     }
 }
diff --git a/Tests/WhoopDIKitTests/InjectableTests.swift b/Tests/WhoopDIKitTests/InjectableTests.swift
@@ -44,7 +44,7 @@ final class InjectableTests: XCTestCase {
            public static var staticProp: String = "no"
            let id: String = "no"
            var newerThing: String { "not again" }
-           let bestThing: Int
+           let bestThing: Int<String> // This type is not real, but is useful for generics
            lazy var lazyVar: Double = 100
         }
         """,
@@ -55,14 +55,14 @@ final class InjectableTests: XCTestCase {
            public static var staticProp: String = "no"
            let id: String = "no"
            var newerThing: String { "not again" }
-           let bestThing: Int
+           let bestThing: Int<String> // This type is not real, but is useful for generics
            lazy var lazyVar: Double = 100
 
             public static func inject() -> Self {
                 Self.init(bestThing: WhoopDI.inject(nil))
             }
 
-            public init(bestThing: Int) {
+            public init(bestThing: Int<String>) {
                 self.bestThing = bestThing
             }
         }