Minor. Revert workarounds for problem on KClass from annotation
See KT-9453 for clarification
This commit is contained in:
+1
-2
@@ -75,8 +75,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
|
|||||||
sameSignature(function, resolveMethod)
|
sameSignature(function, resolveMethod)
|
||||||
}?.annotations?.filterIsInstance<AcceptedAnnotations>()
|
}?.annotations?.filterIsInstance<AcceptedAnnotations>()
|
||||||
resolverMethodAnnotations?.flatMap {
|
resolverMethodAnnotations?.flatMap {
|
||||||
val v = it.supportedAnnotationClasses
|
it.supportedAnnotationClasses.toList()
|
||||||
v.toList() // TODO: inline after KT-9453 is resolved (now it fails with "java.lang.Class cannot be cast to kotlin.reflect.KClass")
|
|
||||||
}
|
}
|
||||||
?: emptyList()
|
?: emptyList()
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ annotation class Anno(val klasses: Array<KClass<*>> = arrayOf(String::class, Int
|
|||||||
|
|
||||||
fun box(): String {
|
fun box(): String {
|
||||||
val anno = Anno::class.constructors.single().callBy(emptyMap())
|
val anno = Anno::class.constructors.single().callBy(emptyMap())
|
||||||
assertEquals(listOf(String::class, Int::class), (anno.klasses as Array<KClass<*>>).toList() /* TODO: KT-9453 */)
|
assertEquals(listOf(String::class, Int::class), anno.klasses.toList())
|
||||||
assertEquals("@Anno(klasses=[class java.lang.String, int])", anno.toString())
|
assertEquals("@Anno(klasses=[class java.lang.String, int])", anno.toString())
|
||||||
return "OK"
|
return "OK"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ fun box(): String {
|
|||||||
assertFails { create<TwoParamsOneDefault>(mapOf("s" to "Fail", "x" to "Fail")) }
|
assertFails { create<TwoParamsOneDefault>(mapOf("s" to "Fail", "x" to "Fail")) }
|
||||||
|
|
||||||
val t5 = create<TwoParamsOneDefaultKClass>(mapOf("string" to "OK"))
|
val t5 = create<TwoParamsOneDefaultKClass>(mapOf("string" to "OK"))
|
||||||
assertEquals(Number::class, t5.klass as KClass<*> /* TODO: KT-9453 */)
|
assertEquals(Number::class, t5.klass)
|
||||||
|
|
||||||
assertFails("KClass (not Class) instances should be passed as arguments") {
|
assertFails("KClass (not Class) instances should be passed as arguments") {
|
||||||
create<TwoNonDefaults>(mapOf("klass" to String::class.java, "string" to "Fail"))
|
create<TwoNonDefaults>(mapOf("klass" to String::class.java, "string" to "Fail"))
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ fun box(): String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val k = create<TwoNonDefaults>("OK", Int::class)
|
val k = create<TwoNonDefaults>("OK", Int::class)
|
||||||
assertEquals(Int::class, k.klass as KClass<*> /* TODO: KT-9453 */)
|
assertEquals(Int::class, k.klass)
|
||||||
|
|
||||||
return k.string
|
return k.string
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user