Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unwrap nested KSTypeAliases recursively #1242

Merged
merged 1 commit into from Apr 22, 2022
Merged

Unwrap nested KSTypeAliases recursively #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 23 additions & 16 deletions interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksTypes.kt
View file
Open in desktop
Expand Up @@ -70,25 +70,34 @@ internal fun KSType.toTypeName(
}
is KSTypeParameter -> typeParamResolver[decl.name.getShortName()]
is KSTypeAlias -> {
val extraResolver = if (decl.typeParameters.isEmpty()) {
typeParamResolver
} else {
decl.typeParameters.toTypeParameterResolver(typeParamResolver)
}
var typeAlias: KSTypeAlias = decl
var arguments = arguments

val resolvedType = decl.type.resolve()
val mappedArgs = mapTypeArgumentsFromTypeAliasToAbbreviatedType(
typeParamResolver = typeParamResolver,
typeAlias = decl,
typeAliasTypeArguments = arguments,
abbreviatedType = resolvedType,
)
var resolvedType: KSType
var mappedArgs: List<KSTypeArgument>
var extraResolver: TypeParameterResolver
while (true) {
resolvedType = typeAlias.type.resolve()
mappedArgs = mapTypeArgumentsFromTypeAliasToAbbreviatedType(
typeAlias = typeAlias,
typeAliasTypeArguments = arguments,
abbreviatedType = resolvedType,
)
extraResolver = if (typeAlias.typeParameters.isEmpty()) {
typeParamResolver
} else {
typeAlias.typeParameters.toTypeParameterResolver(typeParamResolver)
}

typeAlias = resolvedType.declaration as? KSTypeAlias ?: break
arguments = mappedArgs
}

val abbreviatedType = resolvedType
.toTypeName(extraResolver)
.copy(nullable = isMarkedNullable)
.rawType()
.withTypeArguments(mappedArgs)
.withTypeArguments(mappedArgs.map { it.toTypeName(typeParamResolver) })

val aliasArgs = typeArguments.map { it.toTypeName(typeParamResolver) }

Expand All @@ -104,11 +113,10 @@ internal fun KSType.toTypeName(

@KotlinPoetKspPreview
private fun mapTypeArgumentsFromTypeAliasToAbbreviatedType(
typeParamResolver: TypeParameterResolver,
typeAlias: KSTypeAlias,
typeAliasTypeArguments: List<KSTypeArgument>,
abbreviatedType: KSType,
): List<TypeName> {
): List<KSTypeArgument> {
return abbreviatedType.arguments
.map { typeArgument ->
// Check if type argument is a reference to a typealias type parameter, and not an actual type.
Expand All @@ -121,7 +129,6 @@ private fun mapTypeArgumentsFromTypeAliasToAbbreviatedType(
typeArgument
}
}
.map { it.toTypeName(typeParamResolver) }
}

/**
Expand Down
4 changes: 4 additions & 0 deletions ...processor/src/test/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessorTest.kt
View file
Open in desktop
Expand Up @@ -270,6 +270,8 @@ class TestProcessorTest {
typealias GenericTypeAlias = List<String>
typealias GenericMapTypeAlias<V, K> = Map<K, V>
typealias T1Unused<T1, T2> = Map<T2, String>
typealias A1<T1, T2> = A2<T2, T1>
typealias A2<T2, T3> = Map<T3, T2>

@ExampleAnnotation
class Example {
Expand All @@ -278,6 +280,7 @@ class TestProcessorTest {
genericAlias: GenericTypeAlias,
genericMapAlias: GenericMapTypeAlias<String, Int>,
t1Unused: T1Unused<String, Int>,
a1: A1<String, Int>,
) {
}
}
Expand Down Expand Up @@ -305,6 +308,7 @@ class TestProcessorTest {
genericAlias: List<String>,
genericMapAlias: Map<Int, String>,
t1Unused: Map<Int, String>,
a1: Map<String, Int>,
): Unit {
}
}
Expand Down