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

Kapt: Write @kotlin.Metadata annotation to Java stubs #KT-17937

Browse Source
This commit is contained in:
Yan Zhulanow
2017-05-25 16:44:15 +03:00
committed by Yan Zhulanow
parent 141f12e71b
commit 7220183912
43 changed files with 169 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
+1 -1
View File
@@ -69,7 +69,7 @@ class ClassFileToSourceStubConverter(
"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.Metadata" // Kotlin annotations from runtime
"kotlin.jvm." // Kotlin annotations from runtime
)
private val JAVA_KEYWORD_FILTER_REGEX = "[a-z]+".toRegex()
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
+4 -1
View File
@@ -132,7 +132,10 @@ abstract class AbstractKotlinKapt3IntegrationTest : CodegenTestCase() {
GenerationUtils.compileFiles(myFiles.psiFiles, myEnvironment, Kapt3BuilderFactory()).factory
val actualRaw = kapt3Extension.savedStubs ?: error("Stubs were not saved")
val actual = StringUtil.convertLineSeparators(actualRaw.trim({ it <= ' ' })).trimTrailingWhitespacesAndAddNewlineAtEOF()
val actual = StringUtil.convertLineSeparators(actualRaw.trim({ it <= ' ' }))
.trimTrailingWhitespacesAndAddNewlineAtEOF()
.let { AbstractClassFileToSourceStubConverterTest.removeMetadataAnnotationContents(it) }
KotlinTestUtils.assertEqualsToFile(txtFile, actual)
} finally {
sourceOutputDir.deleteRecursively()
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
+10 -1
View File
@@ -86,6 +86,13 @@ abstract class AbstractKotlinKapt3Test : CodegenTestCase() {
}
abstract class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3Test() {
internal companion object {
private val KOTLIN_METADATA_GROUP = "[a-z0-9]+ = \\{.+?\\}"
private val KOTLIN_METADATA_REGEX = "@kotlin\\.Metadata\\(($KOTLIN_METADATA_GROUP)(, $KOTLIN_METADATA_GROUP)*\\)".toRegex()
fun removeMetadataAnnotationContents(s: String): String = s.replace(KOTLIN_METADATA_REGEX, "@kotlin.Metadata()")
}
override fun check(kaptContext: KaptContext<GenerationState>, txtFile: File, wholeFile: File) {
fun isOptionSet(name: String) = wholeFile.useLines { lines -> lines.any { it.trim() == "// $name" } }
@@ -99,7 +106,9 @@ abstract class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3T
if (validate) kaptContext.compiler.enterTrees(javaFiles)
val actualRaw = javaFiles.sortedBy { it.sourceFile.name }.joinToString (FILE_SEPARATOR)
val actual = StringUtil.convertLineSeparators(actualRaw.trim({ it <= ' ' })).trimTrailingWhitespacesAndAddNewlineAtEOF()
val actual = StringUtil.convertLineSeparators(actualRaw.trim({ it <= ' ' }))
.trimTrailingWhitespacesAndAddNewlineAtEOF()
.let { removeMetadataAnnotationContents(it) }
if (kaptContext.compiler.shouldStop(CompileStates.CompileState.ENTER)) {
Log.instance(kaptContext.context).flush()
plugins/kapt3/testData/converter/abstractEnum.txt
Vendored
+10 -4
View File
@@ -1,5 +1,6 @@
@kotlin.Metadata()
public enum E {
/*public static final*/ X /* = new X(){
/*public static final*/ X /* = new @kotlin.Metadata() X(){
@java.lang.Override()
public void a() {
@@ -9,7 +10,7 @@ public enum E {
super();
}
} */,
/*public static final*/ Y /* = new Y(){
/*public static final*/ Y /* = new @kotlin.Metadata() Y(){
@java.lang.Override()
public void a() {
@@ -28,6 +29,7 @@ public enum E {
E() {
}
@kotlin.Metadata()
public static final class Obj {
public static final E.Obj INSTANCE = null;
@@ -36,6 +38,7 @@ public enum E {
}
}
@kotlin.Metadata()
public static final class NestedClass {
public NestedClass() {
@@ -47,8 +50,9 @@ public enum E {
////////////////////
@kotlin.Metadata()
public enum E2 {
/*public static final*/ X /* = new X(0){
/*public static final*/ X /* = new @kotlin.Metadata() X(0){
@java.lang.Override()
public void a() {
@@ -58,7 +62,7 @@ public enum E2 {
super(0);
}
} */,
/*public static final*/ Y /* = new Y(0){
/*public static final*/ Y /* = new @kotlin.Metadata() Y(0){
@java.lang.Override()
public void a() {
@@ -82,6 +86,7 @@ public enum E2 {
////////////////////
@kotlin.Metadata()
public enum E3 {
/*public static final*/ X /* = new X(null) */,
/*public static final*/ Y /* = new Y(null) */;
@@ -101,6 +106,7 @@ public enum E3 {
////////////////////
@kotlin.Metadata()
public enum E4 {
/*public static final*/ X /* = new X(null, 0, 0L, false) */;
@org.jetbrains.annotations.NotNull()
plugins/kapt3/testData/converter/abstractMethods.txt
Vendored
+2
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public abstract class Base {
protected abstract void doJob(@org.jetbrains.annotations.NotNull()
@@ -14,6 +15,7 @@ public abstract class Base {
////////////////////
@kotlin.Metadata()
public final class Impl extends Base {
@java.lang.Override()
plugins/kapt3/testData/converter/annotations.txt
Vendored
+6
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno1 {
}
@@ -5,6 +6,7 @@ public abstract @interface Anno1 {
////////////////////
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno2 {
@@ -30,6 +32,7 @@ public abstract @interface Anno2 {
////////////////////
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno3 {
@@ -39,6 +42,7 @@ public abstract @interface Anno3 {
////////////////////
@kotlin.Metadata()
public enum Colors {
/*public static final*/ WHITE /* = new WHITE() */,
/*public static final*/ BLACK /* = new BLACK() */;
@@ -50,6 +54,7 @@ public enum Colors {
////////////////////
@kotlin.Metadata()
@Anno3(value = "value")
@Anno2(a = @Anno1(), clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class})
@Anno1()
@@ -63,6 +68,7 @@ public final class TestAnno {
////////////////////
@kotlin.Metadata()
@Anno2(i = 6, s = "BCD", ii = {4, 5, 6}, ss = {"Z", "X"}, a = @Anno1(), color = Colors.WHITE, colors = {Colors.WHITE}, clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class})
@Anno3(value = "value")
public final class TestAnno2 {
plugins/kapt3/testData/converter/annotations2.txt
Vendored
+4
View File
@@ -1,5 +1,6 @@
package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@Anno(value = "anno-class")
public abstract @interface Anno {
@@ -11,6 +12,7 @@ public abstract @interface Anno {
package test;
@kotlin.Metadata()
public final class AnnotationsTest {
public AnnotationsTest() {
@@ -38,6 +40,7 @@ public final class AnnotationsTest {
package test;
@kotlin.Metadata()
@Anno(value = "enum")
public enum Enum {
/*public static final*/ WHITE /* = new WHITE(0) */,
@@ -58,6 +61,7 @@ public enum Enum {
package test;
@kotlin.Metadata()
@Anno(value = "clazz")
public abstract class Test {
@org.jetbrains.annotations.NotNull()
plugins/kapt3/testData/converter/dataClass.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class User {
@org.jetbrains.annotations.NotNull()
private final java.lang.String firstName = null;
plugins/kapt3/testData/converter/defaultImpls.txt
Vendored
+6
View File
@@ -1,9 +1,11 @@
@kotlin.Metadata()
public abstract interface Intf {
public static final Intf.Companion Companion = null;
public static final int WHITE = 2;
public abstract int getColor();
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
public static final class DefaultImpls {
public DefaultImpls() {
@@ -15,6 +17,7 @@ public abstract interface Intf {
}
}
@kotlin.Metadata()
public static final class Companion {
private static final int BLACK = 1;
public static final int WHITE = 2;
@@ -32,10 +35,12 @@ public abstract interface Intf {
////////////////////
@kotlin.Metadata()
public abstract interface IntfWithDefaultImpls {
public abstract void a();
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
public static final class DefaultImpls {
public DefaultImpls() {
@@ -50,5 +55,6 @@ public abstract interface IntfWithDefaultImpls {
////////////////////
@kotlin.Metadata()
public abstract interface IntfWithoutDefaultImpls {
}
plugins/kapt3/testData/converter/enums.txt
Vendored
+3
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno1 {
@@ -7,6 +8,7 @@ public abstract @interface Anno1 {
////////////////////
@kotlin.Metadata()
public enum Enum1 {
/*public static final*/ BLACK /* = new BLACK() */,
/*public static final*/ WHITE /* = new WHITE() */;
@@ -18,6 +20,7 @@ public enum Enum1 {
////////////////////
@kotlin.Metadata()
public enum Enum2 {
/*public static final*/ RED /* = new RED(null, 0) */,
/*public static final*/ WHITE /* = new WHITE(null, 0) */;
plugins/kapt3/testData/converter/fileFacadeJvmName.txt
Vendored
+1
View File
@@ -1,5 +1,6 @@
package a.b.c;
@kotlin.Metadata()
public final class FacadeName {
public FacadeName() {
plugins/kapt3/testData/converter/functions.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class FunctionsTest {
@org.jetbrains.annotations.NotNull()
plugins/kapt3/testData/converter/genericRawSignatures.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class GenericRawSignatures {
@org.jetbrains.annotations.Nullable()
plugins/kapt3/testData/converter/genericSimple.txt
Vendored
+6
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public abstract interface ABC {
@org.jetbrains.annotations.NotNull()
@@ -13,6 +14,7 @@ public abstract interface ABC {
////////////////////
@kotlin.Metadata()
public class BaseClass<B extends java.lang.Object> {
public BaseClass() {
@@ -23,18 +25,21 @@ public class BaseClass<B extends java.lang.Object> {
////////////////////
@kotlin.Metadata()
public abstract interface Intf<I1 extends java.lang.Object, I2 extends java.io.Serializable> {
}
////////////////////
@kotlin.Metadata()
public abstract interface Intf2<T extends java.util.List<? extends java.lang.String>, M extends T> {
}
////////////////////
@kotlin.Metadata()
public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Object> extends BaseClass<java.lang.RuntimeException> implements Intf<java.lang.Object, java.util.Date>, OtherIntf<java.lang.String> {
@org.jetbrains.annotations.Nullable()
private final java.util.List<java.util.Map<java.lang.String, M1>> fld = null;
@@ -52,5 +57,6 @@ public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Obj
////////////////////
@kotlin.Metadata()
public abstract interface OtherIntf<O extends java.lang.CharSequence> {
}
plugins/kapt3/testData/converter/importsForErrorTypes.txt
Vendored
+1
View File
@@ -5,6 +5,7 @@ import java.util.concurrent.TimeUnit.MICROSECONDS;
import java.util.concurrent.TimeUnit.*;
import java.util.Calendar.*;
@kotlin.Metadata()
public final class ImportsForErrorTypesKt {
public ImportsForErrorTypesKt() {
plugins/kapt3/testData/converter/inheritanceSimple.txt
Vendored
+4
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public abstract class BaseClass {
@org.jetbrains.annotations.NotNull()
@@ -12,12 +13,14 @@ public abstract class BaseClass {
////////////////////
@kotlin.Metadata()
public abstract interface Context {
}
////////////////////
@kotlin.Metadata()
public final class Inheritor extends BaseClass {
@org.jetbrains.annotations.NotNull()
@@ -35,6 +38,7 @@ public final class Inheritor extends BaseClass {
////////////////////
@kotlin.Metadata()
public enum Result {
/*public static final*/ SUCCESS /* = new SUCCESS() */,
/*public static final*/ ERROR /* = new ERROR() */;
plugins/kapt3/testData/converter/innerClassesWithTypeParameters.txt
Vendored
+7
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class Test {
private Test.FilterValueDelegate<java.lang.Float> a;
@@ -5,6 +6,7 @@ public final class Test {
super();
}
@kotlin.Metadata()
final class FilterValueDelegate<T extends java.lang.Object> {
public FilterValueDelegate() {
@@ -16,12 +18,14 @@ public final class Test {
////////////////////
@kotlin.Metadata()
public final class Test2 {
public Test2() {
super();
}
@kotlin.Metadata()
public final class FilterValueDelegate<T extends java.lang.Object> {
private Test2.FilterValueDelegate<T>.Filter2<java.lang.String> a;
@@ -29,6 +33,7 @@ public final class Test2 {
super();
}
@kotlin.Metadata()
public final class Filter2<X extends java.lang.Object> {
public Filter2() {
@@ -41,6 +46,7 @@ public final class Test2 {
////////////////////
@kotlin.Metadata()
public final class Test3 {
private Test3.FilterValueDelegate<java.lang.Float> a;
@@ -48,6 +54,7 @@ public final class Test3 {
super();
}
@kotlin.Metadata()
static final class FilterValueDelegate<T extends java.lang.Object> {
public FilterValueDelegate() {
plugins/kapt3/testData/converter/javaKeywordsInPackageNames.txt
Vendored
+2
View File
@@ -1,5 +1,6 @@
package a.b.c;
@kotlin.Metadata()
public final class A {
public A() {
@@ -11,6 +12,7 @@ public final class A {
package a.b.typealias.c;
@kotlin.Metadata()
public final class E {
public E() {
plugins/kapt3/testData/converter/jvmOverloads.txt
Vendored
+2
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class State {
private final int someInt = 0;
private final long someLong = 0L;
@@ -30,6 +31,7 @@ public final class State {
////////////////////
@kotlin.Metadata()
public final class State2 {
public final int someInt = 0;
public final long someLong = 0L;
plugins/kapt3/testData/converter/jvmStatic.txt
Vendored
+2 -1
View File
@@ -1,4 +1,4 @@
@kotlin.Metadata()
public final class JvmStaticTest {
private final byte three = (byte)3;
private final char d = 'D';
@@ -23,6 +23,7 @@ public final class JvmStaticTest {
return 0;
}
@kotlin.Metadata()
public static final class Companion {
public static void one$annotations() {
plugins/kapt3/testData/converter/jvmStaticFieldInParent.txt
Vendored
+2
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class Test {
@org.jetbrains.annotations.NotNull()
private static final java.lang.String test = "";
@@ -12,6 +13,7 @@ public final class Test {
return null;
}
@kotlin.Metadata()
public static final class A {
public static void test$annotations() {
plugins/kapt3/testData/converter/kt14996.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class Kt14996Kt {
public Kt14996Kt() {
plugins/kapt3/testData/converter/kt14997.txt
Vendored
+2
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public class CrashMe {
private final java.lang.Runnable notReally = null;
@@ -10,6 +11,7 @@ public class CrashMe {
@kotlin.Suppress(names = {"AMBIGUOUS_ANONYMOUS_TYPE_INFERRED"})
@kotlin.Metadata()
public final class Kt14997Kt {
public Kt14997Kt() {
plugins/kapt3/testData/converter/kt14998.txt
Vendored
+3
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class Outer {
public final void nonAbstract(@org.jetbrains.annotations.NotNull()
@@ -8,6 +9,7 @@ public final class Outer {
super();
}
@kotlin.Metadata()
final class Inner {
@org.jetbrains.annotations.NotNull()
private final java.lang.String foo = null;
@@ -31,6 +33,7 @@ public final class Outer {
}
}
@kotlin.Metadata()
static final class Nested {
@org.jetbrains.annotations.NotNull()
private final java.lang.String foo = null;
plugins/kapt3/testData/converter/kt15145.txt
Vendored
+2
View File
@@ -1,7 +1,9 @@
@kotlin.Metadata()
public abstract interface MyInterface {
public abstract void someFun();
@kotlin.Metadata()
public static final class MyDefaultInferface {
public MyDefaultInferface() {
plugins/kapt3/testData/converter/kt17567.txt
Vendored
+1
View File
@@ -1,5 +1,6 @@
package test;
@kotlin.Metadata()
public final class MutableEntry<K extends java.lang.Object, V extends java.lang.Object> implements java.util.Map.Entry<K, V>, kotlin.jvm.internal.markers.KMutableMap.Entry {
private final java.util.Map<K, V> internal = null;
private final K key = null;
plugins/kapt3/testData/converter/mapEntry.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public abstract interface EntryHolder {
@org.jetbrains.annotations.NotNull()
plugins/kapt3/testData/converter/methodParameterNames.txt
Vendored
+3
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public abstract class Cls {
public abstract void foo(@org.jetbrains.annotations.NotNull()
@@ -16,6 +17,7 @@ public abstract class Cls {
////////////////////
@kotlin.Metadata()
public abstract interface Intf {
public abstract void foo(@org.jetbrains.annotations.NotNull()
@@ -24,6 +26,7 @@ public abstract interface Intf {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String bar(int bcd);
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
public static final class DefaultImpls {
public DefaultImpls() {
plugins/kapt3/testData/converter/methodPropertySignatureClash.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class CrashMe {
private final int resources = 1;
plugins/kapt3/testData/converter/modifiers.txt
Vendored
+16
View File
@@ -1,5 +1,6 @@
package modifiers;
@kotlin.Metadata()
public final class InternalClass {
public InternalClass() {
@@ -11,6 +12,7 @@ public final class InternalClass {
package modifiers;
@kotlin.Metadata()
public abstract interface InternalInterface {
}
@@ -18,6 +20,7 @@ public abstract interface InternalInterface {
package modifiers;
@kotlin.Metadata()
public final class Modifiers {
@org.jetbrains.annotations.NotNull()
private final transient java.lang.String transientField = "";
@@ -67,6 +70,7 @@ public final class Modifiers {
package modifiers;
@kotlin.Metadata()
final class PrivateClass {
public PrivateClass() {
@@ -78,6 +82,7 @@ final class PrivateClass {
package modifiers;
@kotlin.Metadata()
abstract interface PrivateInterface {
}
@@ -85,6 +90,7 @@ abstract interface PrivateInterface {
package modifiers;
@kotlin.Metadata()
public final class PublicClass {
public PublicClass() {
@@ -96,6 +102,7 @@ public final class PublicClass {
package modifiers;
@kotlin.Metadata()
public abstract class PublicClassPrivateConstructor {
private PublicClassPrivateConstructor() {
@@ -107,15 +114,18 @@ public abstract class PublicClassPrivateConstructor {
package modifiers;
@kotlin.Metadata()
public class PublicClassProtectedConstructor {
protected PublicClassProtectedConstructor() {
super();
}
@kotlin.Metadata()
public static abstract interface ProtectedInterface {
}
@kotlin.Metadata()
static abstract interface PrivateInterface {
}
}
@@ -124,6 +134,7 @@ public class PublicClassProtectedConstructor {
package modifiers;
@kotlin.Metadata()
public abstract interface PublicInterface {
}
@@ -131,12 +142,14 @@ public abstract interface PublicInterface {
package modifiers;
@kotlin.Metadata()
public abstract class SealedClass {
private SealedClass() {
super();
}
@kotlin.Metadata()
public static final class One extends modifiers.SealedClass {
public One() {
@@ -144,6 +157,7 @@ public abstract class SealedClass {
}
}
@kotlin.Metadata()
public static class Two extends modifiers.SealedClass {
public Two() {
@@ -151,6 +165,7 @@ public abstract class SealedClass {
}
}
@kotlin.Metadata()
public static abstract class Three extends modifiers.SealedClass.Two {
public Three() {
@@ -158,6 +173,7 @@ public abstract class SealedClass {
}
}
@kotlin.Metadata()
public static final class Four extends modifiers.SealedClass.Three {
public Four() {
plugins/kapt3/testData/converter/multifileClass.txt
Vendored
+2
View File
@@ -1,5 +1,6 @@
package test;
@kotlin.Metadata()
public final class M1 {
public M1() {
@@ -17,6 +18,7 @@ public final class M1 {
package test;
@kotlin.Metadata()
public final class M2 {
public M2() {
plugins/kapt3/testData/converter/nestedClasses.txt
Vendored
+18
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class A {
@org.jetbrains.annotations.Nullable()
private final A x = null;
@@ -18,11 +19,13 @@ public final class A {
super();
}
@kotlin.Metadata()
public static abstract interface B {
@org.jetbrains.annotations.Nullable()
public abstract A.B getY();
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
public static final class DefaultImpls {
public DefaultImpls() {
@@ -31,6 +34,7 @@ public final class A {
}
}
@kotlin.Metadata()
public static final class C {
public static final A.C INSTANCE = null;
@@ -43,30 +47,35 @@ public final class A {
////////////////////
@kotlin.Metadata()
public final class A2 {
public A2() {
super();
}
@kotlin.Metadata()
public static final class B {
public B() {
super();
}
@kotlin.Metadata()
public static final class C {
public C() {
super();
}
@kotlin.Metadata()
public static final class D {
public D() {
super();
}
@kotlin.Metadata()
public static final class Cme {
public Cme() {
@@ -74,6 +83,7 @@ public final class A2 {
}
}
@kotlin.Metadata()
public static final class E {
public E() {
@@ -88,6 +98,7 @@ public final class A2 {
////////////////////
@kotlin.Metadata()
public final class Foo {
public Foo() {
@@ -98,18 +109,21 @@ public final class Foo {
////////////////////
@kotlin.Metadata()
public final class Test {
public Test() {
super();
}
@kotlin.Metadata()
public static final class Nested {
public Nested() {
super();
}
@kotlin.Metadata()
public static final class NestedNested {
public NestedNested() {
@@ -118,6 +132,7 @@ public final class Test {
}
}
@kotlin.Metadata()
public final class Inner {
public Inner() {
@@ -125,6 +140,7 @@ public final class Test {
}
}
@kotlin.Metadata()
public static final class NestedObject {
public static final Test.NestedObject INSTANCE = null;
@@ -133,9 +149,11 @@ public final class Test {
}
}
@kotlin.Metadata()
public static abstract interface NestedInterface {
}
@kotlin.Metadata()
public static enum NestedEnum {
/*public static final*/ BLACK /* = new BLACK() */,
/*public static final*/ WHITE /* = new WHITE() */;
plugins/kapt3/testData/converter/nonExistentClass.txt
Vendored
+1
View File
@@ -1,4 +1,5 @@
@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
@kotlin.Metadata()
public final class NonExistentType {
@org.jetbrains.annotations.Nullable()
private static final ABCDEF a = null;
plugins/kapt3/testData/converter/nonExistentClassTypesConversion.txt
Vendored
+2
View File
@@ -1,5 +1,6 @@
import java.util.Calendar;
@kotlin.Metadata()
public final class MyType<T extends java.lang.Object> {
public MyType() {
@@ -13,6 +14,7 @@ public final class MyType<T extends java.lang.Object> {
import java.util.Calendar;
@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
@kotlin.Metadata()
public final class Test {
@org.jetbrains.annotations.NotNull()
public ABC a;
plugins/kapt3/testData/converter/nonExistentClassWIthoutCorrection.txt
Vendored
+1
View File
@@ -1,4 +1,5 @@
@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
@kotlin.Metadata()
public final class NonExistentType {
@org.jetbrains.annotations.Nullable()
private static final error.NonExistentClass a = null;
plugins/kapt3/testData/converter/primitiveTypes.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
public final class PrimitiveTypes {
public static final boolean booleanFalse = false;
public static final boolean booleanTrue = true;
plugins/kapt3/testData/converter/propertyAnnotations.txt
Vendored
+3
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno {
}
@@ -5,6 +6,7 @@ public abstract @interface Anno {
////////////////////
@kotlin.Metadata()
@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.CLASS})
@@ -14,6 +16,7 @@ public abstract @interface Anno2 {
////////////////////
@kotlin.Metadata()
public final class Test {
@org.jetbrains.annotations.NotNull()
private final java.lang.String prop = "A";
plugins/kapt3/testData/converter/severalPackageParts.txt
Vendored
+2
View File
@@ -1,5 +1,6 @@
package test;
@kotlin.Metadata()
public final class AKt {
public AKt() {
@@ -14,6 +15,7 @@ public final class AKt {
package test;
@kotlin.Metadata()
public final class BKt {
public BKt() {
plugins/kapt3/testData/converter/strangeIdentifiers.txt
Vendored
+3
View File
@@ -1,3 +1,4 @@
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno {
@@ -9,6 +10,7 @@ public abstract @interface Anno {
////////////////////
@kotlin.Metadata()
public enum StrangeEnum {
/*public static final*/ InvalidFieldName /* = new InvalidFieldName(null) */;
@org.jetbrains.annotations.NotNull()
@@ -27,6 +29,7 @@ public enum StrangeEnum {
////////////////////
@kotlin.Metadata()
public final class Test {
@org.jetbrains.annotations.NotNull()
public java.lang.String simpleName;
plugins/kapt3/testData/converter/topLevel.txt
Vendored
+2
View File
@@ -1,5 +1,6 @@
package test.another;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno {
@@ -10,6 +11,7 @@ public abstract @interface Anno {
package test.another;
@kotlin.Metadata()
public final class TopLevelKt {
public TopLevelKt() {
plugins/kapt3/testData/kotlinRunner/NestedClasses.it.txt
Vendored
+6
View File
@@ -7,6 +7,7 @@ public final class NonExistentClass {
package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface MyAnnotation {
}
@@ -15,6 +16,7 @@ public abstract @interface MyAnnotation {
package test;
@kotlin.Metadata()
public final class Simple {
public static final test.Simple.Companion Companion = null;
@@ -26,12 +28,14 @@ public final class Simple {
super();
}
@kotlin.Metadata()
public static final class NestedClass {
public NestedClass() {
super();
}
@kotlin.Metadata()
public static final class NestedNestedClass {
public NestedNestedClass() {
@@ -40,6 +44,7 @@ public final class Simple {
}
}
@kotlin.Metadata()
public final class InnerClass {
public InnerClass() {
@@ -47,6 +52,7 @@ public final class Simple {
}
}
@kotlin.Metadata()
public static final class Companion {
private Companion() {
plugins/kapt3/testData/kotlinRunner/Overloads.it.txt
Vendored
+10 -8
View File
@@ -7,6 +7,16 @@ public final class NonExistentClass {
package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface MyAnnotation {
}
////////////////////
package test;
@kotlin.Metadata()
@MyAnnotation()
public final class State {
private final int someInt = 0;
@@ -36,11 +46,3 @@ public final class State {
super();
}
}
////////////////////
package test;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface MyAnnotation {
}
plugins/kapt3/testData/kotlinRunner/Simple.it.txt
Vendored
+12 -8
View File
@@ -7,14 +7,7 @@ public final class NonExistentClass {
package test;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface MyAnnotation {
}
////////////////////
package test;
@kotlin.Metadata()
public enum EnumClass {
/*public static final*/ BLACK /* = new BLACK() */,
/*public static final*/ WHITE /* = new WHITE() */;
@@ -27,6 +20,16 @@ public enum EnumClass {
package test;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface MyAnnotation {
}
////////////////////
package test;
@kotlin.Metadata()
public enum EnumClass2 {
/*public static final*/ WHITE /* = new WHITE(null) */,
/*public static final*/ RED /* = new RED(null) */;
@@ -41,6 +44,7 @@ public enum EnumClass2 {
package test;
@kotlin.Metadata()
public final class Simple {
@MyAnnotation()