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

Add script constructor annotations inheritance

Browse Source
This commit is contained in:
Ilya Chernikov
2018-07-03 16:03:13 +02:00
parent 0f46f62232
commit dee141b26b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/CustomScriptCodegenTest.kt
+9 -1
View File
@@ -33,6 +33,7 @@ class CustomScriptCodegenTest : CodegenTestCase() {
val res = generateScriptClass()
assertNull(res.safeGetAnnotation(KotlinScript::class))
assertNotNull(res.safeGetAnnotation(MyScriptClassAnnotation::class))
assertNotNull(res.getConstructor().safeGetAnnotation(MyScriptConstructorAnnotation::class))
}
private fun generateScriptClass(): Class<*> = generateClass("ScriptTest")
@@ -79,14 +80,21 @@ class CustomScriptCodegenTest : CodegenTestCase() {
private fun Class<*>.safeGetAnnotation(ann: KClass<out Annotation>): Annotation? =
getAnnotation(classLoader.loadClass(ann.qualifiedName) as Class<Annotation>)
private fun java.lang.reflect.Constructor<*>.safeGetAnnotation(ann: KClass<out Annotation>): Annotation? =
getAnnotation(this.declaringClass.classLoader.loadClass(ann.qualifiedName) as Class<Annotation>)
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
annotation class MyScriptClassAnnotation
@Target(AnnotationTarget.CONSTRUCTOR)
@Retention(AnnotationRetention.RUNTIME)
annotation class MyScriptConstructorAnnotation
@Suppress("unused")
@KotlinScript
@MyScriptClassAnnotation()
abstract class TestScriptWithAnnotatedBaseClass
abstract class TestScriptWithAnnotatedBaseClass @MyScriptConstructorAnnotation constructor()
object TestScriptWithMethodAnnotationsConfiguration : ArrayList<Pair<TypedKey<*>, Any?>>(
listOf(