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

Copy KotlinSignature to package "kotlin.jvm"

Browse Source 
Support both KotlinSignature classes in the compiler and in the IDEA plugin.
The old one will be deprecated later and dropped eventually
This commit is contained in:
Alexander Udalov
2014-02-27 22:35:18 +04:00
parent 33a9f3abd1
commit 787b4753c7
9 changed files with 92 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java
+3 -1
View File
@@ -26,7 +26,8 @@ public final class JvmAnnotationNames {
public static final FqName KOTLIN_PACKAGE_PART = new FqName("kotlin.jvm.internal.KotlinPackagePart");
public static final FqName KOTLIN_TRAIT_IMPL = new FqName("kotlin.jvm.internal.KotlinTraitImpl");
public static final FqName KOTLIN_SIGNATURE = new FqName("jet.runtime.typeinfo.KotlinSignature");
public static final FqName KOTLIN_SIGNATURE = new FqName("kotlin.jvm.KotlinSignature");
public static final FqName OLD_KOTLIN_SIGNATURE = new FqName("jet.runtime.typeinfo.KotlinSignature");
public static final String ABI_VERSION_FIELD_NAME = "abiVersion";
public static final String DATA_FIELD_NAME = "data";
@@ -55,6 +56,7 @@ public final class JvmAnnotationNames {
@SuppressWarnings("deprecation")
public static boolean isSpecialAnnotation(@NotNull FqName fqName) {
return fqName.asString().startsWith("jet.runtime.typeinfo.")
|| fqName.equals(KOTLIN_SIGNATURE)
|| fqName.equals(JETBRAINS_NOT_NULL_ANNOTATION)
|| fqName.equals(OLD_KOTLIN_CLASS)
|| fqName.equals(OLD_KOTLIN_PACKAGE)