From e24a9d08f24f1b3bdb486a59306e01a474db7364 Mon Sep 17 00:00:00 2001
From: "Rodrigo B. de Oliveira" <rbo@acm.org>
Date: Thu, 14 Jun 2018 11:44:58 +0200
Subject: [PATCH] Only collect annotations with a name starting with
 `KotlinScript`

---
 .../scripting/compiler/plugin/asmBasedAnnotationsLoading.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 485fcd73546..7610ddc0243 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
@@ -19,12 +19,13 @@ private class TemplateAnnotationVisitor(val anns: ArrayList<BinAnnData> = arrayL
 }
 
 private class TemplateClassVisitor(val annVisitor: TemplateAnnotationVisitor) : ClassVisitor(Opcodes.ASM5) {
-    override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor {
+    override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? {
         val shortName = Type.getType(desc).internalName.substringAfterLast("/")
         if (shortName.startsWith("KotlinScript")) {
             annVisitor.anns.add(BinAnnData(shortName))
+            return annVisitor
         }
-        return annVisitor
+        return null
     }
 }