azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Fix using classes as annotation parameters in generated classes

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-09 11:35:13 +03:00
parent f3397dfeca
commit e7caaa464e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/test-generator/tests/org/jetbrains/kotlin/generators/model/AnnotationModel.kt
+8 -3
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.generators.model
import org.jetbrains.kotlin.generators.util.isDefaultImportedClass import org.jetbrains.kotlin.generators.util.isDefaultImportedClass
import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.Printer
import kotlin.reflect.KClass
class AnnotationModel( class AnnotationModel(
val annotation: Class<out Annotation>, val annotation: Class<out Annotation>,
@@ -17,7 +16,7 @@ class AnnotationModel(
val argumentsString = arguments.joinToString(separator = ",") { val argumentsString = arguments.joinToString(separator = ",") {
when (it) { when (it) {
is Enum<*> -> "${it.javaClass.simpleName}.${it.name}" is Enum<*> -> "${it.javaClass.simpleName}.${it.name}"
is Class<*> -> "${it.simpleName::class.java}.class" is Class<*> -> "${it.simpleName}.class"
else -> "\"$it\"" else -> "\"$it\""
} }
} }
@@ -28,7 +27,13 @@ class AnnotationModel(
fun imports(): List<Class<*>> { fun imports(): List<Class<*>> {
return buildList { return buildList {
add(annotation) add(annotation)
arguments.mapTo(this) { it.javaClass } arguments.mapNotNullTo(this) {
when (it) {
is Enum<*> -> it.javaClass
is Class<*> -> it
else -> null
}
}
}.filterNot { it.isDefaultImportedClass() } }.filterNot { it.isDefaultImportedClass() }
} }
} }