From a320152a036fc370770b474f0b9592b855630bfb Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Fri, 8 Jan 2021 19:48:07 +0000 Subject: [PATCH] Revert "Sort class members to ensure deterministic builds" This reverts commit 4bf63a953958fc1342312274cbdfe23d085347a3. --- .../kotlin/gradle/DeterministicBuildIT.kt | 93 ----- .../org/jetbrains/kotlin/gradle/Kapt3IT.kt | 4 +- .../stubs/ClassFileToSourceStubConverter.kt | 14 +- .../testData/converter/abstractEnum.txt | 22 +- .../testData/converter/abstractMethods.txt | 16 +- .../testData/converter/aliasedImports.txt | 76 ++-- .../testData/converter/annotations.txt | 38 +- .../testData/converter/annotations2.txt | 54 +-- .../converter/annotationsWithTargets.txt | 36 +- .../testData/converter/comments.txt | 82 ++-- .../testData/converter/dataClass.txt | 46 +-- .../testData/converter/defaultImpls.txt | 8 +- .../converter/defaultParameterValueOff.txt | 200 ++++----- .../converter/defaultParameterValueOn.txt | 200 ++++----- .../testData/converter/deprecated.txt | 14 +- .../testData/converter/enumInCompanion.txt | 8 +- .../testData/converter/enums.txt | 18 +- .../converter/errorLocationMapping.txt | 84 ++-- .../testData/converter/errorSuperclass.txt | 14 +- .../errorSuperclassCorrectErrorTypes.txt | 44 +- .../testData/converter/functions.txt | 8 +- .../testData/converter/genericParameters.txt | 24 +- .../converter/genericRawSignatures.txt | 8 +- .../testData/converter/genericSimple.txt | 8 +- .../testData/converter/ignoredMembers.txt | 6 +- .../converter/implicitReturnTypes.txt | 10 +- .../testData/converter/inheritanceSimple.txt | 16 +- .../testData/converter/inlineClasses.txt | 14 +- .../converter/interfaceImplementation.txt | 10 +- .../testData/converter/javadoc.txt | 8 +- .../testData/converter/jvmDefaultAll.txt | 4 +- .../converter/jvmDefaultAllCompatibility.txt | 4 +- .../testData/converter/jvmDefaultDisable.txt | 4 +- .../testData/converter/jvmDefaultEnable.txt | 4 +- .../testData/converter/jvmOverloads.txt | 62 +-- .../testData/converter/jvmStatic.txt | 24 +- .../converter/jvmStaticFieldInParent.txt | 12 +- .../testData/converter/kt14996.txt | 12 +- .../testData/converter/kt14998.txt | 56 +-- .../testData/converter/kt17567.txt | 10 +- .../testData/converter/kt18791.txt | 132 +++--- .../testData/converter/kt24272.txt | 20 +- .../testData/converter/kt25071.txt | 14 +- .../testData/converter/kt27126.txt | 46 +-- .../testData/converter/kt34569.txt | 8 +- .../testData/converter/lazyProperty.txt | 12 +- .../testData/converter/maxErrorCount.txt | 8 +- .../converter/methodParameterNames.txt | 16 +- .../methodPropertySignatureClash.txt | 8 +- .../testData/converter/modifiers.txt | 24 +- .../testData/converter/nestedClasses.txt | 10 +- .../testData/converter/nestedClasses2.txt | 14 +- .../converter/nestedClassesNonRootPackage.txt | 14 +- .../testData/converter/nonExistentClass.txt | 36 +- .../nonExistentClassTypesConversion.txt | 388 +++++++++--------- .../nonExistentClassWIthoutCorrection.txt | 96 ++--- .../testData/converter/primitiveTypes.txt | 74 ++-- .../converter/propertyAnnotations.txt | 12 +- .../testData/converter/recentlyNullable.txt | 10 +- .../converter/repeatableAnnotations.txt | 62 +-- .../converter/secondaryConstructor.txt | 10 +- .../testData/converter/strangeIdentifiers.txt | 18 +- .../testData/converter/stripMetadata.txt | 16 +- .../testData/converter/suspendErrorTypes.txt | 8 +- .../testData/converter/topLevel.txt | 54 +-- .../converter/unsafePropertyInitializers.txt | 132 +++--- .../DefaultParameterValues.it.txt | 10 +- .../kotlinRunner/NestedClasses.it.txt | 8 +- .../testData/kotlinRunner/Overloads.it.txt | 18 +- .../testData/kotlinRunner/Simple.it.txt | 8 +- 70 files changed, 1279 insertions(+), 1382 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt deleted file mode 100644 index 32e6eaf8eef..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle - -import org.jetbrains.kotlin.gradle.util.allJavaFiles -import org.junit.Test -import java.io.File -import kotlin.test.assertEquals - -/** Tests that the outputs of a build are deterministic. */ -class DeterministicBuildIT : BaseGradleIT() { - - @Test - fun `test KaptGenerateStubsTask - KT-40882`() = with( - Project("simple", directoryPrefix = "kapt2") - ) { - setupWorkingDir() - projectDir - .resolve("src/main/java/Foo.kt") - .writeText( - """ - class Foo : Bar { - // The fields and methods are ordered such that any sorting by KGP will be detected. - val fooField1 = 1 - val fooField3 = 3 - val fooField2 = 2 - fun fooMethod1() {} - fun fooMethod3() {} - fun fooMethod2() {} - } - """.trimIndent() - ) - projectDir - .resolve("src/main/java/Bar.kt") - .writeText( - """ - interface Bar { - val barField1 = 1 - val barField3 = 3 - val barField2 = 2 - fun barMethod1() {} - fun barMethod3() {} - fun barMethod2() {} - } - """.trimIndent() - ) - - val buildAndSnapshotStubFiles: () -> Map = { - lateinit var stubFiles: Map - build(":kaptGenerateStubsKotlin") { - assertSuccessful() - assertTasksExecuted(":kaptGenerateStubsKotlin") - stubFiles = fileInWorkingDir("build/tmp/kapt3/stubs").allJavaFiles().map { - it to it.readText() - }.toMap() - } - stubFiles - } - - // Run the first build - val stubFilesAfterFirstBuild = buildAndSnapshotStubFiles() - - // Make a change - projectDir.resolve("src/main/java/Foo.kt").also { - it.writeText( - """ - class Foo : Bar { - val fooField1 = 1 - val fooField3 = 3 - val fooField2 = 2 - fun fooMethod1() { println("Method body changed!") } - fun fooMethod3() {} - fun fooMethod2() {} - } - """.trimIndent() - ) - } - - // Run the second build - val stubFilesAfterSecondBuild = buildAndSnapshotStubFiles() - - // Check that the build outputs are deterministic - assertEquals(stubFilesAfterFirstBuild.size, stubFilesAfterSecondBuild.size) - for (file in stubFilesAfterFirstBuild.keys) { - val fileContentsAfterFirstBuild = stubFilesAfterFirstBuild[file] - val fileContentsAfterSecondBuild = stubFilesAfterSecondBuild[file] - assertEquals(fileContentsAfterFirstBuild, fileContentsAfterSecondBuild) - } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index c14ab73a1fc..dce65ecc953 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -399,9 +399,9 @@ open class Kapt3IT : Kapt3BaseIT() { val actual = getErrorMessages() // try as 0 starting lines first, then as 1 starting line try { - Assert.assertEquals(genJavaErrorString(8, 15), actual) + Assert.assertEquals(genJavaErrorString(8, 16), actual) } catch (e: AssertionError) { - Assert.assertEquals(genJavaErrorString(9, 16), actual) + Assert.assertEquals(genJavaErrorString(9, 17), actual) } } diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 39bad43bd21..b1e76f91cb5 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -387,21 +387,11 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati ) } - // Class methods and fields are currently sorted at serialization (see DescriptorSerializer.sort) and at deserialization (see - // DeserializedMemberScope.OptimizedImplementation#addMembers). Therefore, the contents of the generated stub files are sorted in - // incremental builds but not in clean builds. - // The consequence is that the contents of the generated stub files may not be consistent across a clean build and an incremental - // build, making the build non-deterministic and dependent tasks run unnecessarily (see KT-40882). - // To work around that, we always sort class methods and fields when outputting stub files. Once we remove the sorting at both - // serialization and deserialization (KT-20980), we can remove this workaround. - val sortedFields = clazz.fields.toList().sortedWith(compareBy({ it.name }, { it.desc })) - val sortedMethods = clazz.methods.toList().sortedWith(compareBy({ it.name }, { it.desc })) - - val fields = mapJList(sortedFields) { + val fields = mapJList(clazz.fields) { if (it.isEnumValue()) null else convertField(it, clazz, lineMappings, packageFqName) } - val methods = mapJList(sortedMethods) { + val methods = mapJList(clazz.methods) { if (isEnum) { if (it.name == "values" && it.desc == "()[L${clazz.name};") return@mapJList null if (it.name == "valueOf" && it.desc == "(Ljava/lang/String;)L${clazz.name};") return@mapJList null diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt index ba16efee0a0..5da6cc6ef88 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt @@ -5,14 +5,14 @@ public enum E { /*public static final*/ X /* = new E() */, /*public static final*/ Y /* = new E() */; - E() { - } - public abstract void a(); public final void b() { } + E() { + } + @kotlin.Metadata() public static final class Obj { @org.jetbrains.annotations.NotNull() @@ -42,13 +42,13 @@ public enum E2 { /*public static final*/ X /* = new E2() */, /*public static final*/ Y /* = new E2() */; + public abstract void a(); + E2(int n) { } E2(java.lang.String s) { } - - public abstract void a(); } //////////////////// @@ -63,13 +63,13 @@ public enum E3 { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; - E3(java.lang.String a) { - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; } + + E3(java.lang.String a) { + } } //////////////////// @@ -86,9 +86,6 @@ public enum E4 { private final long c = 0L; private final boolean d = false; - E4(java.lang.String a, int b, long c, boolean d) { - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; @@ -105,4 +102,7 @@ public enum E4 { public final boolean getD() { return false; } + + E4(java.lang.String a, int b, long c, boolean d) { + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt index 1625b6d5ecd..d7a55aa13d2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt @@ -3,15 +3,15 @@ import java.lang.System; @kotlin.Metadata() public abstract class Base { - public Base() { - super(); - } - protected abstract void doJob(@org.jetbrains.annotations.NotNull() java.lang.String job, int delay); protected abstract void doJobGeneric(@org.jetbrains.annotations.NotNull() T job, int delay); + + public Base() { + super(); + } } //////////////////// @@ -22,10 +22,6 @@ import java.lang.System; @kotlin.Metadata() public final class Impl extends Base { - public Impl() { - super(); - } - @java.lang.Override() protected void doJob(@org.jetbrains.annotations.NotNull() java.lang.String job, int delay) { @@ -35,4 +31,8 @@ public final class Impl extends Base { protected void doJobGeneric(@org.jetbrains.annotations.NotNull() T job, int delay) { } + + public Impl() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt index ba7cb8add43..35770662333 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt @@ -4,34 +4,19 @@ import a.b.ABC; @kotlin.Metadata() public final class Test { + public Test.MyDate date; + public java.util.concurrent.TimeUnit timeUnit; + public java.util.concurrent.TimeUnit microseconds; public a.b.ABC abc; public bcd bcd; - public Test.MyDate date; - public java.util.concurrent.TimeUnit microseconds; - public java.util.concurrent.TimeUnit timeUnit; - - public Test() { - super(); - } - - @org.jetbrains.annotations.NotNull() - public final a.b.ABC getAbc() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final bcd getBcd() { - return null; - } @org.jetbrains.annotations.NotNull() public final Test.MyDate getDate() { return null; } - @org.jetbrains.annotations.NotNull() - public final java.util.concurrent.TimeUnit getMicroseconds() { - return null; + public final void setDate(@org.jetbrains.annotations.NotNull() + Test.MyDate p0) { } @org.jetbrains.annotations.NotNull() @@ -39,34 +24,45 @@ public final class Test { return null; } - public final void setAbc(@org.jetbrains.annotations.NotNull() - a.b.ABC p0) { + public final void setTimeUnit(@org.jetbrains.annotations.NotNull() + java.util.concurrent.TimeUnit p0) { } - public final void setBcd(@org.jetbrains.annotations.NotNull() - bcd p0) { - } - - public final void setDate(@org.jetbrains.annotations.NotNull() - Test.MyDate p0) { + @org.jetbrains.annotations.NotNull() + public final java.util.concurrent.TimeUnit getMicroseconds() { + return null; } public final void setMicroseconds(@org.jetbrains.annotations.NotNull() java.util.concurrent.TimeUnit p0) { } - public final void setTimeUnit(@org.jetbrains.annotations.NotNull() - java.util.concurrent.TimeUnit p0) { + @org.jetbrains.annotations.NotNull() + public final a.b.ABC getAbc() { + return null; + } + + public final void setAbc(@org.jetbrains.annotations.NotNull() + a.b.ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final bcd getBcd() { + return null; + } + + public final void setBcd(@org.jetbrains.annotations.NotNull() + bcd p0) { + } + + public Test() { + super(); } @kotlin.Metadata() public static final class MyDate { public Test.MyDate date2; - public MyDate() { - super(); - } - @org.jetbrains.annotations.NotNull() public final Test.MyDate getDate2() { return null; @@ -75,6 +71,10 @@ public final class Test { public final void setDate2(@org.jetbrains.annotations.NotNull() Test.MyDate p0) { } + + public MyDate() { + super(); + } } } @@ -89,10 +89,6 @@ import a.b.ABC; public final class Test2 { public java.util.Date date; - public Test2() { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.util.Date getDate() { return null; @@ -101,4 +97,8 @@ public final class Test2 { public final void setDate(@org.jetbrains.annotations.NotNull() java.util.Date p0) { } + + public Test2() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt index 6e63ebd5eb6..ddbaa8f4059 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt @@ -14,23 +14,23 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno2 { + public abstract int i() default 5; + + public abstract java.lang.String s() default "ABC"; + + public abstract int[] ii() default {1, 2, 3}; + + public abstract java.lang.String[] ss() default {"A", "B"}; + public abstract Anno1 a(); - public abstract java.lang.Class[] classes(); - - public abstract java.lang.Class clazz(); - public abstract Colors color() default Colors.BLACK; public abstract Colors[] colors() default {Colors.BLACK, Colors.WHITE}; - public abstract int i() default 5; + public abstract java.lang.Class clazz(); - public abstract int[] ii() default {1, 2, 3}; - - public abstract java.lang.String s() default "ABC"; - - public abstract java.lang.String[] ss() default {"A", "B"}; + public abstract java.lang.Class[] classes(); } //////////////////// @@ -103,30 +103,30 @@ public final class TestAnno2 { @Anno3(value = "field") private java.lang.String b = "property initializer"; - public TestAnno2() { - super(); - } - @Anno1() public final void a(@org.jetbrains.annotations.NotNull() @Anno3(value = "param-pam-pam") java.lang.String param) { } + @Anno3(value = "property") + @java.lang.Deprecated() + public static void getB$annotations() { + } + @org.jetbrains.annotations.NotNull() @Anno3(value = "getter") public final java.lang.String getB() { return null; } - @Anno3(value = "property") - @java.lang.Deprecated() - public static void getB$annotations() { - } - @Anno3(value = "setter") public final void setB(@org.jetbrains.annotations.NotNull() @Anno3(value = "setparam") java.lang.String p0) { } + + public TestAnno2() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt index 389dc7f00bb..1ecb47c7377 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt @@ -23,10 +23,10 @@ public final class AnnotationsTest { super(); } - @org.jetbrains.annotations.NotNull() - public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver") - int $this$topLevelVal) { - return null; + @Anno(value = "top-level-fun") + public static final void topLevelFun(@org.jetbrains.annotations.NotNull() + @Anno(value = "top-level-fun-receiver") + java.lang.String $this$topLevelFun) { } @Anno(value = "top-level-val") @@ -34,10 +34,10 @@ public final class AnnotationsTest { public static void getTopLevelVal$annotations(int p0) { } - @Anno(value = "top-level-fun") - public static final void topLevelFun(@org.jetbrains.annotations.NotNull() - @Anno(value = "top-level-fun-receiver") - java.lang.String $this$topLevelFun) { + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver") + int $this$topLevelVal) { + return null; } } @@ -56,14 +56,14 @@ public enum Enum { /*public static final*/ BLACK /* = new Enum() */; private final int x = 0; + public final int getX() { + return 0; + } + @Anno(value = "enum-constructor") Enum(@Anno(value = "x") int x) { } - - public final int getX() { - return 0; - } } //////////////////// @@ -78,39 +78,39 @@ public abstract class Test { @org.jetbrains.annotations.NotNull() private java.lang.String v; - @Anno(value = "test-constructor") - protected Test(@org.jetbrains.annotations.NotNull() - @Anno(value = "v-param") - java.lang.String v) { - super(); - } - @org.jetbrains.annotations.NotNull() @Anno(value = "abstract-method") public abstract java.lang.String abstractMethod(); - @org.jetbrains.annotations.NotNull() - public abstract java.lang.String getAbstractVal(); - @Anno(value = "abstract-val") @java.lang.Deprecated() public static void getAbstractVal$annotations() { } + @org.jetbrains.annotations.NotNull() + public abstract java.lang.String getAbstractVal(); + + @Anno(value = "v-property") + @java.lang.Deprecated() + public static void getV$annotations() { + } + @org.jetbrains.annotations.NotNull() @Anno(value = "v-get") public final java.lang.String getV() { return null; } - @Anno(value = "v-property") - @java.lang.Deprecated() - public static void getV$annotations() { - } - @Anno(value = "v-set") public final void setV(@org.jetbrains.annotations.NotNull() @Anno(value = "v-setparam") java.lang.String p0) { } + + @Anno(value = "test-constructor") + protected Test(@org.jetbrains.annotations.NotNull() + @Anno(value = "v-param") + java.lang.String v) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt index 741bdac2ba0..71efe5e7a30 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt @@ -16,8 +16,10 @@ public final class Bar { @FieldAnno() private final java.lang.String a = ""; - public Bar() { - super(); + @Anno() + @PropertyAnno() + @java.lang.Deprecated() + public static void getA$annotations() { } @org.jetbrains.annotations.NotNull() @@ -25,10 +27,8 @@ public final class Bar { return null; } - @Anno() - @PropertyAnno() - @java.lang.Deprecated() - public static void getA$annotations() { + public Bar() { + super(); } } @@ -43,14 +43,14 @@ public final class Baz { @FieldAnno() public final java.lang.String a = ""; - public Baz() { - super(); - } - @Anno() @java.lang.Deprecated() public static void getA$annotations() { } + + public Baz() { + super(); + } } //////////////////// @@ -76,11 +76,9 @@ public final class Foo { @FieldAnno() private final java.lang.String a = null; - public Foo(@org.jetbrains.annotations.NotNull() - @Anno() - @ParameterAnno() - java.lang.String a) { - super(); + @PropertyAnno() + @java.lang.Deprecated() + public static void getA$annotations() { } @org.jetbrains.annotations.NotNull() @@ -88,9 +86,11 @@ public final class Foo { return null; } - @PropertyAnno() - @java.lang.Deprecated() - public static void getA$annotations() { + public Foo(@org.jetbrains.annotations.NotNull() + @Anno() + @ParameterAnno() + java.lang.String a) { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt index 69e35a0fdce..27375cccb3c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt @@ -17,11 +17,11 @@ public enum EnumError { /*public static final*/ One /* = new EnumError() */, /*public static final*/ Two /* = new EnumError() */; - EnumError() { - } - @org.jetbrains.annotations.NotNull() public abstract java.lang.String doIt(); + + EnumError() { + } } //////////////////// @@ -65,31 +65,6 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String prop2 = ""; - public Test() { - super(); - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getProp2() { - return null; - } - - /** - * prop2. - */ - @Anno() - @java.lang.Deprecated() - public static void getProp2$annotations() { - } - - /** - * get. - */ - @org.jetbrains.annotations.NotNull() - public final java.lang.String getProp3() { - return null; - } - /** * method(). */ @@ -109,12 +84,37 @@ public final class Test { java.lang.String a) { } + /** + * prop2. + */ + @Anno() + @java.lang.Deprecated() + public static void getProp2$annotations() { + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getProp2() { + return null; + } + + /** + * get. + */ + @org.jetbrains.annotations.NotNull() + public final java.lang.String getProp3() { + return null; + } + /** * set. */ public final void setProp3(@org.jetbrains.annotations.NotNull() java.lang.String v) { } + + public Test() { + super(); + } } //////////////////// @@ -132,15 +132,15 @@ public final class Test2 { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; - public Test2(@org.jetbrains.annotations.NotNull() - java.lang.String a) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; } + + public Test2(@org.jetbrains.annotations.NotNull() + java.lang.String a) { + super(); + } } //////////////////// @@ -156,15 +156,15 @@ public final class Test3 { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; - protected Test3(@org.jetbrains.annotations.NotNull() - java.lang.String a) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; } + + protected Test3(@org.jetbrains.annotations.NotNull() + java.lang.String a) { + super(); + } } //////////////////// @@ -175,11 +175,11 @@ import java.lang.System; @kotlin.Metadata() public final class Test4 { - public Test4() { - super(); + public final void method() { } - public final void method() { + public Test4() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt index 143928c7196..7342fc46d0d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt @@ -2,11 +2,28 @@ import java.lang.System; @kotlin.Metadata() public final class User { - private final int age = 0; @org.jetbrains.annotations.NotNull() private final java.lang.String firstName = null; @org.jetbrains.annotations.NotNull() private final java.lang.String secondName = null; + private final int age = 0; + + public final void procedure() { + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getFirstName() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getSecondName() { + return null; + } + + public final int getAge() { + return 0; + } public User(@org.jetbrains.annotations.NotNull() java.lang.String firstName, @org.jetbrains.annotations.NotNull() @@ -35,23 +52,9 @@ public final class User { return null; } + @org.jetbrains.annotations.NotNull() @java.lang.Override() - public boolean equals(@org.jetbrains.annotations.Nullable() - java.lang.Object p0) { - return false; - } - - public final int getAge() { - return 0; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getFirstName() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getSecondName() { + public java.lang.String toString() { return null; } @@ -60,12 +63,9 @@ public final class User { return 0; } - public final void procedure() { - } - - @org.jetbrains.annotations.NotNull() @java.lang.Override() - public java.lang.String toString() { - return null; + public boolean equals(@org.jetbrains.annotations.Nullable() + java.lang.Object p0) { + return false; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt index bb9b88f9eee..293604959eb 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt @@ -26,13 +26,13 @@ public abstract interface Intf { private static final int BLACK = 1; public static final int WHITE = 2; - private Companion() { - super(); - } - public final int getBLACK() { return 0; } + + private Companion() { + super(); + } } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt index 9dcf29f3c42..a20dea0e171 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt @@ -16,36 +16,116 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { + private final boolean z = false; private final byte b = 0; private final char c = '\u0000'; private final char c2 = '\u0000'; + private final short sh = 0; + private final int i = 0; + private final long l = 0L; + private final float f = 0.0F; + private final double d = 0.0; + @org.jetbrains.annotations.NotNull() + private final java.lang.String s = null; + @org.jetbrains.annotations.NotNull() + private final int[] iarr = null; + @org.jetbrains.annotations.NotNull() + private final long[] larr = null; + @org.jetbrains.annotations.NotNull() + private final double[] darr = null; + @org.jetbrains.annotations.NotNull() + private final java.lang.String[] sarr = null; @org.jetbrains.annotations.NotNull() private final java.lang.Class cl = null; @org.jetbrains.annotations.NotNull() private final java.lang.Class[] clarr = null; - private final double d = 0.0; - @org.jetbrains.annotations.NotNull() - private final double[] darr = null; @org.jetbrains.annotations.NotNull() private final Em em = null; @org.jetbrains.annotations.NotNull() private final Em[] emarr = null; - private final float f = 0.0F; - private final int i = 0; - @org.jetbrains.annotations.NotNull() - private final int[] iarr = null; - private final long l = 0L; - @org.jetbrains.annotations.NotNull() - private final long[] larr = null; - @org.jetbrains.annotations.NotNull() - private final java.lang.String s = null; - @org.jetbrains.annotations.NotNull() - private final java.lang.String[] sarr = null; - private final short sh = 0; - private final boolean z = false; - public Foo() { - super(); + public final void foo(int a) { + } + + public final boolean getZ() { + return false; + } + + public final byte getB() { + return 0; + } + + public final char getC() { + return '\u0000'; + } + + public final char getC2() { + return '\u0000'; + } + + public final short getSh() { + return 0; + } + + public final int getI() { + return 0; + } + + public final long getL() { + return 0L; + } + + public final float getF() { + return 0.0F; + } + + public final double getD() { + return 0.0; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getS() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final int[] getIarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final long[] getLarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final double[] getDarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String[] getSarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Class getCl() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Class[] getClarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final Em getEm() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final Em[] getEmarr() { + return null; } public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull() @@ -61,87 +141,7 @@ public final class Foo { super(); } - public final void foo(int a) { - } - - public final byte getB() { - return 0; - } - - public final char getC() { - return '\u0000'; - } - - public final char getC2() { - return '\u0000'; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Class getCl() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Class[] getClarr() { - return null; - } - - public final double getD() { - return 0.0; - } - - @org.jetbrains.annotations.NotNull() - public final double[] getDarr() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Em getEm() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Em[] getEmarr() { - return null; - } - - public final float getF() { - return 0.0F; - } - - public final int getI() { - return 0; - } - - @org.jetbrains.annotations.NotNull() - public final int[] getIarr() { - return null; - } - - public final long getL() { - return 0L; - } - - @org.jetbrains.annotations.NotNull() - public final long[] getLarr() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getS() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String[] getSarr() { - return null; - } - - public final short getSh() { - return 0; - } - - public final boolean getZ() { - return false; + public Foo() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt index 78f807176f4..a9a400e9d5f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt @@ -16,36 +16,116 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { + private final boolean z = true; private final byte b = (byte)0; private final char c = 'c'; private final char c2 = '\n'; + private final short sh = (short)10; + private final int i = 10; + private final long l = -10L; + private final float f = 1.0F; + private final double d = -1.0; + @org.jetbrains.annotations.NotNull() + private final java.lang.String s = "foo"; + @org.jetbrains.annotations.NotNull() + private final int[] iarr = {1, 2, 3}; + @org.jetbrains.annotations.NotNull() + private final long[] larr = {-1L, 0L, 1L}; + @org.jetbrains.annotations.NotNull() + private final double[] darr = {7.3}; + @org.jetbrains.annotations.NotNull() + private final java.lang.String[] sarr = {"a", "bc"}; @org.jetbrains.annotations.NotNull() private final java.lang.Class cl = null; @org.jetbrains.annotations.NotNull() private final java.lang.Class[] clarr = null; - private final double d = -1.0; - @org.jetbrains.annotations.NotNull() - private final double[] darr = {7.3}; @org.jetbrains.annotations.NotNull() private final Em em = Em.BAR; @org.jetbrains.annotations.NotNull() private final Em[] emarr = {Em.FOO, Em.BAR}; - private final float f = 1.0F; - private final int i = 10; - @org.jetbrains.annotations.NotNull() - private final int[] iarr = {1, 2, 3}; - private final long l = -10L; - @org.jetbrains.annotations.NotNull() - private final long[] larr = {-1L, 0L, 1L}; - @org.jetbrains.annotations.NotNull() - private final java.lang.String s = "foo"; - @org.jetbrains.annotations.NotNull() - private final java.lang.String[] sarr = {"a", "bc"}; - private final short sh = (short)10; - private final boolean z = true; - public Foo() { - super(); + public final void foo(int a) { + } + + public final boolean getZ() { + return false; + } + + public final byte getB() { + return 0; + } + + public final char getC() { + return '\u0000'; + } + + public final char getC2() { + return '\u0000'; + } + + public final short getSh() { + return 0; + } + + public final int getI() { + return 0; + } + + public final long getL() { + return 0L; + } + + public final float getF() { + return 0.0F; + } + + public final double getD() { + return 0.0; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getS() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final int[] getIarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final long[] getLarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final double[] getDarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String[] getSarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Class getCl() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Class[] getClarr() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final Em getEm() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final Em[] getEmarr() { + return null; } public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull() @@ -61,87 +141,7 @@ public final class Foo { super(); } - public final void foo(int a) { - } - - public final byte getB() { - return 0; - } - - public final char getC() { - return '\u0000'; - } - - public final char getC2() { - return '\u0000'; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Class getCl() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Class[] getClarr() { - return null; - } - - public final double getD() { - return 0.0; - } - - @org.jetbrains.annotations.NotNull() - public final double[] getDarr() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Em getEm() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Em[] getEmarr() { - return null; - } - - public final float getF() { - return 0.0F; - } - - public final int getI() { - return 0; - } - - @org.jetbrains.annotations.NotNull() - public final int[] getIarr() { - return null; - } - - public final long getL() { - return 0L; - } - - @org.jetbrains.annotations.NotNull() - public final long[] getLarr() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getS() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String[] getSarr() { - return null; - } - - public final short getSh() { - return 0; - } - - public final boolean getZ() { - return false; + public Foo() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt index 9be873c384c..5c990f5e91b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.txt @@ -21,17 +21,12 @@ public final class Foo { @java.lang.Deprecated() private final int prop = 0; - public Foo() { - super(); - } - @java.lang.Deprecated() public final void foo(int a) { } @java.lang.Deprecated() - public final int getFoo() { - return 0; + public static void getProp$annotations() { } @java.lang.Deprecated() @@ -40,10 +35,15 @@ public final class Foo { } @java.lang.Deprecated() - public static void getProp$annotations() { + public final int getFoo() { + return 0; } @java.lang.Deprecated() public final void setFoo(int value) { } + + public Foo() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt index 2e9cc543a88..445dabca9b1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.txt @@ -2,9 +2,9 @@ import java.lang.System; @kotlin.Metadata() public final class Test { + private final Test.Companion.Example foo; @org.jetbrains.annotations.NotNull() public static final Test.Companion Companion = null; - private final Test.Companion.Example foo; public Test() { super(); @@ -34,9 +34,9 @@ import java.lang.System; @kotlin.Metadata() public final class Test2 { + private final Test2.Amigo.Example foo; @org.jetbrains.annotations.NotNull() public static final Test2.Amigo Amigo = null; - private final Test2.Amigo.Example foo; public Test2() { super(); @@ -98,9 +98,9 @@ import java.lang.System; @kotlin.Metadata() public final class Test4 { + private final int foo = 1; @org.jetbrains.annotations.NotNull() public static final Test4.Companion Companion = null; - private final int foo = 1; public Test4() { super(); @@ -115,9 +115,9 @@ public final class Test4 { @kotlin.Metadata() public static final class Foo { + public static final int constProperty = 1; @org.jetbrains.annotations.NotNull() public static final Test4.Companion.Foo INSTANCE = null; - public static final int constProperty = 1; private Foo() { super(); diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt index d5464a0f098..90bb77c418d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt @@ -34,16 +34,17 @@ public enum Enum2 { private final java.lang.String col = null; private final int col2 = 0; - Enum2(@Anno1(value = "first") - java.lang.String col, @Anno1(value = "second") - int col2) { - } - @org.jetbrains.annotations.NotNull() public final java.lang.String color() { return null; } + private final void privateEnumFun() { + } + + public final void publicEnumFun() { + } + @org.jetbrains.annotations.NotNull() public final java.lang.String getCol() { return null; @@ -53,10 +54,9 @@ public enum Enum2 { return 0; } - private final void privateEnumFun() { - } - - public final void publicEnumFun() { + Enum2(@Anno1(value = "first") + java.lang.String col, @Anno1(value = "second") + int col2) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt index 7964af87856..d2059974e1b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt @@ -35,13 +35,6 @@ public final class ErrorInConstructorParameter { @org.jetbrains.annotations.NotNull() private final java.util.List c = null; - public ErrorInConstructorParameter(@org.jetbrains.annotations.NotNull() - java.lang.String a, @org.jetbrains.annotations.NotNull() - ABC b, @org.jetbrains.annotations.NotNull() - java.util.List c) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; @@ -56,6 +49,13 @@ public final class ErrorInConstructorParameter { public final java.util.List getC() { return null; } + + public ErrorInConstructorParameter(@org.jetbrains.annotations.NotNull() + java.lang.String a, @org.jetbrains.annotations.NotNull() + ABC b, @org.jetbrains.annotations.NotNull() + java.util.List c) { + super(); + } } //////////////////// @@ -69,8 +69,39 @@ public final class ErrorInDeclarations { public ABC p2; public BCD p3; - public ErrorInDeclarations() { - super(); + @org.jetbrains.annotations.NotNull() + public final java.lang.String getP1() { + return null; + } + + public final void setP1(@org.jetbrains.annotations.NotNull() + java.lang.String p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getP2() { + return null; + } + + public final void setP2(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final BCD getP3() { + return null; + } + + public final void setP3(@org.jetbrains.annotations.NotNull() + BCD p0) { + } + + public final void overloads(@org.jetbrains.annotations.NotNull() + java.lang.String a) { + } + + public final void overloads(@org.jetbrains.annotations.NotNull() + ABC a) { } public final void f1(@org.jetbrains.annotations.NotNull() @@ -89,39 +120,8 @@ public final class ErrorInDeclarations { return null; } - @org.jetbrains.annotations.NotNull() - public final java.lang.String getP1() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getP2() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final BCD getP3() { - return null; - } - - public final void overloads(@org.jetbrains.annotations.NotNull() - ABC a) { - } - - public final void overloads(@org.jetbrains.annotations.NotNull() - java.lang.String a) { - } - - public final void setP1(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { - } - - public final void setP2(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setP3(@org.jetbrains.annotations.NotNull() - BCD p0) { + public ErrorInDeclarations() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt index 91968329e1b..0fdad8ea0d2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.txt @@ -22,17 +22,17 @@ public final class ClassWithParent implements java.lang.CharSequence { super(); } + @java.lang.Override() + public final int length() { + return 0; + } + + public abstract int getLength(); + @java.lang.Override() public final char charAt(int p0) { return '\u0000'; } public abstract char get(int p0); - - public abstract int getLength(); - - @java.lang.Override() - public final int length() { - return 0; - } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt index b75ff4d79f0..01c641b3783 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt @@ -9,19 +9,14 @@ public final class Child extends kotlin.collections.AbstractList extends kotlin.collections.AbstractList implements java.util.List { - public MappedList() { - super(); - } - @org.jetbrains.annotations.NotNull() @java.lang.Override() public java.lang.Void get(int index) { @@ -129,6 +125,10 @@ public final class MappedList extends kotlin.collect public int getSize() { return 0; } + + public MappedList() { + super(); + } } //////////////////// @@ -180,15 +180,15 @@ public final class TFooBar extends Foo implements test.Intf, Bar { @org.jetbrains.annotations.NotNull() private final X a = null; - public TFooBar(@org.jetbrains.annotations.NotNull() - X a) { - super(); - } - @org.jetbrains.annotations.NotNull() public final X getA() { return null; } + + public TFooBar(@org.jetbrains.annotations.NotNull() + X a) { + super(); + } } //////////////////// @@ -202,15 +202,15 @@ public final class TFooBar2 implements Foo, Bar { @org.jetbrains.annotations.NotNull() private final X a = null; - public TFooBar2(@org.jetbrains.annotations.NotNull() - X a) { - super(); - } - @org.jetbrains.annotations.NotNull() public final X getA() { return null; } + + public TFooBar2(@org.jetbrains.annotations.NotNull() + X a) { + super(); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt index 39c2d66e87f..c3022a4f96c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt @@ -3,10 +3,6 @@ import java.lang.System; @kotlin.Metadata() public final class FunctionsTest { - public FunctionsTest() { - super(); - } - @org.jetbrains.annotations.NotNull() public final kotlin.reflect.KProperty1 f() { return null; @@ -23,4 +19,8 @@ public final class FunctionsTest { public final int f4() { return 0; } + + public FunctionsTest() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt index 511e325eeb5..3124b0ba9ac 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt @@ -2,28 +2,28 @@ import java.lang.System; @kotlin.Metadata() public final class MappedList extends kotlin.collections.AbstractList implements java.util.List { - private final kotlin.jvm.functions.Function1 function = null; @org.jetbrains.annotations.NotNull() private final java.util.List list = null; - - public MappedList(@org.jetbrains.annotations.NotNull() - java.util.List list, @org.jetbrains.annotations.NotNull() - kotlin.jvm.functions.Function1 function) { - super(); - } + private final kotlin.jvm.functions.Function1 function = null; @java.lang.Override() public R get(int index) { return null; } - @org.jetbrains.annotations.NotNull() - public final java.util.List getList() { - return null; - } - @java.lang.Override() public int getSize() { return 0; } + + @org.jetbrains.annotations.NotNull() + public final java.util.List getList() { + return null; + } + + public MappedList(@org.jetbrains.annotations.NotNull() + java.util.List list, @org.jetbrains.annotations.NotNull() + kotlin.jvm.functions.Function1 function) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt index 63525d2d679..e8a57c8a56a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt @@ -3,10 +3,6 @@ import java.lang.System; @kotlin.Metadata() public final class GenericRawSignatures { - public GenericRawSignatures() { - super(); - } - @org.jetbrains.annotations.Nullable() public final T genericFun() { return null; @@ -16,4 +12,8 @@ public final class GenericRawSignatures { public final java.lang.String nonGenericFun() { return null; } + + public GenericRawSignatures() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt index f84e05a9a50..2cc611e3767 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt @@ -54,14 +54,14 @@ public final class MyClass> fld = null; - public MyClass() { - super(); - } - @org.jetbrains.annotations.Nullable() public final java.util.List> getFld() { return null; } + + public MyClass() { + super(); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt index 93dd767e558..5becde66c24 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt @@ -7,8 +7,7 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String nonIgnoredProperty = ""; - public Test() { - super(); + public final void nonIgnoredFun() { } @org.jetbrains.annotations.NotNull() @@ -16,6 +15,7 @@ public final class Test { return null; } - public final void nonIgnoredFun() { + public Test() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt index 6d11ec00330..c8072353f9f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt @@ -22,11 +22,6 @@ public final class Cl { @org.jetbrains.annotations.NotNull() private java.lang.String name; - public Cl(@org.jetbrains.annotations.NotNull() - java.lang.String name) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getName() { return null; @@ -35,6 +30,11 @@ public final class Cl { public final void setName(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } + + public Cl(@org.jetbrains.annotations.NotNull() + java.lang.String name) { + super(); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt index 8b89f115836..40e01b3c9e5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt @@ -3,13 +3,13 @@ import java.lang.System; @kotlin.Metadata() public abstract class BaseClass { + @org.jetbrains.annotations.NotNull() + public abstract Result doJob(); + public BaseClass(@org.jetbrains.annotations.NotNull() Context context, int num, boolean bool) { super(); } - - @org.jetbrains.annotations.NotNull() - public abstract Result doJob(); } //////////////////// @@ -29,16 +29,16 @@ import java.lang.System; @kotlin.Metadata() public final class Inheritor extends BaseClass { - public Inheritor(@org.jetbrains.annotations.NotNull() - Context context) { - super(null, 0, false); - } - @org.jetbrains.annotations.NotNull() @java.lang.Override() public Result doJob() { return null; } + + public Inheritor(@org.jetbrains.annotations.NotNull() + Context context) { + super(null, 0, false); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt index 82a85d03fa2..adbce593298 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt @@ -9,23 +9,23 @@ public final class Cl { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; - @java.lang.Override() - public boolean equals(java.lang.Object p0) { - return false; - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; } + @java.lang.Override() + public java.lang.String toString() { + return null; + } + @java.lang.Override() public int hashCode() { return 0; } @java.lang.Override() - public java.lang.String toString() { - return null; + public boolean equals(java.lang.Object p0) { + return false; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt index f40f0dcbf44..fe33cd8aad0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt @@ -17,11 +17,6 @@ public final class Product2 implements Named { @org.jetbrains.annotations.Nullable() private java.lang.String name; - public Product2(@org.jetbrains.annotations.NotNull() - java.lang.String otherName) { - super(); - } - @org.jetbrains.annotations.Nullable() @java.lang.Override() public java.lang.String getName() { @@ -31,4 +26,9 @@ public final class Product2 implements Named { public void setName(@org.jetbrains.annotations.Nullable() java.lang.String p0) { } + + public Product2(@org.jetbrains.annotations.NotNull() + java.lang.String otherName) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt index cf13a91ae8a..c8e28d7075d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt @@ -57,10 +57,6 @@ public final class B { @org.jetbrains.annotations.NotNull() private final java.lang.String d = ""; - public B() { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getA() { return null; @@ -80,4 +76,8 @@ public final class B { public final java.lang.String getD() { return null; } + + public B() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt index 556fbf20e9e..9deab10689b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAll.txt @@ -3,11 +3,11 @@ import java.lang.System; @kotlin.Metadata() public abstract interface Foo { - public abstract void bar(); - public default void foo() { } public default void foo2(int a) { } + + public abstract void bar(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt index eba77fd99fb..2f19e15188d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.txt @@ -3,14 +3,14 @@ import java.lang.System; @kotlin.Metadata() public abstract interface Foo { - public abstract void bar(); - public default void foo() { } public default void foo2(int a) { } + public abstract void bar(); + @kotlin.Metadata() public static final class DefaultImpls { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt index c8537c35787..7459312db60 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt @@ -3,13 +3,13 @@ import java.lang.System; @kotlin.Metadata() public abstract interface Foo { - public abstract void bar(); - public abstract void foo(); public default void foo2(int a) { } + public abstract void bar(); + @kotlin.Metadata() public static final class DefaultImpls { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt index c8537c35787..7459312db60 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt @@ -3,13 +3,13 @@ import java.lang.System; @kotlin.Metadata() public abstract interface Foo { - public abstract void bar(); - public abstract void foo(); public default void foo2(int a) { } + public abstract void bar(); + @kotlin.Metadata() public static final class DefaultImpls { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt index 2a3dc2061f3..2b92efc2804 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt @@ -7,15 +7,6 @@ public final class State { @org.jetbrains.annotations.NotNull() private final java.lang.String someString = null; - public State(int someInt, long someLong) { - super(); - } - - public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() - java.lang.String someString) { - super(); - } - public final int getSomeInt() { return 0; } @@ -28,6 +19,15 @@ public final class State { public final java.lang.String getSomeString() { return null; } + + public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() + java.lang.String someString) { + super(); + } + + public State(int someInt, long someLong) { + super(); + } } //////////////////// @@ -42,27 +42,8 @@ public final class State2 { @org.jetbrains.annotations.NotNull() public final java.lang.String someString = null; - public State2(int someInt) { - super(); - } - - public State2(int someInt, long someLong) { - super(); - } - - public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull() + public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { - super(); - } - - public final void methodWithoutArgs() { - } - - public final void someMethod(@org.jetbrains.annotations.NotNull() - java.lang.String str) { - } - - public final int test(int someInt) { return 0; } @@ -70,8 +51,27 @@ public final class State2 { return 0; } - public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull() - java.lang.String someString) { + public final int test(int someInt) { return 0; } + + public final void someMethod(@org.jetbrains.annotations.NotNull() + java.lang.String str) { + } + + public final void methodWithoutArgs() { + } + + public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull() + java.lang.String someString) { + super(); + } + + public State2(int someInt, long someLong) { + super(); + } + + public State2(int someInt) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt index 475d383db7e..f92ab58e9c3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt @@ -14,15 +14,15 @@ public abstract interface FooComponent { @kotlin.Metadata() public static final class Companion { - private Companion() { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String create(@org.jetbrains.annotations.NotNull() java.lang.String context) { return null; } + + private Companion() { + super(); + } } } @@ -33,13 +33,13 @@ import java.lang.System; @kotlin.Metadata() public final class JvmStaticTest { - @org.jetbrains.annotations.NotNull() - public static final JvmStaticTest.Companion Companion = null; - public static final char c = 'C'; + public final byte three = (byte)3; public final char d = 'D'; private static final int one = 1; - public final byte three = (byte)3; public static final int two = 2; + public static final char c = 'C'; + @org.jetbrains.annotations.NotNull() + public static final JvmStaticTest.Companion Companion = null; public JvmStaticTest() { super(); @@ -52,16 +52,16 @@ public final class JvmStaticTest { @kotlin.Metadata() public static final class Companion { - private Companion() { - super(); + @java.lang.Deprecated() + public static void getOne$annotations() { } public final int getOne() { return 0; } - @java.lang.Deprecated() - public static void getOne$annotations() { + private Companion() { + super(); } } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt index 72350b059c0..74e088d08fa 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt @@ -2,10 +2,10 @@ import java.lang.System; @kotlin.Metadata() public final class Test { - @org.jetbrains.annotations.NotNull() - public static final Test.A A = null; @org.jetbrains.annotations.NotNull() private static final java.lang.String test = ""; + @org.jetbrains.annotations.NotNull() + public static final Test.A A = null; public Test() { super(); @@ -19,8 +19,8 @@ public final class Test { @kotlin.Metadata() public static final class A { - private A() { - super(); + @java.lang.Deprecated() + public static void getTest$annotations() { } @org.jetbrains.annotations.NotNull() @@ -28,8 +28,8 @@ public final class Test { return null; } - @java.lang.Deprecated() - public static void getTest$annotations() { + private A() { + super(); } } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt index b31105677bc..a7516a202c5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt @@ -7,15 +7,15 @@ public final class Kt14996Kt { super(); } - @org.jetbrains.annotations.NotNull() - public static final java.lang.CharSequence crashMe(@org.jetbrains.annotations.NotNull() - java.util.List values) { - return null; - } - @org.jetbrains.annotations.NotNull() public static final java.lang.String crashMe(@org.jetbrains.annotations.NotNull() java.util.List values) { return null; } + + @org.jetbrains.annotations.NotNull() + public static final java.lang.CharSequence crashMe(@org.jetbrains.annotations.NotNull() + java.util.List values) { + return null; + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt index 45a73433e10..3bf3b1ad424 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt @@ -3,59 +3,59 @@ import java.lang.System; @kotlin.Metadata() public final class Outer { - public Outer() { - super(); - } - public final void nonAbstract(@org.jetbrains.annotations.NotNull() java.lang.String s, int i) { } + public Outer() { + super(); + } + @kotlin.Metadata() final class Inner { - @org.jetbrains.annotations.NotNull() - private final java.lang.String bar = null; @org.jetbrains.annotations.NotNull() private final java.lang.String foo = null; + @org.jetbrains.annotations.NotNull() + private final java.lang.String bar = null; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getFoo() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getBar() { + return null; + } public Inner(@org.jetbrains.annotations.NotNull() java.lang.String foo, @org.jetbrains.annotations.NotNull() java.lang.String bar) { super(); } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getBar() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getFoo() { - return null; - } } @kotlin.Metadata() static final class Nested { - @org.jetbrains.annotations.NotNull() - private final java.lang.String bar = null; @org.jetbrains.annotations.NotNull() private final java.lang.String foo = null; + @org.jetbrains.annotations.NotNull() + private final java.lang.String bar = null; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getFoo() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getBar() { + return null; + } public Nested(@org.jetbrains.annotations.NotNull() java.lang.String foo, @org.jetbrains.annotations.NotNull() java.lang.String bar) { super(); } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getBar() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getFoo() { - return null; - } } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt index 4a865d9f846..3f272ea4f5b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt @@ -7,13 +7,13 @@ public final class MutableEntry internal = null; private final K key = null; - public MutableEntry(@org.jetbrains.annotations.NotNull() - java.util.Map internal, K key, V value) { - super(); - } - @java.lang.Override() public K getKey() { return null; } + + public MutableEntry(@org.jetbrains.annotations.NotNull() + java.util.Map internal, K key, V value) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt index d3ea90577db..88d1bf86686 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt @@ -89,13 +89,14 @@ import java.lang.System; @kotlin.Metadata() public final class JJ { - @org.jetbrains.annotations.NotNull() - public static final app.JJ INSTANCE = null; @org.jetbrains.annotations.NotNull() private static final java.lang.String b = null; + @org.jetbrains.annotations.NotNull() + public static final app.JJ INSTANCE = null; - private JJ() { - super(); + @org.jetbrains.annotations.NotNull() + public final java.lang.String getB() { + return null; } @org.jetbrains.annotations.NotNull() @@ -103,9 +104,8 @@ public final class JJ { return null; } - @org.jetbrains.annotations.NotNull() - public final java.lang.String getB() { - return null; + private JJ() { + super(); } } @@ -136,8 +136,59 @@ public final class MyActivity { public int propE = app.B.id.textView; private final int propF = 0; - public MyActivity() { - super(); + @Bind(id = lib.R.id.textView) + @java.lang.Deprecated() + public static void getA$annotations() { + } + + public final int getA() { + return 0; + } + + @Bind(id = lib.R.id.textView) + @java.lang.Deprecated() + public static void getB$annotations() { + } + + public final int getB() { + return 0; + } + + @Bind(id = app.R.layout.mainActivity) + @java.lang.Deprecated() + public static void getC$annotations() { + } + + public final int getC() { + return 0; + } + + @Bind(id = app.R.layout.mainActivity) + @java.lang.Deprecated() + public static void getD$annotations() { + } + + public final int getD() { + return 0; + } + + @Anno(a1 = app.B.a1, a2 = app.B.a2, a3 = app.B.a3, a4 = app.B.a4, a5 = app.B.a5, a6 = app.B.a6, a7 = app.B.a7, a8 = app.B.a8, a9 = "A") + @Bind(id = app.R2.layout.mainActivity) + @java.lang.Deprecated() + public static void getE$annotations() { + } + + public final int getE() { + return 0; + } + + @Bind(id = app.B.id.textView) + @java.lang.Deprecated() + public static void getF$annotations() { + } + + public final int getF() { + return 0; } @Bind(id = lib.R.id.textView) @@ -161,59 +212,8 @@ public final class MyActivity { public final void foo5() { } - public final int getA() { - return 0; - } - - @Bind(id = lib.R.id.textView) - @java.lang.Deprecated() - public static void getA$annotations() { - } - - public final int getB() { - return 0; - } - - @Bind(id = lib.R.id.textView) - @java.lang.Deprecated() - public static void getB$annotations() { - } - - public final int getC() { - return 0; - } - - @Bind(id = app.R.layout.mainActivity) - @java.lang.Deprecated() - public static void getC$annotations() { - } - - public final int getD() { - return 0; - } - - @Bind(id = app.R.layout.mainActivity) - @java.lang.Deprecated() - public static void getD$annotations() { - } - - public final int getE() { - return 0; - } - - @Anno(a1 = app.B.a1, a2 = app.B.a2, a3 = app.B.a3, a4 = app.B.a4, a5 = app.B.a5, a6 = app.B.a6, a7 = app.B.a7, a8 = app.B.a8, a9 = "A") - @Bind(id = app.R2.layout.mainActivity) - @java.lang.Deprecated() - public static void getE$annotations() { - } - - public final int getF() { - return 0; - } - @Bind(id = app.B.id.textView) - @java.lang.Deprecated() - public static void getF$annotations() { + public final void plainIntConstant() { } public final int getPropB() { @@ -224,15 +224,15 @@ public final class MyActivity { return 0; } + public final void setPropC(int p0) { + } + public final int getPropF() { return 0; } - @Bind(id = app.B.id.textView) - public final void plainIntConstant() { - } - - public final void setPropC(int p0) { + public MyActivity() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt index 99e83853ff7..b3fbf47e87c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt @@ -6,16 +6,16 @@ public final class Foo { private final Foo.Bar bar = null; private final java.lang.String string = null; - public Foo(@org.jetbrains.annotations.NotNull() - java.lang.String string) { - super(); - } - @org.jetbrains.annotations.NotNull() public final Foo.Bar getBar() { return null; } + public Foo(@org.jetbrains.annotations.NotNull() + java.lang.String string) { + super(); + } + @kotlin.Metadata() public static final class Bar { @org.jetbrains.annotations.NotNull() @@ -23,11 +23,6 @@ public final class Foo { @org.jetbrains.annotations.NotNull() private final java.lang.String string = null; - public Bar(@org.jetbrains.annotations.NotNull() - java.lang.String string) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.util.ArrayList getBars() { return null; @@ -37,5 +32,10 @@ public final class Foo { public final java.lang.String getString() { return null; } + + public Bar(@org.jetbrains.annotations.NotNull() + java.lang.String string) { + super(); + } } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt index 47d5bea2ace..d3065ba81c7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt @@ -4,13 +4,13 @@ import java.lang.System; @kotlin.Metadata() public final class StaticImport { + private final java.util.Collection x = null; private final kapt.StaticMethod l = null; private final kapt.StaticMethod m = null; - private final java.util.Collection x = null; private final int y = 0; - public StaticImport() { - super(); + public final java.util.Collection getX() { + return null; } public final kapt.StaticMethod getL() { @@ -21,13 +21,13 @@ public final class StaticImport { return null; } - public final java.util.Collection getX() { - return null; - } - public final int getY() { return 0; } + + public StaticImport() { + super(); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt index 3abef07994c..9b1ef49ee4a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt @@ -5,9 +5,11 @@ import java.lang.System; @kotlin.Metadata() public abstract class BundleProperty extends test.NullableBundleProperty { - public BundleProperty(@org.jetbrains.annotations.Nullable() - java.lang.String key) { - super(null); + @java.lang.Override() + public final void setValue(@org.jetbrains.annotations.NotNull() + java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() + kotlin.reflect.KProperty property, @org.jetbrains.annotations.Nullable() + AA value) { } @java.lang.Override() @@ -28,11 +30,9 @@ public abstract class BundleProperty extends test.N java.lang.Object bundle, @org.jetbrains.annotations.NotNull() java.lang.String key, AA value); - @java.lang.Override() - public final void setValue(@org.jetbrains.annotations.NotNull() - java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() - kotlin.reflect.KProperty property, @org.jetbrains.annotations.Nullable() - AA value) { + public BundleProperty(@org.jetbrains.annotations.Nullable() + java.lang.String key) { + super(null); } } @@ -67,16 +67,10 @@ import java.lang.System; public abstract class NullableBundleProperty implements kotlin.properties.ReadWriteProperty { private final java.lang.String key = null; - public NullableBundleProperty(@org.jetbrains.annotations.Nullable() - java.lang.String key) { - super(); + private final java.lang.String toKey(kotlin.reflect.KProperty $this$toKey) { + return null; } - @org.jetbrains.annotations.Nullable() - public abstract EE getValue(@org.jetbrains.annotations.NotNull() - java.lang.Object bundle, @org.jetbrains.annotations.NotNull() - java.lang.String key); - @org.jetbrains.annotations.Nullable() @java.lang.Override() public EE getValue(@org.jetbrains.annotations.NotNull() @@ -85,11 +79,6 @@ public abstract class NullableBundleProperty implem return null; } - public abstract void setNullableValue(@org.jetbrains.annotations.NotNull() - java.lang.Object bundle, @org.jetbrains.annotations.NotNull() - java.lang.String key, @org.jetbrains.annotations.Nullable() - EE value); - @java.lang.Override() public void setValue(@org.jetbrains.annotations.NotNull() java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() @@ -97,7 +86,18 @@ public abstract class NullableBundleProperty implem EE value) { } - private final java.lang.String toKey(kotlin.reflect.KProperty $this$toKey) { - return null; + @org.jetbrains.annotations.Nullable() + public abstract EE getValue(@org.jetbrains.annotations.NotNull() + java.lang.Object bundle, @org.jetbrains.annotations.NotNull() + java.lang.String key); + + public abstract void setNullableValue(@org.jetbrains.annotations.NotNull() + java.lang.Object bundle, @org.jetbrains.annotations.NotNull() + java.lang.String key, @org.jetbrains.annotations.Nullable() + EE value); + + public NullableBundleProperty(@org.jetbrains.annotations.Nullable() + java.lang.String key) { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt index 482d0e87194..10fbe967c0f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt34569.txt @@ -3,11 +3,11 @@ import java.lang.System; @kotlin.Metadata() public final class T implements java.lang.Runnable { - public T() { - super(); - } - @java.lang.Override() public void run() { } + + public T() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt index bca7d1b6c14..c94dce768d6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.txt @@ -2,13 +2,13 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { + private final kotlin.Lazy foo$delegate = null; private final kotlin.Lazy bar$delegate = null; private final kotlin.Lazy baz$delegate = null; - private final kotlin.Lazy foo$delegate = null; private final kotlin.Lazy generic1$delegate = null; - public Foo() { - super(); + private final java.lang.Runnable getFoo() { + return null; } private final java.lang.Object getBar() { @@ -19,12 +19,12 @@ public final class Foo { return null; } - private final java.lang.Runnable getFoo() { + private final GenericIntf getGeneric1() { return null; } - private final GenericIntf getGeneric1() { - return null; + public Foo() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt index 238868dcb69..e762ee7db60 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.txt @@ -3,12 +3,12 @@ import kotlin.reflect.KClass; @kotlin.Metadata() public final class Test { - public Test() { - super(); - } - public final void a(@org.jetbrains.annotations.NotNull() ABC a, @org.jetbrains.annotations.NotNull() BCD b) { } + + public Test() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt index 35c868cb5b2..9891cc7ef2a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt @@ -3,17 +3,17 @@ import java.lang.System; @kotlin.Metadata() public abstract class Cls { - public Cls() { - super(); - } + public abstract void foo(@org.jetbrains.annotations.NotNull() + java.lang.String abc); @org.jetbrains.annotations.NotNull() public final java.lang.String bar(int bcd) { return null; } - public abstract void foo(@org.jetbrains.annotations.NotNull() - java.lang.String abc); + public Cls() { + super(); + } } //////////////////// @@ -24,12 +24,12 @@ import java.lang.System; @kotlin.Metadata() public abstract interface Intf { - @org.jetbrains.annotations.NotNull() - public abstract java.lang.String bar(int bcd); - public abstract void foo(@org.jetbrains.annotations.NotNull() java.lang.String abc); + @org.jetbrains.annotations.NotNull() + public abstract java.lang.String bar(int bcd); + @kotlin.Metadata() public static final class DefaultImpls { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt index dad68ddd0ba..73e9d91ae0d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt @@ -4,10 +4,6 @@ import java.lang.System; public final class CrashMe { private final int resources = 1; - public CrashMe() { - super(); - } - public final int getResources() { return 0; } @@ -16,4 +12,8 @@ public final class CrashMe { public final java.lang.String getResources() { return null; } + + public CrashMe() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt index ea063374792..f54ffd3f1da 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt @@ -33,10 +33,6 @@ public final class Modifiers { @org.jetbrains.annotations.NotNull() private volatile java.lang.String volatileField = ""; - public Modifiers() { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getTransientField() { return null; @@ -47,8 +43,16 @@ public final class Modifiers { return null; } + public final void setVolatileField(@org.jetbrains.annotations.NotNull() + java.lang.String p0) { + } + + public final strictfp void strictFp() { + } + @org.jetbrains.annotations.NotNull() - public final java.lang.String overloads() { + public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() + java.lang.String a, int n) { return null; } @@ -59,16 +63,12 @@ public final class Modifiers { } @org.jetbrains.annotations.NotNull() - public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() - java.lang.String a, int n) { + public final java.lang.String overloads() { return null; } - public final void setVolatileField(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { - } - - public final strictfp void strictFp() { + public Modifiers() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt index e51f108525d..cc890eed4ce 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt @@ -5,8 +5,9 @@ public final class A { @org.jetbrains.annotations.Nullable() private final A x = null; - public A() { - super(); + @org.jetbrains.annotations.Nullable() + public final A getX() { + return null; } @org.jetbrains.annotations.Nullable() @@ -16,9 +17,8 @@ public final class A { return null; } - @org.jetbrains.annotations.Nullable() - public final A getX() { - return null; + public A() { + super(); } @kotlin.Metadata() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt index cebef3ed0e0..595a64167ff 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt @@ -4,10 +4,10 @@ import java.lang.System; public final class A$B { public A$B.C c; public A$B.D$E de; - public A$B.D$$E dee; - public A$B.D$$$E deee; public J$B.C jc; public J$B.D$E jde; + public A$B.D$$E dee; + public A$B.D$$$E deee; public J$B.D$$E jdee; public J$B.D$$$E jdeee; @@ -245,11 +245,6 @@ public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo { @org.jetbrains.annotations.NotNull() private final Foo.Bar.Zoo zoo = null; - public Test1(@org.jetbrains.annotations.NotNull() - Foo.Bar.Zoo zoo) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.Thread.State a() { return null; @@ -264,4 +259,9 @@ public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo { public final Foo.Bar.Zoo getZoo() { return null; } + + public Test1(@org.jetbrains.annotations.NotNull() + Foo.Bar.Zoo zoo) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt index fa4e412063a..4b911cb1093 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt @@ -6,10 +6,10 @@ import java.lang.System; public final class A$B { public test.A$B.C c; public test.A$B.D$E de; - public test.A$B.D$$E dee; - public test.A$B.D$$$E deee; public test.J$B.C jc; public test.J$B.D$E jde; + public test.A$B.D$$E dee; + public test.A$B.D$$$E deee; public test.J$B.D$$E jdee; public test.J$B.D$$$E jdeee; @@ -253,11 +253,6 @@ public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IF @org.jetbrains.annotations.NotNull() private final test.Foo.Bar.Zoo zoo = null; - public Test1(@org.jetbrains.annotations.NotNull() - test.Foo.Bar.Zoo zoo) { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.Thread.State a() { return null; @@ -272,4 +267,9 @@ public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IF public final test.Foo.Bar.Zoo getZoo() { return null; } + + public Test1(@org.jetbrains.annotations.NotNull() + test.Foo.Bar.Zoo zoo) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt index 674182486da..0c835f604aa 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt @@ -3,8 +3,6 @@ import java.lang.System; @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) @kotlin.Metadata() public final class NonExistentType { - @org.jetbrains.annotations.NotNull() - public static final NonExistentType INSTANCE = null; @org.jetbrains.annotations.Nullable() private static final ABCDEF a = null; @org.jetbrains.annotations.Nullable() @@ -13,23 +11,8 @@ public final class NonExistentType { private static final Function1 c = null; @org.jetbrains.annotations.Nullable() private static final ABCDEF, kotlin.Unit>> d = null; - - private NonExistentType() { - super(); - } - @org.jetbrains.annotations.NotNull() - public final ABCDEF a(@org.jetbrains.annotations.NotNull() - ABCDEF a, @org.jetbrains.annotations.NotNull() - java.lang.String s) { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABCDEF b(@org.jetbrains.annotations.NotNull() - java.lang.String s) { - return null; - } + public static final NonExistentType INSTANCE = null; @org.jetbrains.annotations.Nullable() public final ABCDEF getA() { @@ -50,6 +33,23 @@ public final class NonExistentType { public final ABCDEF, kotlin.Unit>> getD() { return null; } + + @org.jetbrains.annotations.NotNull() + public final ABCDEF a(@org.jetbrains.annotations.NotNull() + ABCDEF a, @org.jetbrains.annotations.NotNull() + java.lang.String s) { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final ABCDEF b(@org.jetbrains.annotations.NotNull() + java.lang.String s) { + return null; + } + + private NonExistentType() { + super(); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt index d6e2263e680..660b3b0dcca 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt @@ -53,11 +53,6 @@ public final class Test { private final ABC b = null; @org.jetbrains.annotations.Nullable() private final java.util.List c = null; - public ABC coocoo; - public ABC coocoo2; - public ABC coocoo21; - public ABC coocoo3; - public ABC> coocoo31; @org.jetbrains.annotations.Nullable() private final java.util.List>>> d = null; public java.util.List> e; @@ -68,17 +63,205 @@ public final class Test { public Function0 j; public Function2, CDE> k; public ABC.BCD.EFG l; + public ABC coocoo; + public ABC coocoo2; + public ABC coocoo21; + public ABC coocoo3; + public ABC> coocoo31; + public ABC nested; @org.jetbrains.annotations.NotNull() private final java.lang.Object m = null; @org.jetbrains.annotations.NotNull() private final java.lang.String n = ""; - public ABC nested; - public java.util.List>>>>>>>> o10; public java.util.List>>>>>>>>> o11; + public java.util.List>>>>>>>> o10; public java.util.Calendar.Builder p; - public Test() { - super(); + @org.jetbrains.annotations.NotNull() + public final ABC getA() { + return null; + } + + public final void setA(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.Nullable() + public final ABC getB() { + return null; + } + + @org.jetbrains.annotations.Nullable() + public final java.util.List getC() { + return null; + } + + @org.jetbrains.annotations.Nullable() + public final java.util.List>>> getD() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.util.List> getE() { + return null; + } + + public final void setE(@org.jetbrains.annotations.NotNull() + java.util.List> p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getF() { + return null; + } + + public final void setF(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final java.util.List getG() { + return null; + } + + public final void setG(@org.jetbrains.annotations.NotNull() + java.util.List p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getH() { + return null; + } + + public final void setH(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final Function2, CDE> getI() { + return null; + } + + public final void setI(@org.jetbrains.annotations.NotNull() + Function2, CDE> p0) { + } + + @org.jetbrains.annotations.NotNull() + public final Function0 getJ() { + return null; + } + + public final void setJ(@org.jetbrains.annotations.NotNull() + Function0 p0) { + } + + @org.jetbrains.annotations.NotNull() + public final Function2, CDE> getK() { + return null; + } + + public final void setK(@org.jetbrains.annotations.NotNull() + Function2, CDE> p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC.BCD.EFG getL() { + return null; + } + + public final void setL(@org.jetbrains.annotations.NotNull() + ABC.BCD.EFG p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getCoocoo() { + return null; + } + + public final void setCoocoo(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getCoocoo2() { + return null; + } + + public final void setCoocoo2(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getCoocoo21() { + return null; + } + + public final void setCoocoo21(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getCoocoo3() { + return null; + } + + public final void setCoocoo3(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC> getCoocoo31() { + return null; + } + + public final void setCoocoo31(@org.jetbrains.annotations.NotNull() + ABC> p0) { + } + + @org.jetbrains.annotations.NotNull() + public final ABC getNested() { + return null; + } + + public final void setNested(@org.jetbrains.annotations.NotNull() + ABC p0) { + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Object getM() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getN() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.util.List>>>>>>>>> getO11() { + return null; + } + + public final void setO11(@org.jetbrains.annotations.NotNull() + java.util.List>>>>>>>>> p0) { + } + + @org.jetbrains.annotations.NotNull() + public final java.util.List>>>>>>>> getO10() { + return null; + } + + public final void setO10(@org.jetbrains.annotations.NotNull() + java.util.List>>>>>>>> p0) { + } + + @org.jetbrains.annotations.NotNull() + public final java.util.Calendar.Builder getP() { + return null; + } + + public final void setP(@org.jetbrains.annotations.NotNull() + java.util.Calendar.Builder p0) { } @org.jetbrains.annotations.Nullable() @@ -107,191 +290,8 @@ public final class Test { return null; } - @org.jetbrains.annotations.NotNull() - public final ABC getA() { - return null; - } - - @org.jetbrains.annotations.Nullable() - public final ABC getB() { - return null; - } - - @org.jetbrains.annotations.Nullable() - public final java.util.List getC() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getCoocoo() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getCoocoo2() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getCoocoo21() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getCoocoo3() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC> getCoocoo31() { - return null; - } - - @org.jetbrains.annotations.Nullable() - public final java.util.List>>> getD() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.util.List> getE() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getF() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.util.List getG() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getH() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Function2, CDE> getI() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Function0 getJ() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final Function2, CDE> getK() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC.BCD.EFG getL() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Object getM() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getN() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final ABC getNested() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.util.List>>>>>>>> getO10() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.util.List>>>>>>>>> getO11() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.util.Calendar.Builder getP() { - return null; - } - - public final void setA(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setCoocoo(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setCoocoo2(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setCoocoo21(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setCoocoo3(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setCoocoo31(@org.jetbrains.annotations.NotNull() - ABC> p0) { - } - - public final void setE(@org.jetbrains.annotations.NotNull() - java.util.List> p0) { - } - - public final void setF(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setG(@org.jetbrains.annotations.NotNull() - java.util.List p0) { - } - - public final void setH(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setI(@org.jetbrains.annotations.NotNull() - Function2, CDE> p0) { - } - - public final void setJ(@org.jetbrains.annotations.NotNull() - Function0 p0) { - } - - public final void setK(@org.jetbrains.annotations.NotNull() - Function2, CDE> p0) { - } - - public final void setL(@org.jetbrains.annotations.NotNull() - ABC.BCD.EFG p0) { - } - - public final void setNested(@org.jetbrains.annotations.NotNull() - ABC p0) { - } - - public final void setO10(@org.jetbrains.annotations.NotNull() - java.util.List>>>>>>>> p0) { - } - - public final void setO11(@org.jetbrains.annotations.NotNull() - java.util.List>>>>>>>>> p0) { - } - - public final void setP(@org.jetbrains.annotations.NotNull() - java.util.Calendar.Builder p0) { + public Test() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt index 0d7b08151a8..b3e1e450e83 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt @@ -12,39 +12,22 @@ import java.lang.System; @kotlin.Metadata() public final class NonExistentType { - @org.jetbrains.annotations.NotNull() - public static final NonExistentType INSTANCE = null; @org.jetbrains.annotations.Nullable() private static final error.NonExistentClass a = null; @org.jetbrains.annotations.Nullable() private static final java.util.List b = null; @org.jetbrains.annotations.NotNull() private static final kotlin.jvm.functions.Function1 c = null; + @org.jetbrains.annotations.Nullable() + private static final error.NonExistentClass d = null; + public static java.lang.String string2; public static error.NonExistentClass coocoo; public static error.NonExistentClass coocoo2; public static error.NonExistentClass coocoo21; public static error.NonExistentClass coocoo3; public static error.NonExistentClass coocoo31; - @org.jetbrains.annotations.Nullable() - private static final error.NonExistentClass d = null; - public static java.lang.String string2; - - private NonExistentType() { - super(); - } - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass a(@org.jetbrains.annotations.NotNull() - error.NonExistentClass a, @org.jetbrains.annotations.NotNull() - java.lang.String s) { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass b(@org.jetbrains.annotations.NotNull() - java.lang.String s) { - return null; - } + public static final NonExistentType INSTANCE = null; @org.jetbrains.annotations.Nullable() public final error.NonExistentClass getA() { @@ -61,31 +44,6 @@ public final class NonExistentType { return null; } - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass getCoocoo() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass getCoocoo2() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass getCoocoo21() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass getCoocoo3() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final error.NonExistentClass getCoocoo31() { - return null; - } - @org.jetbrains.annotations.Nullable() public final error.NonExistentClass getD() { return null; @@ -96,28 +54,70 @@ public final class NonExistentType { return null; } + public final void setString2(@org.jetbrains.annotations.NotNull() + java.lang.String p0) { + } + + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass getCoocoo() { + return null; + } + public final void setCoocoo(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass getCoocoo2() { + return null; + } + public final void setCoocoo2(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass getCoocoo21() { + return null; + } + public final void setCoocoo21(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass getCoocoo3() { + return null; + } + public final void setCoocoo3(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass getCoocoo31() { + return null; + } + public final void setCoocoo31(@org.jetbrains.annotations.NotNull() error.NonExistentClass p0) { } - public final void setString2(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass a(@org.jetbrains.annotations.NotNull() + error.NonExistentClass a, @org.jetbrains.annotations.NotNull() + java.lang.String s) { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final error.NonExistentClass b(@org.jetbrains.annotations.NotNull() + java.lang.String s) { + return null; + } + + private NonExistentType() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt index 115e31a3585..d662b8fdabc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt @@ -2,45 +2,57 @@ import java.lang.System; @kotlin.Metadata() public final class PrimitiveTypes { - @org.jetbrains.annotations.NotNull() - public static final PrimitiveTypes INSTANCE = null; public static final boolean booleanFalse = false; public static final boolean booleanTrue = true; + public static final int int0 = 0; + public static final int intMinus1000 = -1000; + public static final int intMinValue = -2147483648; + public static final int intMaxValue = 2147483647; + public static final int intHex = -1; public static final byte byte0 = (byte)0; public static final byte byte50 = (byte)50; + public static final short short5 = (short)5; + public static final char charC = 'C'; public static final char char0 = '\u0000'; public static final char char10 = '\n'; public static final char char13 = '\r'; - public static final char charC = 'C'; - public static final double double54 = 5.4; - private static final double doubleMaxValue = 1.7976931348623157E308; - private static final double doubleNan = 0.0 / 0.0; - private static final double doubleNegativeInfinity = -1.0 / 0.0; - private static final double doublePositiveInfinity = 1.0 / 0.0; + public static final long long0 = 0L; + public static final long longMaxValue = 9223372036854775807L; + public static final long longMinValue = -9223372036854775808L; + public static final long longHex = 4294967295L; public static final float float54 = 5.4F; private static final float floatMaxValue = 3.4028235E38F; private static final float floatNan = 0.0F / 0.0F; - private static final float floatNegativeInfinity = -1.0F / 0.0F; private static final float floatPositiveInfinity = 1.0F / 0.0F; - public static final int int0 = 0; - public static final int intHex = -1; - public static final int intMaxValue = 2147483647; - public static final int intMinValue = -2147483648; - public static final int intMinus1000 = -1000; - public static final long long0 = 0L; - public static final long longHex = 4294967295L; - public static final long longMaxValue = 9223372036854775807L; - public static final long longMinValue = -9223372036854775808L; - public static final short short5 = (short)5; + private static final float floatNegativeInfinity = -1.0F / 0.0F; + public static final double double54 = 5.4; + private static final double doubleMaxValue = 1.7976931348623157E308; + private static final double doubleNan = 0.0 / 0.0; + private static final double doublePositiveInfinity = 1.0 / 0.0; + private static final double doubleNegativeInfinity = -1.0 / 0.0; @org.jetbrains.annotations.NotNull() public static final java.lang.String stringHelloWorld = "Hello, world!"; @org.jetbrains.annotations.NotNull() public static final java.lang.String stringQuotes = "quotes \" \'\'quotes"; @org.jetbrains.annotations.NotNull() public static final java.lang.String stringRN = "\r\n"; + @org.jetbrains.annotations.NotNull() + public static final PrimitiveTypes INSTANCE = null; - private PrimitiveTypes() { - super(); + public final float getFloatMaxValue() { + return 0.0F; + } + + public final float getFloatNan() { + return 0.0F; + } + + public final float getFloatPositiveInfinity() { + return 0.0F; + } + + public final float getFloatNegativeInfinity() { + return 0.0F; } public final double getDoubleMaxValue() { @@ -51,27 +63,15 @@ public final class PrimitiveTypes { return 0.0; } - public final double getDoubleNegativeInfinity() { - return 0.0; - } - public final double getDoublePositiveInfinity() { return 0.0; } - public final float getFloatMaxValue() { - return 0.0F; + public final double getDoubleNegativeInfinity() { + return 0.0; } - public final float getFloatNan() { - return 0.0F; - } - - public final float getFloatNegativeInfinity() { - return 0.0F; - } - - public final float getFloatPositiveInfinity() { - return 0.0F; + private PrimitiveTypes() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt index be5c8274a2a..4452a93f9e6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt @@ -27,8 +27,10 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String prop = "A"; - public Test() { - super(); + @Anno2() + @Anno() + @java.lang.Deprecated() + public static void getProp$annotations() { } @org.jetbrains.annotations.NotNull() @@ -36,9 +38,7 @@ public final class Test { return null; } - @Anno2() - @Anno() - @java.lang.Deprecated() - public static void getProp$annotations() { + public Test() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt index ee22f8c5c73..60e2db544c7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt @@ -28,6 +28,11 @@ public final class KBox implements androidx.annotation.Box { @org.jetbrains.annotations.NotNull() private final androidx.annotation.Box delegate = null; + @org.jetbrains.annotations.NotNull() + public final androidx.annotation.Box getDelegate() { + return null; + } + public KBox(@org.jetbrains.annotations.NotNull() androidx.annotation.Box delegate) { super(); @@ -38,9 +43,4 @@ public final class KBox implements androidx.annotation.Box { public java.lang.String foo() { return null; } - - @org.jetbrains.annotations.NotNull() - public final androidx.annotation.Box getDelegate() { - return null; - } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt index b7aad884ada..75af5872492 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt @@ -4,9 +4,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoArray { - public abstract java.lang.String[] a(); - public abstract int x(); + + public abstract java.lang.String[] a(); } //////////////////// @@ -18,9 +18,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoBoolean { - public abstract boolean bool(); - public abstract int x(); + + public abstract boolean bool(); } //////////////////// @@ -32,9 +32,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoChar { - public abstract char chr(); - public abstract int x(); + + public abstract char chr(); } //////////////////// @@ -46,9 +46,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoClass { - public abstract java.lang.Class c(); - public abstract int x(); + + public abstract java.lang.Class c(); } //////////////////// @@ -60,9 +60,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoDouble { - public abstract double dbl(); - public abstract int x(); + + public abstract double dbl(); } //////////////////// @@ -74,9 +74,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoEnum { - public abstract Color c(); - public abstract int x(); + + public abstract Color c(); } //////////////////// @@ -88,9 +88,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoFloat { - public abstract float flt(); - public abstract int x(); + + public abstract float flt(); } //////////////////// @@ -102,9 +102,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoInt { - public abstract int i(); - public abstract int x(); + + public abstract int i(); } //////////////////// @@ -116,9 +116,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoIntArray { - public abstract int[] b(); - public abstract int x(); + + public abstract int[] b(); } //////////////////// @@ -130,9 +130,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoLong { - public abstract long l(); - public abstract int x(); + + public abstract long l(); } //////////////////// @@ -144,9 +144,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoLongArray { - public abstract long[] b(); - public abstract int x(); + + public abstract long[] b(); } //////////////////// @@ -158,9 +158,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoString { - public abstract java.lang.String s(); - public abstract int x(); + + public abstract java.lang.String s(); } //////////////////// @@ -186,8 +186,11 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String value = ""; - public Test() { - super(); + @lib.Anno(value = "3", construct = {"C"}) + @lib.Anno(value = "2", construct = {"A", "B"}) + @lib.Anno(value = "1") + @java.lang.Deprecated() + public static void getValue$annotations() { } @org.jetbrains.annotations.NotNull() @@ -195,11 +198,8 @@ public final class Test { return null; } - @lib.Anno(value = "3", construct = {"C"}) - @lib.Anno(value = "2", construct = {"A", "B"}) - @lib.Anno(value = "1") - @java.lang.Deprecated() - public static void getValue$annotations() { + public Test() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt index e529d512125..b032273355c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt @@ -20,11 +20,6 @@ public final class Product2 implements secondary.Named { @org.jetbrains.annotations.Nullable() private java.lang.String name; - public Product2(@org.jetbrains.annotations.NotNull() - java.lang.String otherName) { - super(); - } - @org.jetbrains.annotations.Nullable() @java.lang.Override() public java.lang.String getName() { @@ -34,4 +29,9 @@ public final class Product2 implements secondary.Named { public void setName(@org.jetbrains.annotations.Nullable() java.lang.String p0) { } + + public Product2(@org.jetbrains.annotations.NotNull() + java.lang.String otherName) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt index 9bd625193c6..eac1a965387 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt @@ -4,9 +4,9 @@ import java.lang.System; @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno { - public abstract java.lang.String name(); - public abstract StrangeEnum size(); + + public abstract java.lang.String name(); } //////////////////// @@ -20,13 +20,13 @@ public enum StrangeEnum { @org.jetbrains.annotations.NotNull() private final java.lang.String size = null; - StrangeEnum(java.lang.String size) { - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getSize() { return null; } + + StrangeEnum(java.lang.String size) { + } } //////////////////// @@ -38,10 +38,6 @@ import java.lang.System; public final class Test { public java.lang.String simpleName; - public Test() { - super(); - } - @org.jetbrains.annotations.NotNull() public final java.lang.String getSimpleName() { return null; @@ -60,4 +56,8 @@ public final class Test { java.lang.String a, @org.jetbrains.annotations.NotNull() java.lang.String p1_949560896) { } + + public Test() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt index cebb5bd4334..030ac7a8089 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.txt @@ -2,13 +2,13 @@ import java.lang.System; public abstract class BaseClass { + @org.jetbrains.annotations.NotNull() + public abstract Result doJob(); + public BaseClass(@org.jetbrains.annotations.NotNull() Context context, int num, boolean bool) { super(); } - - @org.jetbrains.annotations.NotNull() - public abstract Result doJob(); } //////////////////// @@ -26,16 +26,16 @@ import java.lang.System; public final class Inheritor extends BaseClass { - public Inheritor(@org.jetbrains.annotations.NotNull() - Context context) { - super(null, 0, false); - } - @org.jetbrains.annotations.NotNull() @java.lang.Override() public Result doJob() { return null; } + + public Inheritor(@org.jetbrains.annotations.NotNull() + Context context) { + super(null, 0, false); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt index 7a89cb4c587..6eab8beba61 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.txt @@ -3,13 +3,13 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { - public Foo() { - super(); - } - @org.jetbrains.annotations.Nullable() public final java.lang.Object a(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation p0) { return null; } + + public Foo() { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt index 55c3a2b3e6c..b1ab9c7f33d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt @@ -21,28 +21,17 @@ public final class TopLevelKt { public TopLevelKt() { super(); } - public static final int topLevelConstProperty = 2; private static final int topLevelProperty = 2; + public static final int topLevelConstProperty = 2; - public static final void extensionFunction(@org.jetbrains.annotations.NotNull() - @Anno(value = "rec") - java.lang.String $this$extensionFunction, @org.jetbrains.annotations.NotNull() - @Anno(value = "1") - java.lang.String a, @org.jetbrains.annotations.NotNull() - @Anno(value = "2") - java.lang.String b) { - } - - @org.jetbrains.annotations.NotNull() - public static final java.lang.String getExtensionProperty(@org.jetbrains.annotations.NotNull() - @Anno(value = "propRec") - T $this$extensionProperty) { + @org.jetbrains.annotations.Nullable() + public static final java.lang.String topLevelFunction() { return null; } - @Anno(value = "extpr") - @java.lang.Deprecated() - public static void getExtensionProperty$annotations(java.lang.Object p0) { + @org.jetbrains.annotations.Nullable() + public static final >T topLevelGenericFunction() { + return null; } public static final int getTopLevelProperty() { @@ -54,20 +43,31 @@ public final class TopLevelKt { return null; } + public static final void extensionFunction(@org.jetbrains.annotations.NotNull() + @Anno(value = "rec") + java.lang.String $this$extensionFunction, @org.jetbrains.annotations.NotNull() + @Anno(value = "1") + java.lang.String a, @org.jetbrains.annotations.NotNull() + @Anno(value = "2") + java.lang.String b) { + } + + @Anno(value = "extpr") + @java.lang.Deprecated() + public static void getExtensionProperty$annotations(java.lang.Object p0) { + } + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getExtensionProperty(@org.jetbrains.annotations.NotNull() + @Anno(value = "propRec") + T $this$extensionProperty) { + return null; + } + public static final void setExtensionProperty(@org.jetbrains.annotations.NotNull() @Anno(value = "propRec") T $this$extensionProperty, @org.jetbrains.annotations.NotNull() @Anno(value = "setparam") java.lang.String setParamName) { } - - @org.jetbrains.annotations.Nullable() - public static final java.lang.String topLevelFunction() { - return null; - } - - @org.jetbrains.annotations.Nullable() - public static final >T topLevelGenericFunction() { - return null; - } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt index 2643916a4ab..b929d8e55a1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt @@ -2,13 +2,14 @@ import java.lang.System; @kotlin.Metadata() public final class Boo { - @org.jetbrains.annotations.NotNull() - public static final Boo INSTANCE = null; @org.jetbrains.annotations.NotNull() private static final java.lang.String z = null; + @org.jetbrains.annotations.NotNull() + public static final Boo INSTANCE = null; - private Boo() { - super(); + @org.jetbrains.annotations.NotNull() + public final java.lang.String getZ() { + return null; } @org.jetbrains.annotations.NotNull() @@ -16,9 +17,8 @@ public final class Boo { return null; } - @org.jetbrains.annotations.NotNull() - public final java.lang.String getZ() { - return null; + private Boo() { + super(); } } @@ -30,16 +30,14 @@ import java.lang.System; @kotlin.Metadata() public final class Foo { @org.jetbrains.annotations.NotNull() - public static final Foo INSTANCE = null; + public static final java.lang.String aString = "foo"; public static final int aInt = 3; @org.jetbrains.annotations.NotNull() - public static final java.lang.String aString = "foo"; + private static final java.lang.String bString = "bar"; private static final int bInt = 5; @org.jetbrains.annotations.NotNull() - private static final java.lang.String bString = "bar"; - private static int cInt = 7; - @org.jetbrains.annotations.NotNull() private static java.lang.String cString = "baz"; + private static int cInt = 7; @org.jetbrains.annotations.NotNull() private static final java.lang.String d = null; private static final int e = 0; @@ -52,9 +50,12 @@ public final class Foo { private static final java.lang.String j = null; @org.jetbrains.annotations.NotNull() private static final java.lang.String k = null; + @org.jetbrains.annotations.NotNull() + public static final Foo INSTANCE = null; - private Foo() { - super(); + @org.jetbrains.annotations.NotNull() + public final java.lang.String getBString() { + return null; } public final int getBInt() { @@ -62,17 +63,19 @@ public final class Foo { } @org.jetbrains.annotations.NotNull() - public final java.lang.String getBString() { + public final java.lang.String getCString() { return null; } + public final void setCString(@org.jetbrains.annotations.NotNull() + java.lang.String p0) { + } + public final int getCInt() { return 0; } - @org.jetbrains.annotations.NotNull() - public final java.lang.String getCString() { - return null; + public final void setCInt(int p0) { } @org.jetbrains.annotations.NotNull() @@ -111,11 +114,8 @@ public final class Foo { return null; } - public final void setCInt(int p0) { - } - - public final void setCString(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + private Foo() { + super(); } } @@ -126,18 +126,6 @@ import java.lang.System; @kotlin.Metadata() public final class HavingState { - @org.jetbrains.annotations.NotNull() - private final kotlin.reflect.KClass anonymous = null; - @org.jetbrains.annotations.NotNull() - private final kotlin.reflect.KClass clazz = null; - @org.jetbrains.annotations.NotNull() - private final float[] floatArray = {-1.0F}; - @org.jetbrains.annotations.NotNull() - private final java.lang.Integer[] intArray = {1}; - @org.jetbrains.annotations.NotNull() - private final java.util.List intList = null; - @org.jetbrains.annotations.NotNull() - private final java.lang.Class javaClass = null; @org.jetbrains.annotations.NotNull() private final State state = State.START; @org.jetbrains.annotations.NotNull() @@ -146,45 +134,23 @@ public final class HavingState { private final java.lang.String[] stringArray = {"foo"}; @org.jetbrains.annotations.NotNull() private final java.util.List stringList = null; + @org.jetbrains.annotations.NotNull() + private final java.lang.Integer[] intArray = {1}; + @org.jetbrains.annotations.NotNull() + private final float[] floatArray = {-1.0F}; + @org.jetbrains.annotations.NotNull() + private final java.util.List intList = null; private final int uint = 1; @org.jetbrains.annotations.NotNull() private final kotlin.UInt[] uintArray = {1}; @org.jetbrains.annotations.NotNull() private final java.util.List uintList = null; - - public HavingState() { - super(); - } - @org.jetbrains.annotations.NotNull() - public final kotlin.reflect.KClass getAnonymous() { - return null; - } - + private final kotlin.reflect.KClass clazz = null; @org.jetbrains.annotations.NotNull() - public final kotlin.reflect.KClass getClazz() { - return null; - } - + private final java.lang.Class javaClass = null; @org.jetbrains.annotations.NotNull() - public final float[] getFloatArray() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Integer[] getIntArray() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.util.List getIntList() { - return null; - } - - @org.jetbrains.annotations.NotNull() - public final java.lang.Class getJavaClass() { - return null; - } + private final kotlin.reflect.KClass anonymous = null; @org.jetbrains.annotations.NotNull() public final State getState() { @@ -206,6 +172,21 @@ public final class HavingState { return null; } + @org.jetbrains.annotations.NotNull() + public final java.lang.Integer[] getIntArray() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final float[] getFloatArray() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.util.List getIntList() { + return null; + } + @org.jetbrains.annotations.NotNull() public final kotlin.UInt[] getUintArray() { return null; @@ -215,6 +196,25 @@ public final class HavingState { public final java.util.List getUintList() { return null; } + + @org.jetbrains.annotations.NotNull() + public final kotlin.reflect.KClass getClazz() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Class getJavaClass() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final kotlin.reflect.KClass getAnonymous() { + return null; + } + + public HavingState() { + super(); + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt index 25db5a27ae6..17ea210a959 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.txt @@ -26,8 +26,9 @@ public final class User { @org.jetbrains.annotations.NotNull() private final java.lang.String name = "John"; - public User() { - super(); + @org.jetbrains.annotations.NotNull() + public final java.lang.String getName() { + return null; } public User(@org.jetbrains.annotations.NotNull() @@ -35,8 +36,7 @@ public final class User { super(); } - @org.jetbrains.annotations.NotNull() - public final java.lang.String getName() { - return null; + public User() { + super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt index ba17fd805b6..f4f708a7577 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt @@ -25,14 +25,14 @@ public final class Simple { @org.jetbrains.annotations.NotNull() public static final test.Simple.Companion Companion = null; - public Simple() { - super(); - } - @MyAnnotation() public final void myMethod() { } + public Simple() { + super(); + } + @kotlin.Metadata() public static final class NestedClass { diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt index 4ad07e8b2c4..9fb0cd3bbc5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt @@ -28,15 +28,6 @@ public final class State { @org.jetbrains.annotations.NotNull() private final java.lang.String someString = null; - public State(int someInt, long someLong) { - super(); - } - - public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() - java.lang.String someString) { - super(); - } - public final int getSomeInt() { return 0; } @@ -49,4 +40,13 @@ public final class State { public final java.lang.String getSomeString() { return null; } + + public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() + java.lang.String someString) { + super(); + } + + public State(int someInt, long someLong) { + super(); + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt index 43c3e12f4ba..ce4fd90be1b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt +++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt @@ -16,16 +16,16 @@ import java.lang.System; @kotlin.Metadata() public final class Simple { - public Simple() { - super(); + @MyAnnotation() + public final void myMethod() { } public final int heavyMethod() { return 0; } - @MyAnnotation() - public final void myMethod() { + public Simple() { + super(); } }