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

[KAPT] Keep annotations from kotlin.jvm. in stubs

Browse Source 
^KT-35104 Fixed
This commit is contained in:
Andrey Zinovyev
2021-02-05 13:41:46 +03:00
committed by GitHub
parent a68837451a
commit 08111031ec
15 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
+1 -2
View File
@@ -96,8 +96,7 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati
private val BLACKLISTED_ANNOTATIONS = listOf(
"java.lang.Deprecated", "kotlin.Deprecated", // Deprecated annotations
"java.lang.Synthetic",
"synthetic.kotlin.jvm.GeneratedByJvmOverloads", // kapt3-related annotation for marking JvmOverloads-generated methods
"kotlin.jvm." // Kotlin annotations from runtime
"synthetic.kotlin.jvm.GeneratedByJvmOverloads" // kapt3-related annotation for marking JvmOverloads-generated methods
)
private val KOTLIN_METADATA_ANNOTATION = Metadata::class.java.name
plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
Vendored
+1
View File
@@ -16,6 +16,7 @@ package test;
import java.lang.System;
@kotlin.jvm.JvmName(name = "AnnotationsTest")
@kotlin.Metadata()
public final class AnnotationsTest {
plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt
Vendored
+1
View File
@@ -40,6 +40,7 @@ import java.lang.System;
@kotlin.Metadata()
public final class Baz {
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmField()
@FieldAnno()
public final java.lang.String a = "";
plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt
Vendored
+1
View File
@@ -2,6 +2,7 @@ package a.b.c;
import java.lang.System;
@kotlin.jvm.JvmName(name = "FacadeName")
@kotlin.Metadata()
public final class FacadeName {
plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt
Vendored
+1
View File
@@ -1,6 +1,7 @@
import java.lang.System;
@kotlin.Metadata()
@kotlin.jvm.JvmInline()
public final class Cl {
public Cl() {
plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt
Vendored
+1
View File
@@ -5,6 +5,7 @@ public abstract interface Foo {
public abstract void foo();
@kotlin.jvm.JvmDefault()
public default void foo2(int a) {
}
plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt
Vendored
+1
View File
@@ -5,6 +5,7 @@ public abstract interface Foo {
public abstract void foo();
@kotlin.jvm.JvmDefault()
public default void foo2(int a) {
}
plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt
Vendored
+11
View File
@@ -7,10 +7,12 @@ public final class State {
@org.jetbrains.annotations.NotNull()
private final java.lang.String someString = null;
@kotlin.jvm.JvmOverloads()
public State(int someInt, long someLong) {
super();
}
@kotlin.jvm.JvmOverloads()
public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
java.lang.String someString) {
super();
@@ -37,32 +39,41 @@ import java.lang.System;
@kotlin.Metadata()
public final class State2 {
@kotlin.jvm.JvmField()
public final int someInt = 0;
@kotlin.jvm.JvmField()
public final long someLong = 0L;
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmField()
public final java.lang.String someString = null;
@kotlin.jvm.JvmOverloads()
public State2(int someInt) {
super();
}
@kotlin.jvm.JvmOverloads()
public State2(int someInt, long someLong) {
super();
}
@kotlin.jvm.JvmOverloads()
public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
java.lang.String someString) {
super();
}
@kotlin.jvm.JvmOverloads()
public final int test(int someInt) {
return 0;
}
@kotlin.jvm.JvmOverloads()
public final int test(int someInt, long someLong) {
return 0;
}
@kotlin.jvm.JvmOverloads()
public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
java.lang.String someString) {
return 0;
plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
Vendored
+3
View File
@@ -6,6 +6,7 @@ public abstract interface FooComponent {
public static final FooComponent.Companion Companion = null;
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmStatic()
public static java.lang.String create(@org.jetbrains.annotations.NotNull()
java.lang.String context) {
return null;
@@ -19,6 +20,7 @@ public abstract interface FooComponent {
}
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmStatic()
public final java.lang.String create(@org.jetbrains.annotations.NotNull()
java.lang.String context) {
return null;
@@ -60,6 +62,7 @@ public final class JvmStaticTest {
return 0;
}
@kotlin.jvm.JvmStatic()
@java.lang.Deprecated()
public static void getOne$annotations() {
}
plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
Vendored
+1
View File
@@ -28,6 +28,7 @@ public final class Test {
return null;
}
@kotlin.jvm.JvmStatic()
@java.lang.Deprecated()
public static void getTest$annotations() {
}
plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt
Vendored
+2
View File
@@ -132,7 +132,9 @@ public final class MyActivity {
public final int propA = app.B.id.textView;
private final int propB = app.B.id.textView;
private int propC = app.B.id.textView;
@kotlin.jvm.JvmField()
public final int propD = app.B.id.textView;
@kotlin.jvm.JvmField()
public int propE = app.B.id.textView;
private final int propF = 0;
plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
Vendored
+6
View File
@@ -29,8 +29,10 @@ import java.lang.System;
@kotlin.Metadata()
public final class Modifiers {
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.Transient()
private final transient java.lang.String transientField = "";
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.Volatile()
private volatile java.lang.String volatileField = "";
public Modifiers() {
@@ -51,21 +53,25 @@ public final class Modifiers {
java.lang.String p0) {
}
@kotlin.jvm.Strictfp()
public final strictfp void strictFp() {
}
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmOverloads()
public final java.lang.String overloads() {
return null;
}
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmOverloads()
public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
java.lang.String a) {
return null;
}
@org.jetbrains.annotations.NotNull()
@kotlin.jvm.JvmOverloads()
public final java.lang.String overloads(@org.jetbrains.annotations.NotNull()
java.lang.String a, int n) {
return null;
plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
Vendored
+12
View File
@@ -2,13 +2,21 @@ import java.lang.System;
@kotlin.Metadata()
public final class A$B {
@kotlin.jvm.JvmField()
public A$B.C c;
@kotlin.jvm.JvmField()
public A$B.D$E de;
@kotlin.jvm.JvmField()
public J$B.C jc;
@kotlin.jvm.JvmField()
public J$B.D$E jde;
@kotlin.jvm.JvmField()
public A$B.D$$E dee;
@kotlin.jvm.JvmField()
public A$B.D$$$E deee;
@kotlin.jvm.JvmField()
public J$B.D$$E jdee;
@kotlin.jvm.JvmField()
public J$B.D$$$E jdeee;
public A$B() {
@@ -25,9 +33,13 @@ public final class A$B {
@kotlin.Metadata()
public static final class D$E {
@kotlin.jvm.JvmField()
public A$B.D$E.F f;
@kotlin.jvm.JvmField()
public A$B.D$E.F$G fg;
@kotlin.jvm.JvmField()
public J$B.D$E.F jf;
@kotlin.jvm.JvmField()
public J$B.D$E.F$G jfg;
public D$E() {
plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
Vendored
+12
View File
@@ -4,13 +4,21 @@ import java.lang.System;
@kotlin.Metadata()
public final class A$B {
@kotlin.jvm.JvmField()
public test.A$B.C c;
@kotlin.jvm.JvmField()
public test.A$B.D$E de;
@kotlin.jvm.JvmField()
public test.J$B.C jc;
@kotlin.jvm.JvmField()
public test.J$B.D$E jde;
@kotlin.jvm.JvmField()
public test.A$B.D$$E dee;
@kotlin.jvm.JvmField()
public test.A$B.D$$$E deee;
@kotlin.jvm.JvmField()
public test.J$B.D$$E jdee;
@kotlin.jvm.JvmField()
public test.J$B.D$$$E jdeee;
public A$B() {
@@ -27,9 +35,13 @@ public final class A$B {
@kotlin.Metadata()
public static final class D$E {
@kotlin.jvm.JvmField()
public test.A$B.D$E.F f;
@kotlin.jvm.JvmField()
public test.A$B.D$E.F$G fg;
@kotlin.jvm.JvmField()
public test.J$B.D$E.F jf;
@kotlin.jvm.JvmField()
public test.J$B.D$E.F$G jfg;
public D$E() {
plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt
Vendored
+2
View File
@@ -28,10 +28,12 @@ public final class State {
@org.jetbrains.annotations.NotNull()
private final java.lang.String someString = null;
@kotlin.jvm.JvmOverloads()
public State(int someInt, long someLong) {
super();
}
@kotlin.jvm.JvmOverloads()
public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull()
java.lang.String someString) {
super();