@@ -56,14 +56,14 @@ internal interface TypeParameterResolver {
56
56
}
57
57
58
58
internal fun List<KSTypeParameter>.toTypeParameterResolver (
59
- fallback : TypeParameterResolver ? = null,
60
- sourceType : String? = null,
59
+ fallback : TypeParameterResolver ? = null,
60
+ sourceType : String? = null,
61
61
): TypeParameterResolver {
62
62
val parametersMap = LinkedHashMap <String , TypeVariableName >()
63
63
val typeParamResolver = { id: String ->
64
64
parametersMap[id]
65
- ? : fallback?.get(id)
66
- ? : throw IllegalStateException (" No type argument found for $id ! Anaylzing $sourceType " )
65
+ ? : fallback?.get(id)
66
+ ? : throw IllegalStateException (" No type argument found for $id ! Anaylzing $sourceType " )
67
67
}
68
68
69
69
val resolver = object : TypeParameterResolver {
@@ -93,7 +93,7 @@ internal fun KSClassDeclaration.toClassName(): ClassName {
93
93
val typesString = qualifiedName!! .asString().removePrefix(" $pkgName ." )
94
94
95
95
val simpleNames = typesString
96
- .split(" ." )
96
+ .split(" ." )
97
97
return ClassName (pkgName, simpleNames)
98
98
}
99
99
@@ -103,7 +103,7 @@ internal fun KSTypeParameter.toTypeName(typeParamResolver: TypeParameterResolver
103
103
}
104
104
105
105
internal fun KSTypeParameter.toTypeVariableName (
106
- typeParamResolver : TypeParameterResolver ,
106
+ typeParamResolver : TypeParameterResolver ,
107
107
): TypeVariableName {
108
108
val typeVarName = name.getShortName()
109
109
val typeVarBounds = bounds.map { it.toTypeName(typeParamResolver) }
@@ -112,7 +112,11 @@ internal fun KSTypeParameter.toTypeVariableName(
112
112
CONTRAVARIANT -> KModifier .IN
113
113
else -> null
114
114
}
115
- return TypeVariableName (typeVarName, bounds = typeVarBounds, variance = typeVarVariance)
115
+ return TypeVariableName (
116
+ typeVarName,
117
+ bounds = typeVarBounds.toList(),
118
+ variance = typeVarVariance
119
+ )
116
120
}
117
121
118
122
internal fun KSTypeArgument.toTypeName (typeParamResolver : TypeParameterResolver ): TypeName {
0 commit comments