Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public data class DelegateKey(
}
}

private fun AnnotationSpec.asInstantiationExpression(): CodeBlock {
internal fun AnnotationSpec.asInstantiationExpression(): CodeBlock {
// <Type>(args)
return CodeBlock.of("%T(%L)", typeName, members.joinToCode())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import com.google.devtools.ksp.symbol.Origin.KOTLIN_LIB
import com.squareup.kotlinpoet.AnnotationSpec
import com.squareup.kotlinpoet.CodeBlock
import com.squareup.kotlinpoet.ksp.toClassName
import com.squareup.moshi.kotlin.codegen.api.asInstantiationExpression

internal fun KSClassDeclaration.asType() = asType(emptyList())

Expand Down Expand Up @@ -106,7 +107,8 @@ private fun addValueToBlock(
}
}

is KSAnnotation -> member.add("%L", value.toAnnotationSpec(resolver))
is KSAnnotation ->
member.add("%L", value.toAnnotationSpec(resolver).asInstantiationExpression())

else -> member.add(memberForValue(value))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,47 @@ class JsonClassSymbolProcessorTest {
assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.OK)
}

@Test
fun qualifierWithNestedAnnotations() {
val result =
compile(
kotlin(
"source.kt",
"""
package test
import com.squareup.moshi.JsonClass
import com.squareup.moshi.JsonQualifier
import kotlin.annotation.AnnotationRetention.RUNTIME
import kotlin.annotation.AnnotationTarget.FIELD
import kotlin.annotation.Retention
import kotlin.annotation.Target

@JsonClass(generateAdapter = true)
class TestAdapterClass(
@OuterAnnotation(
InnerAnnotation("first"),
InnerAnnotation("second"),
InnerAnnotation("third"),
)
var param: String
)

@JsonQualifier
@Retention(RUNTIME)
@Target(FIELD)
annotation class OuterAnnotation(
vararg val values: InnerAnnotation
)

@Retention(RUNTIME)
@Target(FIELD)
annotation class InnerAnnotation(val name: String)
""",
)
)
assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.OK)
}

@Test
fun nonRuntimeQualifier() {
val result =
Expand Down