From fbbfe600ec3710a20ea4efc01c424e7ab63e985e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Sat, 30 Jun 2018 14:58:12 +0200 Subject: [PATCH] Fix list of script definitions recognized by the asm-based loading: fix of the previous fix to #KT-24926 --- .../scripting/compiler/plugin/asmBasedAnnotationsLoading.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/asmBasedAnnotationsLoading.kt b/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/asmBasedAnnotationsLoading.kt index 7610ddc0243..98a4b935793 100644 --- a/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/asmBasedAnnotationsLoading.kt +++ b/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/asmBasedAnnotationsLoading.kt @@ -21,7 +21,7 @@ private class TemplateAnnotationVisitor(val anns: ArrayList = arrayL private class TemplateClassVisitor(val annVisitor: TemplateAnnotationVisitor) : ClassVisitor(Opcodes.ASM5) { override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? { val shortName = Type.getType(desc).internalName.substringAfterLast("/") - if (shortName.startsWith("KotlinScript")) { + if (shortName.startsWith("KotlinScript") || shortName.startsWith("ScriptTemplate")) { annVisitor.anns.add(BinAnnData(shortName)) return annVisitor }