From 60619a350756b69d101e3162fbddc0c5b3ef46ce Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 5 Jul 2013 20:55:35 +0400 Subject: [PATCH] KotlinAbiVersionIndex checks for KotlinClass and KotlinPackage annotations --- .../jet/plugin/versions/KotlinAbiVersionIndex.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java index 7b8c9fd228f..4eac709d045 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java @@ -32,7 +32,6 @@ import org.jetbrains.asm4.Opcodes; import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; -import java.lang.Throwable; import java.util.Map; /** @@ -43,7 +42,7 @@ public class KotlinAbiVersionIndex extends ScalarIndexExtension { public static final KotlinAbiVersionIndex INSTANCE = new KotlinAbiVersionIndex(); - private static final int VERSION = 0; + private static final int VERSION = 1; private static final ID NAME = ID.create(KotlinAbiVersionIndex.class.getCanonicalName()); private static final ExternalIntegerKeyDescriptor KEY_DESCRIPTOR = new ExternalIntegerKeyDescriptor(); @@ -67,7 +66,9 @@ public class KotlinAbiVersionIndex extends ScalarIndexExtension { @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { if (!JvmStdlibNames.JET_CLASS.getDescriptor().equals(desc) && - !JvmStdlibNames.JET_PACKAGE_CLASS.getDescriptor().equals(desc)) { + !JvmStdlibNames.JET_PACKAGE_CLASS.getDescriptor().equals(desc) && + !JvmStdlibNames.KOTLIN_CLASS.getDescriptor().equals(desc) && + !JvmStdlibNames.KOTLIN_PACKAGE.getDescriptor().equals(desc)) { return null; } annotationPresent.set(true); @@ -102,7 +103,8 @@ public class KotlinAbiVersionIndex extends ScalarIndexExtension { } }; - private KotlinAbiVersionIndex() {} + private KotlinAbiVersionIndex() { + } @NotNull @Override