Fix typealiases with type parameters

evant · Nov 20, 2024 · 690146b · 690146b
1 parent 1ab5ef9
commit 690146b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/ast/ksp/src/main/kotlin/me/tatarka/kotlin/ast/KSAst.kt b/ast/ksp/src/main/kotlin/me/tatarka/kotlin/ast/KSAst.kt
@@ -496,7 +496,11 @@ private class KSAstType private constructor(
     override fun resolvedType(): AstType {
         val declaration = type.declaration
         return if (declaration is KSTypeAlias) {
-            KSAstType(resolver, declaration.type.resolve().replace(type.arguments))
+            if (type.arguments.isEmpty()) {
+                KSAstType(resolver, declaration.type.resolve())
+            } else {
+                KSAstType(resolver, declaration.type.resolve().replace(type.arguments))
+            }
         } else {
             this
         }

diff --git a/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt
@@ -91,11 +91,9 @@ class TypeResultResolver(private val provider: AstProvider, private val options:
         var assistedFailed = false
         val args = context.args.toMutableList()
         for (param in params) {
-            val type = if (param.type.isPlatform()) {
-                param.type.makeNonNullable()
-            } else {
-                param.type
-            }
+            val resolvedType = if (param.type.isTypeAlias()) param.type.resolvedType() else param.type
+            val type = if (resolvedType.isPlatform()) resolvedType.makeNonNullable() else resolvedType
+
             val qualifier = qualifier(provider, options, param, type)
             val key = TypeKey(type, qualifier)
             if (param.isAssisted()) {