From 9688c3e76178a958e4031efcbb32e1630e5bc3c4 Mon Sep 17 00:00:00 2001 From: strangepleasures Date: Fri, 9 Feb 2024 15:41:37 +0000 Subject: [PATCH] [KAPT] Improve stub formatting; check raw stubs in tests Merge-request: KT-MR-14244 Merged-by: Pavel Mikhailovskii --- .../org/jetbrains/kotlin/gradle/Kapt3IT.kt | 8 +- .../testData/converter/abstractEnum.fir.txt | 28 ++-- .../converter/abstractMethods.fir.txt | 60 +++++++ .../testData/converter/aliasedImports.fir.txt | 23 ++- .../annotationInAnnotationParameters.fir.txt | 2 + .../converter/annotationWithFqNames.fir.txt | 19 +-- .../annotationWithVaragArguments.fir.txt | 14 +- .../testData/converter/annotations.fir.txt | 30 ++-- .../testData/converter/annotations2.fir.txt | 30 ++-- .../testData/converter/annotations3.fir.txt | 13 +- .../annotationsWithConstants.fir.txt | 122 +++------------ .../converter/annotationsWithTargets.fir.txt | 17 +- .../converter/anonymousDelegate.fir.txt | 24 ++- ...nymousObjectInEnumSuperConstructor.fir.txt | 57 +++++++ .../testData/converter/comments.fir.txt | 49 +++--- .../converter/commentsRemoved.fir.txt | 148 ++++++++++++++++-- .../converter/cyrillicClassName.fir.txt | 36 +++++ .../testData/converter/dataClass.fir.txt | 13 +- .../testData/converter/defaultImpls.fir.txt | 6 +- .../testData/converter/defaultPackage.fir.txt | 18 +-- .../defaultPackageCorrectErrorTypes.fir.txt | 18 +-- .../defaultParameterValueOff.fir.txt | 35 +++-- .../converter/defaultParameterValueOn.fir.txt | 37 +++-- .../delegateCorrectErrorTypes.fir.txt | 59 +++++++ .../converter/delegatedProperties.fir.txt | 10 +- .../delegationToAnonymousObject.fir.txt | 29 ++++ .../testData/converter/deprecated.fir.txt | 15 +- .../enumConstructorCallWithErrorType.fir.txt | 58 +++++++ .../testData/converter/enumImports.fir.txt | 7 +- .../converter/enumInCompanion.fir.txt | 24 ++- .../enumSecondaryConstructor.fir.txt | 19 +++ .../testData/converter/enums.fir.txt | 30 ++-- .../converter/errorExtensionReceiver.fir.txt | 90 +++++++++++ .../converter/errorLocationMapping.fir.txt | 52 +++--- .../converter/errorSuperclass.fir.txt | 1 + .../errorSuperclassCorrectErrorTypes.fir.txt | 31 +++- .../converter/fileFacadeJvmName.fir.txt | 23 +++ .../converter/genericParameters.fir.txt | 5 +- .../testData/converter/genericSimple.fir.txt | 111 +++++++++++++ .../testData/converter/ignoredMembers.fir.txt | 19 +++ .../converter/implicitReturnTypes.fir.txt | 28 +--- .../converter/importsForErrorTypes.fir.txt | 4 - .../testData/converter/importsKt22083.fir.txt | 24 +-- .../converter/incorrectDelegate.fir.txt | 12 +- .../converter/inheritanceSimple.fir.txt | 17 +- .../testData/converter/inlineClasses.fir.txt | 4 - .../innerClassesWithTypeParameters.fir.txt | 4 +- .../converter/interfaceImplementation.fir.txt | 8 +- .../converter/invalidFieldName.fir.txt | 5 +- .../javaKeywordsInPackageNames.fir.txt | 40 +++++ .../testData/converter/javadoc.fir.txt | 22 +-- .../testData/converter/jvmOverloads.fir.txt | 138 ++++++++++++++++ .../converter/jvmRepeatableAnnotation.fir.txt | 2 +- .../testData/converter/jvmStatic.fir.txt | 13 +- .../converter/jvmStaticFieldInParent.fir.txt | 1 + .../testData/converter/kt14996.fir.txt | 10 +- .../testData/converter/kt14997.fir.txt | 18 +-- .../testData/converter/kt14998.fir.txt | 15 +- .../testData/converter/kt15145.fir.txt | 33 ++++ .../testData/converter/kt17567.fir.txt | 36 +++++ .../testData/converter/kt18377.fir.txt | 17 ++ .../testData/converter/kt18682.fir.txt | 6 +- .../testData/converter/kt19700.fir.txt | 20 +++ .../testData/converter/kt19750.fir.txt | 20 +++ .../testData/converter/kt24272.fir.txt | 82 ++++++++++ .../testData/converter/kt25071.fir.txt | 83 ++++++++++ .../testData/converter/kt27126.fir.txt | 54 ++----- .../testData/converter/kt28306.fir.txt | 1 + .../testData/converter/kt32596.fir.txt | 8 +- .../testData/converter/kt43786.fir.txt | 4 +- .../testData/converter/kt61729.fir.txt | 21 +-- .../testData/converter/kt65453.fir.txt | 9 +- .../testData/converter/lazyProperty.fir.txt | 7 +- .../testData/converter/mapEntry.fir.txt | 22 +++ .../testData/converter/maxErrorCount.fir.txt | 4 +- .../converter/methodParameterNames.fir.txt | 8 +- .../testData/converter/modifiers.fir.txt | 23 +-- .../testData/converter/multifileClass.fir.txt | 34 ++++ .../multifileClassDefaultPackage.fir.txt | 61 ++++++++ .../converter/multipleTypeConstraints.fir.txt | 68 ++++++++ .../testData/converter/nestedClasses.fir.txt | 25 ++- .../converter/nonExistentClass.fir.txt | 11 +- .../nonExistentClassWIthoutCorrection.fir.txt | 37 ++--- .../testData/converter/primitiveTypes.fir.txt | 37 ++++- .../testData/converter/properties.fir.txt | 21 ++- .../converter/propertyAnnotations.fir.txt | 4 +- .../converter/recentlyNullable.fir.txt | 24 +-- .../converter/repeatableAnnotations.fir.txt | 63 ++------ .../converter/secondaryConstructor.fir.txt | 7 +- .../converter/severalPackageParts.fir.txt | 38 +++++ .../testData/converter/starImports.fir.txt | 16 +- .../converter/strangeIdentifiers.fir.txt | 20 +-- .../testData/converter/stripMetadata.fir.txt | 17 +- .../converter/superConstructorCall.fir.txt | 52 ++++++ .../testData/converter/suspendArgName.fir.txt | 48 ++++++ .../converter/suspendErrorTypes.fir.txt | 3 +- .../suspendFunctionWithBigArity.fir.txt | 30 ++++ .../testData/converter/topLevel.fir.txt | 24 +-- .../converter/typeAnnotations.fir.txt | 10 +- .../unresolvedDelegateExpression.fir.txt | 13 +- .../unsafePropertyInitializers.fir.txt | 43 ++++- .../jetbrains/kotlin/kapt4/StubGenerator.kt | 40 +++-- .../jetbrains/kotlin/kapt4/Kapt4Handler.kt | 14 +- 103 files changed, 2128 insertions(+), 845 deletions(-) create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/anonymousObjectInEnumSuperConstructor.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/delegationToAnonymousObject.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/enumConstructorCallWithErrorType.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/enumSecondaryConstructor.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt15145.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt17567.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt18377.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt19700.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt19750.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt24272.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/kt25071.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/multipleTypeConstraints.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/superConstructorCall.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.fir.txt create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/suspendFunctionWithBigArity.fir.txt 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 3575933121e..5be4d2635dc 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 @@ -20,6 +20,7 @@ import org.gradle.api.JavaVersion import org.gradle.api.logging.LogLevel import org.gradle.testkit.runner.BuildResult import org.gradle.util.GradleVersion +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.USING_JVM_INCREMENTAL_COMPILATION_MESSAGE import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.project as testBaseProject @@ -717,7 +718,12 @@ open class Kapt3IT : Kapt3BaseIT() { buildAndFail("build") { val actual = getErrorMessages() - assertEquals(expected = genJavaErrorString(7, 19), actual = actual) + assertEquals( + expected = genJavaErrorString( + 7, + if (buildOptions.languageVersion?.startsWith("2") ?: (KotlinVersion.DEFAULT >= KotlinVersion.KOTLIN_2_0)) 18 else 19 + ), + actual = actual) } buildGradle.modify { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.fir.txt index d127705408e..1d2266ec480 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.fir.txt @@ -25,8 +25,9 @@ */ @kotlin.Metadata() public enum E { - /*public static final*/ X /* = new E() */, - /*public static final*/ Y /* = new E() */; + X, + Y; + E() { } @@ -59,7 +60,6 @@ public enum E { super(); } } - /** * public final class E.NestedClass : kotlin/Any { * @@ -78,8 +78,8 @@ public enum E { } } -//////////////////// +//////////////////// /** * public final enum class E2 : kotlin/Enum { @@ -104,8 +104,9 @@ public enum E { */ @kotlin.Metadata() public enum E2 { - /*public static final*/ X /* = new E2() */, - /*public static final*/ Y /* = new E2() */; + X, + Y; + E2(int n) { } @@ -121,8 +122,8 @@ public enum E2 { } } -//////////////////// +//////////////////// /** * public final enum class E3 : kotlin/Enum { @@ -146,8 +147,9 @@ public enum E2 { */ @kotlin.Metadata() public enum E3 { - /*public static final*/ X /* = new E3() */, - /*public static final*/ Y /* = new E3() */; + X, + Y; + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; @@ -165,8 +167,8 @@ public enum E3 { } } -//////////////////// +//////////////////// /** * public final enum class E4 : kotlin/Enum { @@ -203,11 +205,15 @@ public enum E3 { */ @kotlin.Metadata() public enum E4 { - /*public static final*/ X /* = new E4() */; + X; + @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; + private final int b = 0; + private final long c = 0L; + private final boolean d = false; E4(java.lang.String a, int b, long c, boolean d) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.fir.txt new file mode 100644 index 00000000000..c9084dc31dc --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.fir.txt @@ -0,0 +1,60 @@ +/** + * public abstract class Base : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // signature: doJob(Ljava/lang/String;I)V + * protected abstract fun doJob(job: kotlin/String, delay: kotlin/Int): kotlin/Unit + * + * // signature: doJobGeneric(Ljava/lang/CharSequence;I)V + * protected abstract fun doJobGeneric(job: T#0, delay: kotlin/Int): kotlin/Unit + * + * // module name: main + * } + */ +@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 final class Impl : Base { + * + * // signature: ()V + * public constructor() + * + * // signature: doJob(Ljava/lang/String;I)V + * protected open fun doJob(job: kotlin/String, delay: kotlin/Int): kotlin/Unit + * + * // signature: doJobGeneric(Ljava/lang/CharSequence;I)V + * protected open fun doJobGeneric(job: T#0, delay: kotlin/Int): kotlin/Unit + * + * // module name: main + * } + */ +@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) { + } + + @java.lang.Override() + protected void doJobGeneric(@org.jetbrains.annotations.NotNull() T job, int delay) { + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.fir.txt index 0270752c804..7478de130f6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.fir.txt @@ -42,8 +42,11 @@ import a.b.ABC; @kotlin.Metadata() public final class Test { public Test.MyDate date; + public java.util.concurrent.TimeUnit timeUnit; + public a.b.ABC abc; + public bcd bcd; public Test() { @@ -55,8 +58,7 @@ public final class Test { return null; } - public final void setDate(@org.jetbrains.annotations.NotNull() - Test.MyDate p0) { + public final void setDate(@org.jetbrains.annotations.NotNull() Test.MyDate p0) { } @org.jetbrains.annotations.NotNull() @@ -64,8 +66,7 @@ public final class Test { return null; } - public final void setTimeUnit(@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() @@ -73,8 +74,7 @@ public final class Test { return null; } - public final void setAbc(@org.jetbrains.annotations.NotNull() - a.b.ABC p0) { + public final void setAbc(@org.jetbrains.annotations.NotNull() a.b.ABC p0) { } @org.jetbrains.annotations.NotNull() @@ -82,8 +82,7 @@ public final class Test { return null; } - public final void setBcd(@org.jetbrains.annotations.NotNull() - bcd p0) { + public final void setBcd(@org.jetbrains.annotations.NotNull() bcd p0) { } /** @@ -115,14 +114,13 @@ public final class Test { return null; } - public final void setDate2(@org.jetbrains.annotations.NotNull() - Test.MyDate p0) { + public final void setDate2(@org.jetbrains.annotations.NotNull() Test.MyDate p0) { } } } -//////////////////// +//////////////////// /** * public final class Test2 : kotlin/Any { @@ -153,7 +151,6 @@ public final class Test2 { return null; } - public final void setDate(@org.jetbrains.annotations.NotNull() - java.util.Date p0) { + public final void setDate(@org.jetbrains.annotations.NotNull() java.util.Date p0) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.fir.txt index a0fc58c57bf..e9eb0c4bf37 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.fir.txt @@ -14,6 +14,7 @@ package a; public abstract @interface A { } + //////////////////// package b; @@ -38,6 +39,7 @@ public abstract @interface B { public abstract a.A value(); } + //////////////////// package b; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.fir.txt index 32924c11cc6..5640334d280 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.fir.txt @@ -1,19 +1,3 @@ -package lib; - -public @interface Anno { - - Class[] impls() default {}; -} - -//////////////////// - -package lib.impl; - -public class Impl { -} - -//////////////////// - package test; /** @@ -34,6 +18,7 @@ public final class Bar { } } + //////////////////// package test; @@ -56,6 +41,7 @@ public final class Boo { } } + //////////////////// package test; @@ -78,6 +64,7 @@ public final class Foo { } } + //////////////////// package test; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.fir.txt index a9b1faae3c4..29c8d7a2d9d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.fir.txt @@ -18,8 +18,8 @@ public abstract @interface A { public abstract int[] x(); } -//////////////////// +//////////////////// /** * package { @@ -39,10 +39,6 @@ public abstract @interface A { @kotlin.Metadata() public final class AnnotationWithVaragArgumentsKt { - public AnnotationWithVaragArgumentsKt() { - super(); - } - @A(x = {1}) @B(x = "x", y = {1}, z = "z") @C(a = @A(x = {1}), b = @B(x = "x", y = {1}, z = "z")) @@ -64,8 +60,8 @@ public final class AnnotationWithVaragArgumentsKt { } } -//////////////////// +//////////////////// /** * public final annotation class B : kotlin/Annotation { @@ -99,8 +95,8 @@ public abstract @interface B { public abstract java.lang.String z(); } -//////////////////// +//////////////////// /** * public final annotation class C : kotlin/Annotation { @@ -128,8 +124,8 @@ public abstract @interface C { public abstract B b(); } -//////////////////// +//////////////////// /** * public final annotation class D : kotlin/Annotation { @@ -151,8 +147,8 @@ public abstract @interface D { public abstract java.lang.String[] x() default {"a", "b"}; } -//////////////////// +//////////////////// /** * public final annotation class E : kotlin/Annotation { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.fir.txt index 7a4def530b5..d8824f08898 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.fir.txt @@ -12,8 +12,8 @@ public abstract @interface Anno1 { } -//////////////////// +//////////////////// /** * public final annotation class Anno2 : kotlin/Annotation { @@ -83,8 +83,8 @@ public abstract @interface Anno2 { public abstract java.lang.Class[] classes(); } -//////////////////// +//////////////////// /** * public final annotation class Anno3 : kotlin/Annotation { @@ -106,8 +106,8 @@ public abstract @interface Anno3 { public abstract java.lang.String value(); } -//////////////////// +//////////////////// /** * public final enum class Colors : kotlin/Enum { @@ -126,8 +126,9 @@ public abstract @interface Anno3 { */ @kotlin.Metadata() public enum Colors { - /*public static final*/ WHITE /* = new Colors() */, - /*public static final*/ BLACK /* = new Colors() */; + WHITE, + BLACK; + Colors() { } @@ -138,8 +139,8 @@ public enum Colors { } } -//////////////////// +//////////////////// /** * public final enum class Enum1 : kotlin/Enum { @@ -158,9 +159,10 @@ public enum Colors { */ @kotlin.Metadata() public enum Enum1 { - /*public static final*/ BLACK /* = new Enum1() */, + BLACK, @Anno1() - /*public static final*/ WHITE /* = new Enum1() */; + WHITE; + Enum1() { } @@ -171,8 +173,8 @@ public enum Enum1 { } } -//////////////////// +//////////////////// /** * public final class TestAnno : kotlin/Any { @@ -194,8 +196,8 @@ public final class TestAnno { } } -//////////////////// +//////////////////// /** * public final class TestAnno2 : kotlin/Any { @@ -230,9 +232,7 @@ public final class TestAnno2 { } @Anno1() - public final void a(@Anno3(value = "param-pam-pam") - @org.jetbrains.annotations.NotNull() - java.lang.String param) { + public final void a(@Anno3(value = "param-pam-pam") @org.jetbrains.annotations.NotNull() java.lang.String param) { } @Anno3(value = "getter") @@ -247,8 +247,6 @@ public final class TestAnno2 { } @Anno3(value = "setter") - public final void setB(@Anno3(value = "setparam") - @org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setB(@Anno3(value = "setparam") @org.jetbrains.annotations.NotNull() java.lang.String p0) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.fir.txt index 43c7f3d59f1..f0aec3af42e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.fir.txt @@ -21,6 +21,7 @@ public abstract @interface Anno { public abstract java.lang.String value(); } + //////////////////// package test; @@ -43,13 +44,8 @@ package test; @kotlin.jvm.JvmName(name = "AnnotationsTest") public final class AnnotationsTest { - public AnnotationsTest() { - super(); - } - @org.jetbrains.annotations.NotNull() - public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver") - int $this$topLevelVal) { + public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver") int $this$topLevelVal) { return null; } @@ -59,12 +55,11 @@ public final class AnnotationsTest { } @Anno(value = "top-level-fun") - public static final void topLevelFun(@Anno(value = "top-level-fun-receiver") - @org.jetbrains.annotations.NotNull() - java.lang.String $this$topLevelFun) { + public static final void topLevelFun(@Anno(value = "top-level-fun-receiver") @org.jetbrains.annotations.NotNull() java.lang.String $this$topLevelFun) { } } + //////////////////// package test; @@ -93,14 +88,14 @@ package test; @Anno(value = "enum") public enum Enum { @Anno(value = "white") - /*public static final*/ WHITE /* = new Enum() */, + WHITE, @Anno(value = "black") - /*public static final*/ BLACK /* = new Enum() */; + BLACK; + private final int x = 0; @Anno(value = "enum-constructor") - Enum(@Anno(value = "x") - int x) { + Enum(@Anno(value = "x") int x) { } public final int getX() { @@ -113,6 +108,7 @@ public enum Enum { } } + //////////////////// package test; @@ -149,9 +145,7 @@ public abstract class Test { private java.lang.String v; @Anno(value = "test-constructor") - protected Test(@Anno(value = "v-param") - @org.jetbrains.annotations.NotNull() - java.lang.String v) { + protected Test(@Anno(value = "v-param") @org.jetbrains.annotations.NotNull() java.lang.String v) { super(); } @@ -167,9 +161,7 @@ public abstract class Test { } @Anno(value = "v-set") - public final void setV(@Anno(value = "v-setparam") - @org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setV(@Anno(value = "v-setparam") @org.jetbrains.annotations.NotNull() java.lang.String p0) { } @Anno(value = "abstract-method") diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.fir.txt index 78de8575b82..3ce3aa24978 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.fir.txt @@ -15,8 +15,8 @@ public final class B { } } -//////////////////// +//////////////////// /** * public final object BParceler : Parceler { @@ -37,8 +37,8 @@ public final class BParceler implements Parceler { } } -//////////////////// +//////////////////// /** * public final class C : kotlin/Any { @@ -57,8 +57,8 @@ public final class C { } } -//////////////////// +//////////////////// /** * public final object CParceler : Parceler { @@ -79,8 +79,8 @@ public final class CParceler implements Parceler { } } -//////////////////// +//////////////////// /** * public abstract interface Parceler : kotlin/Any { @@ -92,8 +92,8 @@ public final class CParceler implements Parceler { public abstract interface Parceler { } -//////////////////// +//////////////////// /** * public final class Test : kotlin/Any { @@ -114,8 +114,8 @@ public final class Test { } } -//////////////////// +//////////////////// /** * public final annotation class TypeParceler> : kotlin/Annotation { @@ -134,7 +134,6 @@ public final class Test { @java.lang.annotation.Repeatable(value = TypeParceler.Container.class) @java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE}) public abstract @interface TypeParceler> { - /** * public final annotation class TypeParceler> : kotlin/Annotation { * diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.fir.txt index 0baed2cc0e3..ab67bd1e4a8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.fir.txt @@ -68,33 +68,6 @@ public abstract @interface Anno { public abstract java.lang.String a9(); } -//////////////////// - -package app; - -public class B { - - public B() { - super(); - } - - public static class id { - - public id() { - super(); - } - public static final int textView = 200; - } - public static final boolean a1 = false; - public static final byte a2 = 1; - public static final int a3 = 2; - public static final short a4 = 3; - public static final long a5 = 4L; - public static final char a6 = '5'; - public static final float a7 = 6.0F; - public static final double a8 = 7.0; - public static final String a9 = "A"; -} //////////////////// @@ -120,6 +93,7 @@ public abstract @interface Bind { public abstract int id(); } + //////////////////// package app; @@ -146,6 +120,7 @@ public abstract @interface BindField { public abstract int id(); } + //////////////////// package app; @@ -171,6 +146,7 @@ package app; 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; @@ -189,6 +165,7 @@ public final class JJ { } } + //////////////////// package app; @@ -213,6 +190,7 @@ public abstract @interface MultiValue { public abstract int[] ids(); } + //////////////////// package app; @@ -237,6 +215,7 @@ public abstract @interface MultiValueByte { public abstract byte[] ids(); } + //////////////////// package app; @@ -261,6 +240,7 @@ public abstract @interface MultiValueString { public abstract java.lang.String[] ids(); } + //////////////////// package app; @@ -386,23 +366,34 @@ package app; public final class MyActivity { @BindField(id = 100) private final int a = 0; + @BindField(id = 100) private final int b = 0; + @BindField(id = 100) private final int c = 0; + @BindField(id = 100) private final int d = 0; + @BindField(id = 100) private final int e = 0; + @BindField(id = 200) private final int f = 0; + public final int propA = 200; + private final int propB = 200; + private int propC = 200; + @kotlin.jvm.JvmField() public final int propD = 200; + @kotlin.jvm.JvmField() public int propE = 200; + private final int propF = 0; public MyActivity() { @@ -450,7 +441,7 @@ public final class MyActivity { } @Bind(id = 100) - @Anno(a1 = false, a2 = 1, a3 = 2, a4 = 3, a5 = 4L, a6 = '5', a7 = 6.0F, a8 = 7.0, a9 = "A") + @Anno(a1 = false, a2 = 1, a3 = 2, a4 = 3, a5 = 4L, a6 = '5', a7 = 6.0f, a8 = 7.0, a9 = "A") @java.lang.Deprecated() public static void getE$annotations() { } @@ -481,7 +472,7 @@ public final class MyActivity { } @Bind(id = 100) - @Anno(a1 = false, a2 = 1, a3 = 2, a4 = 3, a5 = 4L, a6 = '5', a7 = 6.0F, a8 = 7.0, a9 = "A") + @Anno(a1 = false, a2 = 1, a3 = 2, a4 = 3, a5 = 4L, a6 = '5', a7 = 6.0f, a8 = 7.0, a9 = "A") public final void foo5() { } @@ -536,76 +527,3 @@ public final class MyActivity { return 0; } } - -//////////////////// - -package app; - -public class R { - - public R() { - super(); - } - - public static class layout { - - public layout() { - super(); - } - public static final int mainActivity = 100; - } -} - -//////////////////// - -package app; - -public class R2 { - - public R2() { - super(); - } - - public static class layout { - - public layout() { - super(); - } - public static final int mainActivity = 100; - } -} - -//////////////////// - -package lib; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(value = ElementType.METHOD) -@Retention(value = RetentionPolicy.RUNTIME) -public @interface OnClick { - - int[] value() default {}; -} - -//////////////////// - -package lib; - -public class R { - - public R() { - super(); - } - - public static class id { - - public id() { - super(); - } - public static final int textView = 100; - } -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.fir.txt index f756891b60e..68ecce7b304 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.fir.txt @@ -12,8 +12,8 @@ public abstract @interface Anno { } -//////////////////// +//////////////////// /** * public final class Bar : kotlin/Any { @@ -52,8 +52,8 @@ public final class Bar { } } -//////////////////// +//////////////////// /** * public final class Baz : kotlin/Any { @@ -86,8 +86,8 @@ public final class Baz { } } -//////////////////// +//////////////////// /** * public final annotation class FieldAnno : kotlin/Annotation { @@ -105,8 +105,8 @@ public final class Baz { public abstract @interface FieldAnno { } -//////////////////// +//////////////////// /** * public final class Foo : kotlin/Any { @@ -129,10 +129,7 @@ public final class Foo { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; - public Foo(@ParameterAnno() - @Anno() - @org.jetbrains.annotations.NotNull() - java.lang.String a) { + public Foo(@ParameterAnno() @Anno() @org.jetbrains.annotations.NotNull() java.lang.String a) { super(); } @@ -147,8 +144,8 @@ public final class Foo { } } -//////////////////// +//////////////////// /** * public final annotation class ParameterAnno : kotlin/Annotation { @@ -166,8 +163,8 @@ public final class Foo { public abstract @interface ParameterAnno { } -//////////////////// +//////////////////// /** * public final annotation class PropertyAnno : kotlin/Annotation { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.fir.txt index 21e068c4517..04bfd9f4ab7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.fir.txt @@ -13,10 +13,6 @@ */ @kotlin.Metadata() public final class AnonymousDelegateKt { - - public AnonymousDelegateKt() { - super(); - } @org.jetbrains.annotations.NotNull() private static final java.lang.Object delegate$delegate = null; @@ -25,13 +21,12 @@ public final class AnonymousDelegateKt { return null; } - public static final void setDelegate(@org.jetbrains.annotations.NotNull() - java.lang.Object delegate) { + public static final void setDelegate(@org.jetbrains.annotations.NotNull() java.lang.Object delegate) { } } -//////////////////// +//////////////////// /** * public final class ConcreteDelegate : kotlin/Any { @@ -52,15 +47,13 @@ public final class ConcreteDelegate { super(); } - public final int getValue(@org.jetbrains.annotations.Nullable() - java.lang.Object t, @org.jetbrains.annotations.NotNull() - kotlin.reflect.KProperty p) { + public final int getValue(@org.jetbrains.annotations.Nullable() java.lang.Object t, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty p) { return 0; } } -//////////////////// +//////////////////// /** * public final class Test : kotlin/Any { @@ -99,10 +92,13 @@ public final class ConcreteDelegate { public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.Object broken$delegate = null; + @org.jetbrains.annotations.NotNull() private final java.io.Serializable overridden$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy lazyProp$delegate = null; + @org.jetbrains.annotations.NotNull() private final ConcreteDelegate concreteDelegate$delegate = null; @@ -115,8 +111,7 @@ public final class Test { return null; } - public final void setBroken(@org.jetbrains.annotations.NotNull() - java.lang.Object broken) { + public final void setBroken(@org.jetbrains.annotations.NotNull() java.lang.Object broken) { } @org.jetbrains.annotations.NotNull() @@ -124,8 +119,7 @@ public final class Test { return null; } - public final void setOverridden(@org.jetbrains.annotations.NotNull() - java.lang.Object overridden) { + public final void setOverridden(@org.jetbrains.annotations.NotNull() java.lang.Object overridden) { } private final java.lang.Runnable getLazyProp() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/anonymousObjectInEnumSuperConstructor.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousObjectInEnumSuperConstructor.fir.txt new file mode 100644 index 00000000000..ca52ecc2ad6 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousObjectInEnumSuperConstructor.fir.txt @@ -0,0 +1,57 @@ +/** + * public abstract interface Callback : kotlin/Any { + * + * // signature: invoke()Ljava/lang/String; + * public abstract fun invoke(): kotlin/String + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface Callback { + + @org.jetbrains.annotations.NotNull() + public abstract java.lang.String invoke(); +} + + +//////////////////// + +/** + * public final enum class Foo : kotlin/Enum { + * + * // signature: (Ljava/lang/String;ILCallback;)V + * private constructor(callback: Callback) + * + * // field: callback:LCallback; + * // getter: getCallback()LCallback; + * public final val callback: Callback + * public final get + * + * FOO, + * + * // module name: main + * + * // has Enum.entries + * } + */ +@kotlin.Metadata() +public enum Foo { + FOO; + + @org.jetbrains.annotations.NotNull() + private final Callback callback = null; + + Foo(Callback callback) { + } + + @org.jetbrains.annotations.NotNull() + public final Callback getCallback() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.fir.txt index 186fb0d758c..5ba9a3efbb1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.fir.txt @@ -14,8 +14,8 @@ public abstract @interface Anno { } -//////////////////// +//////////////////// /** * public final enum class EnumError : kotlin/Enum { @@ -37,8 +37,9 @@ public abstract @interface Anno { */ @kotlin.Metadata() public enum EnumError { - /*public static final*/ One /* = new EnumError() */, - /*public static final*/ Two /* = new EnumError() */; + One, + Two; + EnumError() { } @@ -52,9 +53,12 @@ public enum EnumError { } } + //////////////////// - +/** + * Obj. + */ /** * public final object Obj : kotlin/Any { * @@ -74,9 +78,12 @@ public final class Obj { } } + //////////////////// - +/** + * Test. + */ /** * public final class Test : kotlin/Any { * @@ -113,7 +120,6 @@ public final class Obj { */ @kotlin.Metadata() public final class Test { - /** * prop. */ @@ -145,8 +151,7 @@ public final class Test { /** * method(String). */ - public final void method(@org.jetbrains.annotations.NotNull() - java.lang.String a) { + public final void method(@org.jetbrains.annotations.NotNull() java.lang.String a) { } /** @@ -176,14 +181,18 @@ public final class Test { /** * set. */ - public final void setProp3(@org.jetbrains.annotations.NotNull() - java.lang.String v) { + public final void setProp3(@org.jetbrains.annotations.NotNull() java.lang.String v) { } } + //////////////////// - +/** + * Test2 + * Multiline + * documentation. + */ /** * public final class Test2 : kotlin/Any { * @@ -203,8 +212,7 @@ 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) { + public Test2(@org.jetbrains.annotations.NotNull() java.lang.String a) { super(); } @@ -214,9 +222,12 @@ public final class Test2 { } } + //////////////////// - +/** + * constructor. + */ /** * public final class Test3 : kotlin/Any { * @@ -236,8 +247,7 @@ 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) { + protected Test3(@org.jetbrains.annotations.NotNull() java.lang.String a) { super(); } @@ -247,8 +257,8 @@ public final class Test3 { } } -//////////////////// +//////////////////// /** * public final class Test4 : kotlin/Any { @@ -273,9 +283,12 @@ public final class Test4 { } } + //////////////////// - +/** + * `/ * Failure * /` + */ /** * public abstract interface TestComponent : kotlin/Any { * diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.fir.txt index 56b0312395c..e59d02f07a3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.fir.txt @@ -1,3 +1,12 @@ +/** + * public final annotation class Anno : kotlin/Annotation { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ @kotlin.Metadata() @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) @java.lang.annotation.Target(value = {}) @@ -5,13 +14,32 @@ public abstract @interface Anno { } + //////////////////// - +/** + * public final enum class EnumError : kotlin/Enum { + * + * // signature: (Ljava/lang/String;I)V + * private constructor() + * + * // signature: doIt()Ljava/lang/String; + * public abstract fun doIt(): kotlin/String + * + * One, + * + * Two, + * + * // module name: main + * + * // has Enum.entries + * } + */ @kotlin.Metadata() public enum EnumError { - /*public static final*/ One /* = new EnumError() */, - /*public static final*/ Two /* = new EnumError() */; + One, + Two; + EnumError() { } @@ -25,9 +53,18 @@ public enum EnumError { } } + //////////////////// - +/** + * public final object Obj : kotlin/Any { + * + * // signature: ()V + * private constructor() + * + * // module name: main + * } + */ @kotlin.Metadata() public final class Obj { @org.jetbrains.annotations.NotNull() @@ -38,13 +75,48 @@ public final class Obj { } } + //////////////////// - +/** + * public final class Test : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // signature: method()V + * public final fun method(): kotlin/Unit + * + * // signature: method(I)V + * public final fun method(a: kotlin/Int): kotlin/Unit + * + * // signature: method(Ljava/lang/String;)V + * public final fun method(a: kotlin/String): kotlin/Unit + * + * // field: prop2:Ljava/lang/String; + * // getter: getProp2()Ljava/lang/String; + * // synthetic method for annotations: getProp2$annotations()V + * public final val prop2: kotlin/String (* = ... *) + * public final get + * + * // getter: getProp3()Ljava/lang/String; + * // setter: setProp3(Ljava/lang/String;)V + * public final var prop3: kotlin/String + * public final (* non-default *) get + * public final (* non-default *) set(v: kotlin/String) + * + * // field: prop:Ljava/lang/String; + * public final const val prop: kotlin/String (* = ... *) + * public final get + * + * // module name: main + * } + */ @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() public final java.lang.String prop = ""; + @org.jetbrains.annotations.NotNull() private final java.lang.String prop2 = ""; @@ -58,8 +130,7 @@ public final class Test { public final void method(int a) { } - public final void method(@org.jetbrains.annotations.NotNull() - java.lang.String a) { + public final void method(@org.jetbrains.annotations.NotNull() java.lang.String a) { } @org.jetbrains.annotations.NotNull() @@ -77,21 +148,33 @@ public final class Test { return null; } - public final void setProp3(@org.jetbrains.annotations.NotNull() - java.lang.String v) { + public final void setProp3(@org.jetbrains.annotations.NotNull() java.lang.String v) { } } + //////////////////// - +/** + * public final class Test2 : kotlin/Any { + * + * // signature: (Ljava/lang/String;)V + * public constructor(a: kotlin/String) + * + * // field: a:Ljava/lang/String; + * // getter: getA()Ljava/lang/String; + * public final val a: kotlin/String + * public final get + * + * // module name: main + * } + */ @kotlin.Metadata() 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) { + public Test2(@org.jetbrains.annotations.NotNull() java.lang.String a) { super(); } @@ -101,16 +184,29 @@ public final class Test2 { } } + //////////////////// - +/** + * public final class Test3 : kotlin/Any { + * + * // signature: (Ljava/lang/String;)V + * protected constructor(a: kotlin/String) + * + * // field: a:Ljava/lang/String; + * // getter: getA()Ljava/lang/String; + * public final val a: kotlin/String + * public final get + * + * // module name: main + * } + */ @kotlin.Metadata() 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) { + protected Test3(@org.jetbrains.annotations.NotNull() java.lang.String a) { super(); } @@ -120,9 +216,21 @@ public final class Test3 { } } + //////////////////// - +/** + * public final class Test4 : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // signature: method()V + * public final fun method(): kotlin/Unit + * + * // module name: main + * } + */ @kotlin.Metadata() public final class Test4 { @@ -134,9 +242,15 @@ public final class Test4 { } } + //////////////////// - +/** + * public abstract interface TestComponent : kotlin/Any { + * + * // module name: main + * } + */ @kotlin.Metadata() public abstract interface TestComponent { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.fir.txt new file mode 100644 index 00000000000..ecc689c17ba --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/cyrillicClassName.fir.txt @@ -0,0 +1,36 @@ +/** + * public final class République : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class République { + + public République() { + super(); + } +} + + +//////////////////// + +/** + * public final class Привет : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class Привет { + + public Привет() { + super(); + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.fir.txt index 18c6a506ac0..7cffebc45db 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.fir.txt @@ -47,19 +47,18 @@ public final class User { @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; @org.jetbrains.annotations.NotNull() - public final User copy(@org.jetbrains.annotations.NotNull() - java.lang.String firstName, @org.jetbrains.annotations.NotNull() - java.lang.String secondName, int age) { + public final User copy(@org.jetbrains.annotations.NotNull() java.lang.String firstName, @org.jetbrains.annotations.NotNull() java.lang.String secondName, int age) { return null; } - public boolean equals(@org.jetbrains.annotations.Nullable() - java.lang.Object other) { + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object other) { return false; } @@ -72,9 +71,7 @@ public final class User { return null; } - public User(@org.jetbrains.annotations.NotNull() - java.lang.String firstName, @org.jetbrains.annotations.NotNull() - java.lang.String secondName, int age) { + public User(@org.jetbrains.annotations.NotNull() java.lang.String firstName, @org.jetbrains.annotations.NotNull() java.lang.String secondName, int age) { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.fir.txt index 9bb62811c7b..010f76fb6d1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.fir.txt @@ -16,6 +16,7 @@ public abstract interface Intf { @org.jetbrains.annotations.NotNull() public static final Intf.Companion Companion = null; + public static final int WHITE = 2; public default int getColor() { @@ -43,6 +44,7 @@ public abstract interface Intf { @kotlin.Metadata() public static final class Companion { private static final int BLACK = 1; + public static final int WHITE = 2; private Companion() { @@ -55,8 +57,8 @@ public abstract interface Intf { } } -//////////////////// +//////////////////// /** * public abstract interface IntfWithDefaultImpls : kotlin/Any { @@ -74,8 +76,8 @@ public abstract interface IntfWithDefaultImpls { } } -//////////////////// +//////////////////// /** * public abstract interface IntfWithoutDefaultImpls : kotlin/Any { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.fir.txt index 5c2e42bb8ea..30d92b76bb9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackage.fir.txt @@ -15,8 +15,8 @@ public final class AnotherRootClass { } } -//////////////////// +//////////////////// /** * public final class RootClass : kotlin/Any { @@ -35,21 +35,6 @@ public final class RootClass { } } -//////////////////// - -package test; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.annotation.ElementType; - -@Target(value = {ElementType.TYPE, ElementType.METHOD}) -@Retention(value = RetentionPolicy.RUNTIME) -public @interface ClassRefAnnotation { - - Class[] value(); -} //////////////////// @@ -83,6 +68,7 @@ public abstract interface PackedClass { public abstract AnotherRootClass oneMoreMethod(); } + //////////////////// package test; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.fir.txt index 5c2e42bb8ea..30d92b76bb9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultPackageCorrectErrorTypes.fir.txt @@ -15,8 +15,8 @@ public final class AnotherRootClass { } } -//////////////////// +//////////////////// /** * public final class RootClass : kotlin/Any { @@ -35,21 +35,6 @@ public final class RootClass { } } -//////////////////// - -package test; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.annotation.ElementType; - -@Target(value = {ElementType.TYPE, ElementType.METHOD}) -@Retention(value = RetentionPolicy.RUNTIME) -public @interface ClassRefAnnotation { - - Class[] value(); -} //////////////////// @@ -83,6 +68,7 @@ public abstract interface PackedClass { public abstract AnotherRootClass oneMoreMethod(); } + //////////////////// package test; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.fir.txt index d84d86ca310..dede3b6eeed 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.fir.txt @@ -15,8 +15,9 @@ */ @kotlin.Metadata() public enum Em { - /*public static final*/ FOO /* = new Em() */, - /*public static final*/ BAR /* = new Em() */; + FOO, + BAR; + Em() { } @@ -27,8 +28,8 @@ public enum Em { } } -//////////////////// +//////////////////// /** * public final class Foo : kotlin/Any { @@ -135,30 +136,47 @@ public enum Em { @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; + @org.jetbrains.annotations.NotNull() private final Em em = null; + @org.jetbrains.annotations.NotNull() private final Em[] emarr = null; @@ -166,16 +184,7 @@ public final class Foo { super(); } - public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull() - java.lang.String s, @org.jetbrains.annotations.NotNull() - int[] iarr, @org.jetbrains.annotations.NotNull() - long[] larr, @org.jetbrains.annotations.NotNull() - double[] darr, @org.jetbrains.annotations.NotNull() - java.lang.String[] sarr, @org.jetbrains.annotations.NotNull() - java.lang.Class cl, @org.jetbrains.annotations.NotNull() - java.lang.Class[] clarr, @org.jetbrains.annotations.NotNull() - Em em, @org.jetbrains.annotations.NotNull() - Em[] emarr) { + public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull() java.lang.String s, @org.jetbrains.annotations.NotNull() int[] iarr, @org.jetbrains.annotations.NotNull() long[] larr, @org.jetbrains.annotations.NotNull() double[] darr, @org.jetbrains.annotations.NotNull() java.lang.String[] sarr, @org.jetbrains.annotations.NotNull() java.lang.Class cl, @org.jetbrains.annotations.NotNull() java.lang.Class[] clarr, @org.jetbrains.annotations.NotNull() Em em, @org.jetbrains.annotations.NotNull() Em[] emarr) { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.fir.txt index 78d9d983851..6a2c315db15 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.fir.txt @@ -15,8 +15,9 @@ */ @kotlin.Metadata() public enum Em { - /*public static final*/ FOO /* = new Em() */, - /*public static final*/ BAR /* = new Em() */; + FOO, + BAR; + Em() { } @@ -27,8 +28,8 @@ public enum Em { } } -//////////////////// +//////////////////// /** * public final class Foo : kotlin/Any { @@ -135,30 +136,47 @@ public enum Em { @kotlin.Metadata() public final class Foo { private final boolean z = true; + private final byte b = 0; + private final char c = 'c'; + private final char c2 = '\n'; + private final short sh = 10; + private final int i = 10; + private final long l = -10L; - private final float f = 1.0F; + + 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 = {}; + @org.jetbrains.annotations.NotNull() private final Em em = Em.BAR; + @org.jetbrains.annotations.NotNull() private final Em[] emarr = {Em.FOO, Em.BAR}; @@ -166,16 +184,7 @@ public final class Foo { super(); } - public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull() - java.lang.String s, @org.jetbrains.annotations.NotNull() - int[] iarr, @org.jetbrains.annotations.NotNull() - long[] larr, @org.jetbrains.annotations.NotNull() - double[] darr, @org.jetbrains.annotations.NotNull() - java.lang.String[] sarr, @org.jetbrains.annotations.NotNull() - java.lang.Class cl, @org.jetbrains.annotations.NotNull() - java.lang.Class[] clarr, @org.jetbrains.annotations.NotNull() - Em em, @org.jetbrains.annotations.NotNull() - Em[] emarr) { + public Foo(boolean z, byte b, char c, char c2, short sh, int i, long l, float f, double d, @org.jetbrains.annotations.NotNull() java.lang.String s, @org.jetbrains.annotations.NotNull() int[] iarr, @org.jetbrains.annotations.NotNull() long[] larr, @org.jetbrains.annotations.NotNull() double[] darr, @org.jetbrains.annotations.NotNull() java.lang.String[] sarr, @org.jetbrains.annotations.NotNull() java.lang.Class cl, @org.jetbrains.annotations.NotNull() java.lang.Class[] clarr, @org.jetbrains.annotations.NotNull() Em em, @org.jetbrains.annotations.NotNull() Em[] emarr) { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.fir.txt new file mode 100644 index 00000000000..f3f6d1468ae --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.fir.txt @@ -0,0 +1,59 @@ +package test; + +/** + * public final class test/Bar : kotlin/Any { + * + * // signature: (Ltest/Delegate;)V + * public constructor(delegate: test/Delegate) + * + * // field: unknown$delegate:Ltest/Delegate; + * // getter: getUnknown()Lerror/NonExistentClass; + * private final (* delegated *) val unknown: error/NonExistentClass + * private final (* non-default *) get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class Bar { + @org.jetbrains.annotations.NotNull() + private final test.Delegate unknown$delegate = null; + + public Bar(@org.jetbrains.annotations.NotNull() test.Delegate delegate) { + super(); + } + + private final Unknown getUnknown() { + return null; + } +} + + +//////////////////// + +package test; + +/** + * public final class test/Delegate : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // signature: getValue(Ljava/lang/Object;Lerror/NonExistentClass;)Ljava/lang/Object; + * public final operator fun getValue(thisRef: kotlin/Any, property: error/NonExistentClass): kotlin/Any + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class Delegate { + + public Delegate() { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.Object getValue(@org.jetbrains.annotations.NotNull() java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() KProperty property) { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.fir.txt index d9ecbf9d2bf..9c03a2f433d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.fir.txt @@ -44,14 +44,19 @@ package test; public final class A { @org.jetbrains.annotations.NotNull() private final kotlin.Lazy x$delegate = null; + @org.jetbrains.annotations.NotNull() private final test.C z$delegate = null; + @org.jetbrains.annotations.NotNull() private final test.C y$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy> a$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy> b$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KProperty0> c$delegate = null; @@ -94,6 +99,7 @@ public final class A { } } + //////////////////// package test; @@ -117,9 +123,7 @@ public class C { super(); } - public final T getValue(@org.jetbrains.annotations.Nullable() - java.lang.Object p1, @org.jetbrains.annotations.Nullable() - java.lang.Object p2) { + public final T getValue(@org.jetbrains.annotations.Nullable() java.lang.Object p1, @org.jetbrains.annotations.Nullable() java.lang.Object p2) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegationToAnonymousObject.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegationToAnonymousObject.fir.txt new file mode 100644 index 00000000000..5b08d4f629f --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/delegationToAnonymousObject.fir.txt @@ -0,0 +1,29 @@ +/** + * public final class C : I { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class C implements I { + + public C() { + super(); + } +} + + +//////////////////// + +/** + * public abstract interface I : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface I { +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.fir.txt index 24540b46164..9f200857f2a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.fir.txt @@ -12,10 +12,11 @@ package deprecated; @kotlin.Metadata() @kotlin.Deprecated(message = "Deprecated annotation") @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -@java.lang.Deprecated() +@java.lang.Deprecated public abstract @interface Anno { } + //////////////////// package deprecated; @@ -47,9 +48,9 @@ package deprecated; @kotlin.Metadata() @kotlin.Deprecated(message = "Deprecated class") @Anno() -@java.lang.Deprecated() +@java.lang.Deprecated public final class Foo { - @java.lang.Deprecated() + @java.lang.Deprecated private final int prop = 0; public Foo() { @@ -57,11 +58,11 @@ public final class Foo { } @kotlin.Deprecated(message = "Deprecated function") - @java.lang.Deprecated() + @java.lang.Deprecated public final void foo(int a) { } - @java.lang.Deprecated() + @java.lang.Deprecated public final int getProp() { return 0; } @@ -72,13 +73,13 @@ public final class Foo { } @kotlin.Deprecated(message = "Deprecated getter") - @java.lang.Deprecated() + @java.lang.Deprecated public final int getFoo() { return 0; } @kotlin.Deprecated(message = "Deprecated setter") - @java.lang.Deprecated() + @java.lang.Deprecated public final void setFoo(int value) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumConstructorCallWithErrorType.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumConstructorCallWithErrorType.fir.txt new file mode 100644 index 00000000000..113c355deba --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumConstructorCallWithErrorType.fir.txt @@ -0,0 +1,58 @@ +/** + * public final enum class E : kotlin/Enum { + * + * // signature: (Ljava/lang/String;ILI;)V + * private constructor(i: I) + * + * // field: i:LI; + * // getter: getI()LI; + * public final val i: I + * public final get + * + * E1, + * + * E2, + * + * E3, + * + * // module name: main + * + * // has Enum.entries + * } + */ +@kotlin.Metadata() +@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) +public enum E { + E1, + E2, + E3; + + @org.jetbrains.annotations.NotNull() + private final I i = null; + + E(I i) { + } + + @org.jetbrains.annotations.NotNull() + public final I getI() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} + + +//////////////////// + +/** + * public abstract interface I : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface I { +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.fir.txt index 2cc4f769801..15362956be3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.fir.txt @@ -19,9 +19,10 @@ package kapt; */ @kotlin.Metadata() public enum Options { - /*public static final*/ A /* = new Options() */, - /*public static final*/ B /* = new Options() */, - /*public static final*/ C /* = new Options() */; + A, + B, + C; + Options() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.fir.txt index f42a9c1602a..62f82086fc7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.fir.txt @@ -19,6 +19,7 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final Test.Companion.Example foo = Test.Companion.Example.FOO; + @org.jetbrains.annotations.NotNull() public static final Test.Companion Companion = null; @@ -59,7 +60,8 @@ public final class Test { */ @kotlin.Metadata() public static enum Example { - /*public static final*/ FOO /* = new Example() */; + FOO; + Example() { } @@ -72,8 +74,8 @@ public final class Test { } } -//////////////////// +//////////////////// /** * public final class Test2 : kotlin/Any { @@ -96,6 +98,7 @@ public final class Test { public final class Test2 { @org.jetbrains.annotations.NotNull() private final Test2.Amigo.Example foo = Test2.Amigo.Example.FOO; + @org.jetbrains.annotations.NotNull() public static final Test2.Amigo Amigo = null; @@ -136,7 +139,8 @@ public final class Test2 { */ @kotlin.Metadata() public static enum Example { - /*public static final*/ FOO /* = new Example() */; + FOO; + Example() { } @@ -149,8 +153,8 @@ public final class Test2 { } } -//////////////////// +//////////////////// /** * public final class Test3 : kotlin/Any { @@ -211,7 +215,8 @@ public final class Test3 { */ @kotlin.Metadata() public static enum Example { - /*public static final*/ FOO /* = new Example() */; + FOO; + Example() { } @@ -224,8 +229,8 @@ public final class Test3 { } } -//////////////////// +//////////////////// /** * public final class Test4 : kotlin/Any { @@ -247,6 +252,7 @@ public final class Test3 { @kotlin.Metadata() public final class Test4 { private final int foo = 1; + @org.jetbrains.annotations.NotNull() public static final Test4.Companion Companion = null; @@ -289,6 +295,7 @@ public final class Test4 { public static final class Foo { @org.jetbrains.annotations.NotNull() public static final Test4.Companion.Foo INSTANCE = null; + public static final int constProperty = 1; private Foo() { @@ -298,8 +305,8 @@ public final class Test4 { } } -//////////////////// +//////////////////// /** * public final class Test5 : kotlin/Any { @@ -398,7 +405,8 @@ public final class Test5 { */ @kotlin.Metadata() public static enum Example { - /*public static final*/ FOO /* = new Example() */; + FOO; + Example() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumSecondaryConstructor.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumSecondaryConstructor.fir.txt new file mode 100644 index 00000000000..7c9fd292c7c --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumSecondaryConstructor.fir.txt @@ -0,0 +1,19 @@ +public enum Foo { + BLA; + + @org.jetbrains.annotations.NotNull() + private final java.lang.String bla = null; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getBla() { + return null; + } + + Foo(java.lang.String bla) { + } + + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.fir.txt index 0e8fe3d53b0..8e50ed30461 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.fir.txt @@ -18,8 +18,8 @@ public abstract @interface Anno1 { public abstract java.lang.String value(); } -//////////////////// +//////////////////// /** * public final enum class Enum1 : kotlin/Enum { @@ -38,8 +38,9 @@ public abstract @interface Anno1 { */ @kotlin.Metadata() public enum Enum1 { - /*public static final*/ BLACK /* = new Enum1() */, - /*public static final*/ WHITE /* = new Enum1() */; + BLACK, + WHITE; + Enum1() { } @@ -50,8 +51,8 @@ public enum Enum1 { } } -//////////////////// +//////////////////// /** * public final enum class Enum2 : kotlin/Enum { @@ -89,15 +90,15 @@ public enum Enum1 { */ @kotlin.Metadata() public enum Enum2 { - /*public static final*/ RED /* = new Enum2() */, - /*public static final*/ WHITE /* = new Enum2() */; + RED, + WHITE; + @org.jetbrains.annotations.NotNull() 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) { + Enum2(@Anno1(value = "first") java.lang.String col, @Anno1(value = "second") int col2) { } @org.jetbrains.annotations.NotNull() @@ -126,8 +127,8 @@ public enum Enum2 { } } -//////////////////// +//////////////////// /** * public abstract interface I : kotlin/Any { @@ -139,7 +140,6 @@ public enum Enum2 { */ @kotlin.Metadata() public abstract interface I { - /** * public final enum class I.Nested : kotlin/Enum { * @@ -155,7 +155,8 @@ public abstract interface I { */ @kotlin.Metadata() public static enum Nested { - /*public static final*/ WHITE /* = new Nested() */; + WHITE; + Nested() { } @@ -167,8 +168,8 @@ public abstract interface I { } } -//////////////////// +//////////////////// /** * public final enum class Nested1 : kotlin/Enum { @@ -185,7 +186,8 @@ public abstract interface I { */ @kotlin.Metadata() public enum Nested1 { - /*public static final*/ WHITE /* = new Nested1() */; + WHITE; + Nested1() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.fir.txt new file mode 100644 index 00000000000..d275472522e --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorExtensionReceiver.fir.txt @@ -0,0 +1,90 @@ +/** + * public final class TypeHook : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // signature: receiverFunction(Lerror/NonExistentClass;)Lerror/NonExistentClass; + * public final fun error/NonExistentClass.receiverFunction(): error/NonExistentClass + * + * // getter: getCustomProperty()Lerror/NonExistentClass; + * // setter: setCustomProperty(Lerror/NonExistentClass;)V + * public final var customProperty: error/NonExistentClass + * public final (* non-default *) get + * public final (* non-default *) set(value: error/NonExistentClass) + * + * // getter: getReceiverProperty(Lerror/NonExistentClass;)Lerror/NonExistentClass; + * // setter: setReceiverProperty(Lerror/NonExistentClass;Lerror/NonExistentClass;)V + * public final var error/NonExistentClass.receiverProperty: error/NonExistentClass + * public final (* non-default *) get + * public final (* non-default *) set(value: error/NonExistentClass) + * + * // companion object: Companion + * + * // nested class: Companion + * + * // module name: main + * } + */ +@kotlin.Metadata() +@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) +public final class TypeHook { + @org.jetbrains.annotations.NotNull() + public static final TypeHook.Companion Companion = null; + + public TypeHook() { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final UnknownType getCustomProperty() { + return null; + } + + public final void setCustomProperty(@org.jetbrains.annotations.NotNull() UnknownType value) { + } + + @org.jetbrains.annotations.NotNull() + public final UnknownType getReceiverProperty(@org.jetbrains.annotations.NotNull() UnknownType $this$receiverProperty) { + return null; + } + + public final void setReceiverProperty(@org.jetbrains.annotations.NotNull() UnknownType $this$receiverProperty, @org.jetbrains.annotations.NotNull() UnknownType value) { + } + + @org.jetbrains.annotations.NotNull() + public final UnknownType receiverFunction(@org.jetbrains.annotations.NotNull() UnknownType $this$receiverFunction) { + return null; + } + + /** + * public final companion object TypeHook.Companion : kotlin/Any { + * + * // signature: ()V + * private constructor() + * + * // getter: getExtensionProperty(Lerror/NonExistentClass;)Lerror/NonExistentClass; + * // setter: setExtensionProperty(Lerror/NonExistentClass;Lerror/NonExistentClass;)V + * public final var error/NonExistentClass.extensionProperty: error/NonExistentClass + * public final (* non-default *) get + * public final (* non-default *) set(value: error/NonExistentClass) + * + * // module name: main + * } + */ + @kotlin.Metadata() + public static final class Companion { + + private Companion() { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final UnknownType getExtensionProperty(@org.jetbrains.annotations.NotNull() UnknownType $this$extensionProperty) { + return null; + } + + public final void setExtensionProperty(@org.jetbrains.annotations.NotNull() UnknownType $this$extensionProperty, @org.jetbrains.annotations.NotNull() UnknownType value) { + } + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.fir.txt index cba93ced620..e655216494d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.fir.txt @@ -18,8 +18,8 @@ public abstract @interface Anno { public abstract java.lang.Class a(); } -//////////////////// +//////////////////// /** * public final class ErrorInAnnotation : kotlin/Any { @@ -39,8 +39,8 @@ public final class ErrorInAnnotation { } } -//////////////////// +//////////////////// /** * public final class ErrorInConstructorParameter : kotlin/Any { @@ -70,15 +70,14 @@ public final class ErrorInAnnotation { public final class ErrorInConstructorParameter { @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; + @org.jetbrains.annotations.NotNull() private final ABC b = null; + @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) { + 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(); } @@ -98,8 +97,8 @@ public final class ErrorInConstructorParameter { } } -//////////////////// +//////////////////// /** * public final class ErrorInDeclarations : kotlin/Any { @@ -159,8 +158,11 @@ public final class ErrorInConstructorParameter { @kotlin.Metadata() public final class ErrorInDeclarations { public java.lang.String p1; + public ABC p2; + public BCD p3; + @org.jetbrains.annotations.NotNull() public static final ErrorInDeclarations.Companion Companion = null; @@ -173,8 +175,7 @@ public final class ErrorInDeclarations { return null; } - public final void setP1(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setP1(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } @org.jetbrains.annotations.NotNull() @@ -182,8 +183,7 @@ public final class ErrorInDeclarations { return null; } - public final void setP2(@org.jetbrains.annotations.NotNull() - ABC p0) { + public final void setP2(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() @@ -191,21 +191,16 @@ public final class ErrorInDeclarations { return null; } - public final void setP3(@org.jetbrains.annotations.NotNull() - BCD p0) { + 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() java.lang.String a) { } - public final void overloads(@org.jetbrains.annotations.NotNull() - ABC a) { + public final void overloads(@org.jetbrains.annotations.NotNull() ABC a) { } - public final void f1(@org.jetbrains.annotations.NotNull() - java.lang.String a, @org.jetbrains.annotations.NotNull() - ABC> b) { + public final void f1(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() ABC> b) { } public final void f2() { @@ -220,19 +215,15 @@ public final class ErrorInDeclarations { } @kotlin.jvm.JvmOverloads() - public final void f5(@org.jetbrains.annotations.NotNull() - ABC a) { + public final void f5(@org.jetbrains.annotations.NotNull() ABC a) { } @kotlin.jvm.JvmOverloads() - public final void f5(@org.jetbrains.annotations.NotNull() - ABC a, @org.jetbrains.annotations.NotNull() - java.lang.String b) { + public final void f5(@org.jetbrains.annotations.NotNull() ABC a, @org.jetbrains.annotations.NotNull() java.lang.String b) { } @kotlin.jvm.JvmStatic() - public static final void f6(@org.jetbrains.annotations.NotNull() - ABC a) { + public static final void f6(@org.jetbrains.annotations.NotNull() ABC a) { } /** @@ -255,14 +246,13 @@ public final class ErrorInDeclarations { } @kotlin.jvm.JvmStatic() - public final void f6(@org.jetbrains.annotations.NotNull() - ABC a) { + public final void f6(@org.jetbrains.annotations.NotNull() ABC a) { } } } -//////////////////// +//////////////////// /** * public final class ErrorInSupertype : error/NonExistentClass { @@ -281,8 +271,8 @@ public final class ErrorInSupertype implements ABC { } } -//////////////////// +//////////////////// /** * public final class ErrorInSupertype2 : error/NonExistentClass { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.fir.txt index fec28c8888d..f874fc80ebd 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.fir.txt @@ -14,6 +14,7 @@ package test; public abstract @interface Anno { } + //////////////////// package test; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.fir.txt index 1a7cf028fb2..2824fd7617f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.fir.txt @@ -17,6 +17,7 @@ public final class Child extends kotlin.collections.AbstractList { } } + //////////////////// package test; @@ -80,6 +83,7 @@ public final class Generics2 implements Foo { } } + //////////////////// package test; @@ -101,6 +105,7 @@ public final class Generics3 implements Foo } } + //////////////////// package test; @@ -115,6 +120,7 @@ package test; public abstract interface Intf { } + //////////////////// package test; @@ -154,6 +160,7 @@ public final class MappedList extends kotlin.collect } } + //////////////////// package test; @@ -168,6 +175,7 @@ package test; public abstract interface Parent { } + //////////////////// package test; @@ -189,6 +197,7 @@ public final class TBarBazCl extends test.Cl implements Bar, Baz { } } + //////////////////// package test; @@ -210,6 +219,7 @@ public final class TClBarBaz extends test.Cl implements Bar, Baz { } } + //////////////////// package test; @@ -233,8 +243,7 @@ public final class TFooBar extends Foo implements Bar, test.Intf { @org.jetbrains.annotations.NotNull() private final X a = null; - public TFooBar(@org.jetbrains.annotations.NotNull() - X a) { + public TFooBar(@org.jetbrains.annotations.NotNull() X a) { super(); } @@ -244,6 +253,7 @@ public final class TFooBar extends Foo implements Bar, test.Intf { } } + //////////////////// package test; @@ -267,8 +277,7 @@ public final class TFooBar2 implements Foo, Bar { @org.jetbrains.annotations.NotNull() private final X a = null; - public TFooBar2(@org.jetbrains.annotations.NotNull() - X a) { + public TFooBar2(@org.jetbrains.annotations.NotNull() X a) { super(); } @@ -278,6 +287,7 @@ public final class TFooBar2 implements Foo, Bar { } } + //////////////////// package test; @@ -299,6 +309,7 @@ public final class TFooBarBaz extends Foo implements Bar, Baz { } } + //////////////////// package test; @@ -320,6 +331,7 @@ public final class TFooBarBaz2 extends Foo implements Baz, test.Intf { } } + //////////////////// package test; @@ -341,6 +353,7 @@ public final class TFooBarBaz3 implements Foo, Bar, Baz { } } + //////////////////// package test; @@ -362,6 +375,7 @@ public final class TFooBarBaz4 implements Foo, Bar, Baz { } } + //////////////////// package test; @@ -385,12 +399,12 @@ public final class TFooBarBaz5 implements Foo, Bar, Baz { super(); } - public TFooBarBaz5(@org.jetbrains.annotations.NotNull() - java.lang.String s) { + public TFooBarBaz5(@org.jetbrains.annotations.NotNull() java.lang.String s) { super(); } } + //////////////////// package test; @@ -407,12 +421,12 @@ package test; @kotlin.Metadata() public final class TFooBarBaz6 implements Foo, Bar, Baz { - public TFooBarBaz6(@org.jetbrains.annotations.NotNull() - java.lang.String s) { + public TFooBarBaz6(@org.jetbrains.annotations.NotNull() java.lang.String s) { super(); } } + //////////////////// package test; @@ -434,6 +448,7 @@ public final class TxFooxBarxBaz extends x.Foo implements x.Bar, x.Baz, test.Int } } + //////////////////// package test; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.fir.txt new file mode 100644 index 00000000000..d003f68f075 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.fir.txt @@ -0,0 +1,23 @@ +package a.b.c; + +/** + * package { + * + * // signature: foo()V + * public final fun foo(): kotlin/Unit + * + * // field: bar:I + * public final const val bar: kotlin/Int (* = ... *) + * public final get + * + * // module name: main + * } + */ +@kotlin.Metadata() +@kotlin.jvm.JvmName(name = "FacadeName") +public final class FacadeName { + public static final int bar = 3; + + public static final void foo() { + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.fir.txt index c8b8188cc02..fa73568936d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.fir.txt @@ -27,12 +27,11 @@ public final class MappedList extends kotlin.collections.AbstractList implements java.util.List, kotlin.jvm.internal.markers.KMappedMarker { @org.jetbrains.annotations.NotNull() private final java.util.List list = null; + @org.jetbrains.annotations.NotNull() private final kotlin.jvm.functions.Function1 function = null; - public MappedList(@org.jetbrains.annotations.NotNull() - java.util.List list, @org.jetbrains.annotations.NotNull() - kotlin.jvm.functions.Function1 function) { + 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/genericSimple.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.fir.txt new file mode 100644 index 00000000000..f27af471be4 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.fir.txt @@ -0,0 +1,111 @@ +/** + * public abstract interface ABC : kotlin/Any { + * + * // signature: abc(Ljava/lang/CharSequence;Ljava/util/List;[Ljava/lang/CharSequence;)Ljava/util/List; + * public abstract fun abc(item: T#0, items: kotlin/collections/List, vararg otherItems: T#0 (* kotlin/Array *)): kotlin/collections/List + * + * // signature: bcd([C)I + * public abstract fun bcd(vararg a: kotlin/Char (* kotlin/CharArray *)): kotlin/Int + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface ABC { + + @org.jetbrains.annotations.NotNull() + public abstract java.util.List abc(@org.jetbrains.annotations.NotNull() T item, @org.jetbrains.annotations.NotNull() java.util.List items, @org.jetbrains.annotations.NotNull() T... otherItems); + + public abstract int bcd(@org.jetbrains.annotations.NotNull() char... a); +} + + +//////////////////// + +/** + * public open class BaseClass : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public class BaseClass { + + public BaseClass() { + super(); + } +} + + +//////////////////// + +/** + * public abstract interface Intf : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface Intf { +} + + +//////////////////// + +/** + * public abstract interface Intf2, T#1 (* M *) : T#0> : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface Intf2, M extends T> { +} + + +//////////////////// + +/** + * public final class MyClass : Intf, OtherIntf, BaseClass { + * + * // signature: ()V + * public constructor() + * + * // field: fld:Ljava/util/List; + * // getter: getFld()Ljava/util/List; + * public final val fld: kotlin/collections/List>? + * public final get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class MyClass extends BaseClass implements Intf, OtherIntf { + @org.jetbrains.annotations.Nullable() + private final java.util.List> fld = null; + + public MyClass() { + super(); + } + + @org.jetbrains.annotations.Nullable() + public final java.util.List> getFld() { + return null; + } +} + + +//////////////////// + +/** + * public abstract interface OtherIntf : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface OtherIntf { +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.fir.txt new file mode 100644 index 00000000000..a896511ad41 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.fir.txt @@ -0,0 +1,19 @@ +public final class Test { + @org.jetbrains.annotations.NotNull() + public final java.lang.String ignoredProperty = ""; + + @org.jetbrains.annotations.NotNull() + private final java.lang.String nonIgnoredProperty = ""; + + public Test() { + super(); + } + + public final void nonIgnoredFun() { + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getNonIgnoredProperty() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.fir.txt index 1889425a8e6..6a71977cbff 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.fir.txt @@ -1,18 +1,3 @@ -package lib; - -public abstract class Prop { - - public Prop() { - super(); - } - - public abstract int get(T key); - - public abstract void set(T key, int value); -} - -//////////////////// - package test; /** @@ -36,8 +21,7 @@ public final class Cl { @org.jetbrains.annotations.NotNull() private java.lang.String name; - public Cl(@org.jetbrains.annotations.NotNull() - java.lang.String name) { + public Cl(@org.jetbrains.annotations.NotNull() java.lang.String name) { super(); } @@ -46,11 +30,11 @@ public final class Cl { return null; } - public final void setName(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setName(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } } + //////////////////// package test; @@ -78,14 +62,12 @@ package test; */ @kotlin.Metadata() public final class TestKt { - - public TestKt() { - super(); - } @org.jetbrains.annotations.NotNull() private static final lib.Prop TEST = null; + @org.jetbrains.annotations.NotNull() private static final lib.Prop[] TESTS_ARRAY = {}; + @org.jetbrains.annotations.NotNull() private static final java.util.List> TESTS_LIST = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.fir.txt index 6843f43353d..4e712e545d2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.fir.txt @@ -10,10 +10,6 @@ @kotlin.Metadata() public final class ImportsForErrorTypesKt { - public ImportsForErrorTypesKt() { - super(); - } - @org.jetbrains.annotations.Nullable() public static final java.lang.Object test() { return null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.fir.txt index 8555717e865..baa5f875f38 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.fir.txt @@ -1,25 +1,3 @@ -package lib; - -public class File { - - public File() { - super(); - } -} - -//////////////////// - -package lib; - -public class IOException { - - public IOException() { - super(); - } -} - -//////////////////// - package test; /** @@ -39,6 +17,7 @@ public final class TestA { } } + //////////////////// package test; @@ -77,6 +56,7 @@ public abstract interface TestB { public abstract lib.IOException d(); } + //////////////////// package test; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.fir.txt index 136596e08e0..eae088ca374 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.fir.txt @@ -10,14 +10,13 @@ @kotlin.Metadata() public final class GroupedNewsListDelegateAdapter { - public GroupedNewsListDelegateAdapter(@org.jetbrains.annotations.NotNull() - kotlin.jvm.functions.Function0 onWiFiClickListener) { + public GroupedNewsListDelegateAdapter(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0 onWiFiClickListener) { super(); } } -//////////////////// +//////////////////// /** * public final class HomeFragment : kotlin/Any { @@ -43,6 +42,7 @@ public final class GroupedNewsListDelegateAdapter { public final class HomeFragment { @org.jetbrains.annotations.NotNull() private final kotlin.Unit categoryNewsListPresenter$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy groupedNewsListAdapter$delegate = null; @@ -64,8 +64,8 @@ public final class HomeFragment { } } -//////////////////// +//////////////////// /** * package { @@ -79,10 +79,6 @@ public final class HomeFragment { @kotlin.Metadata() public final class IncorrectDelegateKt { - public IncorrectDelegateKt() { - super(); - } - public static final void moxyPresenter() { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.fir.txt index 834a527c162..a2756374152 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.fir.txt @@ -1,7 +1,6 @@ public abstract class BaseClass { - public BaseClass(@org.jetbrains.annotations.NotNull() - Context context, int num, boolean bool) { + public BaseClass(@org.jetbrains.annotations.NotNull() Context context, int num, boolean bool) { super(); } @@ -9,19 +8,18 @@ public abstract class BaseClass { public abstract Result doJob(); } -//////////////////// +//////////////////// public abstract interface Context { } -//////////////////// +//////////////////// public final class Inheritor extends BaseClass { - public Inheritor(@org.jetbrains.annotations.NotNull() - Context context) { + public Inheritor(@org.jetbrains.annotations.NotNull() Context context) { super(null, 0, false); } @@ -32,12 +30,13 @@ public final class Inheritor extends BaseClass { } } + //////////////////// - public enum Result { - /*public static final*/ SUCCESS /* = new Result() */, - /*public static final*/ ERROR /* = new Result() */; + SUCCESS, + ERROR; + Result() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.fir.txt index c06afba24d2..93e7cfefb39 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.fir.txt @@ -27,10 +27,6 @@ */ @kotlin.Metadata() public final class Cl { - - public Cl() { - super(); - } @org.jetbrains.annotations.NotNull() private final java.lang.String a = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.fir.txt index 9ae1d521f9d..715b9f760c0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.fir.txt @@ -41,8 +41,8 @@ public final class Test { } } -//////////////////// +//////////////////// /** * public final class Test2 : kotlin/Any { @@ -106,8 +106,8 @@ public final class Test2 { } } -//////////////////// +//////////////////// /** * public final class Test3 : kotlin/Any { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.fir.txt index b8954ff9e05..adaeb6f5a1b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.fir.txt @@ -15,8 +15,8 @@ public abstract interface Named { public abstract java.lang.String getName(); } -//////////////////// +//////////////////// /** * public final class Product2 : Named { @@ -45,12 +45,10 @@ public final class Product2 implements Named { return null; } - public void setName(@org.jetbrains.annotations.Nullable() - java.lang.String p0) { + public void setName(@org.jetbrains.annotations.Nullable() java.lang.String p0) { } - public Product2(@org.jetbrains.annotations.NotNull() - java.lang.String otherName) { + public Product2(@org.jetbrains.annotations.NotNull() java.lang.String otherName) { super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.fir.txt index 5b56f018d5f..8218270cf36 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.fir.txt @@ -19,8 +19,8 @@ public abstract @interface Anno { public abstract Color color(); } -//////////////////// +//////////////////// /** * public final enum class Color : kotlin/Enum { @@ -39,7 +39,8 @@ public abstract @interface Anno { */ @kotlin.Metadata() public enum Color { - /*public static final*/ BLACK /* = new Color() */; + BLACK; + Color() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.fir.txt new file mode 100644 index 00000000000..15a529b0c36 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.fir.txt @@ -0,0 +1,40 @@ +package a.b.c; + +/** + * public final class a/b/c/A : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class A { + + public A() { + super(); + } +} + + +//////////////////// + +package a.b.typealias.c; + +/** + * public final class a/b/typealias/c/E : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class E { + + public E() { + super(); + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.fir.txt index 32788015474..516e5b0d52c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.fir.txt @@ -1,5 +1,8 @@ package javadoc; +/** + * Simple + */ /** * public final class javadoc/A : kotlin/Any { * @@ -17,10 +20,16 @@ public final class A { } } + //////////////////// package javadoc; +/** + * Multi + * line + * comment. + */ /** * public final class javadoc/B : kotlin/Any { * @@ -78,7 +87,6 @@ package javadoc; */ @kotlin.Metadata() public final class B { - /** * Nested * member @@ -174,8 +182,7 @@ public final class B { /** * A mutable property */ - public final void setE(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setE(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } /** @@ -189,8 +196,7 @@ public final class B { /** * A property without a backing field */ - public final void setF(@org.jetbrains.annotations.NotNull() - java.lang.String value) { + public final void setF(@org.jetbrains.annotations.NotNull() java.lang.String value) { } /** @@ -204,8 +210,7 @@ public final class B { /** * A property with a backing field and an explicit setter */ - public final void setG(@org.jetbrains.annotations.NotNull() - java.lang.String value) { + public final void setG(@org.jetbrains.annotations.NotNull() java.lang.String value) { } /** @@ -219,7 +224,6 @@ public final class B { /** * A property with documentation for an accessor */ - public final void setH(@org.jetbrains.annotations.NotNull() - java.lang.String value) { + public final void setH(@org.jetbrains.annotations.NotNull() java.lang.String value) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.fir.txt new file mode 100644 index 00000000000..216ad14416e --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.fir.txt @@ -0,0 +1,138 @@ +/** + * public final class State : kotlin/Any { + * + * // signature: (IJLjava/lang/String;)V + * public constructor(someInt: kotlin/Int, someLong: kotlin/Long, someString: kotlin/String (* = ... *)) + * + * // field: someInt:I + * // getter: getSomeInt()I + * public final val someInt: kotlin/Int + * public final get + * + * // field: someLong:J + * // getter: getSomeLong()J + * public final val someLong: kotlin/Long + * public final get + * + * // field: someString:Ljava/lang/String; + * // getter: getSomeString()Ljava/lang/String; + * public final val someString: kotlin/String + * public final get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class State { + private final int someInt = 0; + + private final long someLong = 0L; + + @org.jetbrains.annotations.NotNull() + private final java.lang.String someString = null; + + @kotlin.jvm.JvmOverloads() + public State(int someInt, long someLong) { + super(); + } + + @kotlin.jvm.JvmOverloads() + public State(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { + super(); + } + + public final int getSomeInt() { + return 0; + } + + public final long getSomeLong() { + return 0L; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getSomeString() { + return null; + } +} + + +//////////////////// + +/** + * public final class State2 : kotlin/Any { + * + * // signature: (IJLjava/lang/String;)V + * public constructor(someInt: kotlin/Int, someLong: kotlin/Long (* = ... *), someString: kotlin/String (* = ... *)) + * + * // signature: methodWithoutArgs()V + * public final fun methodWithoutArgs(): kotlin/Unit + * + * // signature: someMethod(Ljava/lang/String;)V + * public final fun someMethod(str: kotlin/String): kotlin/Unit + * + * // signature: test(IJLjava/lang/String;)I + * public final fun test(someInt: kotlin/Int, someLong: kotlin/Long (* = ... *), someString: kotlin/String (* = ... *)): kotlin/Int + * + * // field: someInt:I + * public final val someInt: kotlin/Int + * public final get + * + * // field: someLong:J + * public final val someLong: kotlin/Long + * public final get + * + * // field: someString:Ljava/lang/String; + * public final val someString: kotlin/String + * public final get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class State2 { + @kotlin.jvm.JvmField() + public final int someInt = 0; + + @kotlin.jvm.JvmField() + public final long someLong = 0L; + + @kotlin.jvm.JvmField() + @org.jetbrains.annotations.NotNull() + public final java.lang.String someString = null; + + @kotlin.jvm.JvmOverloads() + public State2(int someInt) { + super(); + } + + @kotlin.jvm.JvmOverloads() + public State2(int someInt, long someLong) { + super(); + } + + @kotlin.jvm.JvmOverloads() + public State2(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { + super(); + } + + @kotlin.jvm.JvmOverloads() + public final int test(int someInt) { + return 0; + } + + @kotlin.jvm.JvmOverloads() + public final int test(int someInt, long someLong) { + return 0; + } + + @kotlin.jvm.JvmOverloads() + public final int test(int someInt, long someLong, @org.jetbrains.annotations.NotNull() java.lang.String someString) { + return 0; + } + + public final void someMethod(@org.jetbrains.annotations.NotNull() java.lang.String str) { + } + + public final void methodWithoutArgs() { + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.fir.txt index da4b432c7cf..ff0b7871a1d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmRepeatableAnnotation.fir.txt @@ -17,8 +17,8 @@ public final class A { } } -//////////////////// +//////////////////// /** * public final annotation class Condition : kotlin/Annotation { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.fir.txt index 5bf5ed3a561..3fd6bab4a13 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.fir.txt @@ -15,8 +15,7 @@ public abstract interface FooComponent { @kotlin.jvm.JvmStatic() @org.jetbrains.annotations.NotNull() - public static java.lang.String create(@org.jetbrains.annotations.NotNull() - java.lang.String context) { + public static java.lang.String create(@org.jetbrains.annotations.NotNull() java.lang.String context) { return null; } @@ -41,15 +40,14 @@ public abstract interface FooComponent { @kotlin.jvm.JvmStatic() @org.jetbrains.annotations.NotNull() - public final java.lang.String create(@org.jetbrains.annotations.NotNull() - java.lang.String context) { + public final java.lang.String create(@org.jetbrains.annotations.NotNull() java.lang.String context) { return null; } } } -//////////////////// +//////////////////// /** * public final class JvmStaticTest : kotlin/Any { @@ -76,10 +74,15 @@ public abstract interface FooComponent { public final class JvmStaticTest { @org.jetbrains.annotations.NotNull() public static final JvmStaticTest.Companion Companion = null; + private static final int one = 1; + public static final int two = 2; + public static final char c = 'C'; + public final byte three = 3; + public final char d = 'D'; public JvmStaticTest() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.fir.txt index 2cfa5f5ebaf..bdbef9c1a1a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.fir.txt @@ -15,6 +15,7 @@ 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 = ""; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.fir.txt index 64d3f1898ce..df58a665c4f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.fir.txt @@ -13,19 +13,13 @@ @kotlin.Metadata() public final class Kt14996Kt { - public Kt14996Kt() { - super(); - } - @org.jetbrains.annotations.NotNull() - public static final java.lang.CharSequence crashMe(@org.jetbrains.annotations.NotNull() - java.util.List values) { + 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) { + public static final java.lang.String crashMe(@org.jetbrains.annotations.NotNull() java.util.List values) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.fir.txt index 317ad96e95b..f0d8968aff7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.fir.txt @@ -21,8 +21,8 @@ public class CrashMe { } } -//////////////////// +//////////////////// /** * package { @@ -61,10 +61,6 @@ public class CrashMe { @kotlin.Suppress(names = {"AMBIGUOUS_ANONYMOUS_TYPE_INFERRED"}) public final class Kt14997Kt { - public Kt14997Kt() { - super(); - } - @org.jetbrains.annotations.NotNull() public static final java.lang.Runnable a() { return null; @@ -90,19 +86,15 @@ public final class Kt14997Kt { return null; } - public static final void e1(@org.jetbrains.annotations.NotNull() - java.lang.CharSequence[] a) { + public static final void e1(@org.jetbrains.annotations.NotNull() java.lang.CharSequence[] a) { } - public static final void e2(@org.jetbrains.annotations.NotNull() - java.lang.Object[] a) { + public static final void e2(@org.jetbrains.annotations.NotNull() java.lang.Object[] a) { } - public static final void e3(@org.jetbrains.annotations.NotNull() - java.lang.CharSequence[] a) { + public static final void e3(@org.jetbrains.annotations.NotNull() java.lang.CharSequence[] a) { } - public static final void e3(@org.jetbrains.annotations.NotNull() - java.lang.Object[] a) { + public static final void e3(@org.jetbrains.annotations.NotNull() java.lang.Object[] a) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.fir.txt index 1928484129e..d4d4a77d9fc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.fir.txt @@ -24,10 +24,10 @@ public final class Outer { super(); } - public final void nonAbstract(@org.jetbrains.annotations.NotNull() - java.lang.String s, int i) { + public final void nonAbstract(@org.jetbrains.annotations.NotNull() java.lang.String s, int i) { } + /** * private final inner class Outer.Inner : kotlin/Any { * @@ -51,12 +51,11 @@ public final class Outer { private final class Inner { @org.jetbrains.annotations.NotNull() private final java.lang.String foo = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String bar = null; - public Inner(@org.jetbrains.annotations.NotNull() - java.lang.String foo, @org.jetbrains.annotations.NotNull() - java.lang.String bar) { + public Inner(@org.jetbrains.annotations.NotNull() java.lang.String foo, @org.jetbrains.annotations.NotNull() java.lang.String bar) { super(); } @@ -70,7 +69,6 @@ public final class Outer { return null; } } - /** * private final class Outer.Nested : kotlin/Any { * @@ -94,12 +92,11 @@ public final class Outer { private static final class Nested { @org.jetbrains.annotations.NotNull() private final java.lang.String foo = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String bar = null; - public Nested(@org.jetbrains.annotations.NotNull() - java.lang.String foo, @org.jetbrains.annotations.NotNull() - java.lang.String bar) { + public Nested(@org.jetbrains.annotations.NotNull() java.lang.String foo, @org.jetbrains.annotations.NotNull() java.lang.String bar) { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.fir.txt new file mode 100644 index 00000000000..a1a63cdfd1c --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.fir.txt @@ -0,0 +1,33 @@ +/** + * public abstract interface MyInterface : kotlin/Any { + * + * // signature: someFun()V + * public abstract fun someFun(): kotlin/Unit + * + * // nested class: MyDefaultInferface + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface MyInterface { + + public abstract void someFun(); + + /** + * private final class MyInterface.MyDefaultInferface : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ + @kotlin.Metadata() + static final class MyDefaultInferface { + + public MyDefaultInferface() { + super(); + } + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.fir.txt new file mode 100644 index 00000000000..4101a64f202 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.fir.txt @@ -0,0 +1,36 @@ +package test; + +/** + * internal final class test/MutableEntry : kotlin/collections/MutableMap.MutableEntry { + * + * // signature: (Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)V + * public constructor(internal: kotlin/collections/MutableMap, key: T#0, value: T#1) + * + * // field: key:Ljava/lang/Object; + * // getter: getKey()Ljava/lang/Object; + * public open val key: T#0 + * public open get + * + * // field: internal:Ljava/util/Map; + * private final val internal: kotlin/collections/MutableMap + * private final get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class MutableEntry implements java.util.Map.Entry, kotlin.jvm.internal.markers.KMutableMap.Entry { + @org.jetbrains.annotations.NotNull() + private final java.util.Map 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; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.fir.txt new file mode 100644 index 00000000000..15daac066b8 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.fir.txt @@ -0,0 +1,17 @@ +/** + * package { + * + * // signature: Date(D)Ljava/util/Date; + * public final fun Date(double: kotlin/Double): java/util/Date + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class Kt18377Kt { + + @org.jetbrains.annotations.NotNull() + public static final java.util.Date Date(double p0_1484504552) { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.fir.txt index ad74c259280..657dbb8d378 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.fir.txt @@ -15,8 +15,8 @@ public abstract class Foo { } } -//////////////////// +//////////////////// /** * package { @@ -39,10 +39,6 @@ public abstract class Foo { @kotlin.Metadata() public final class Kt18682Kt { - public Kt18682Kt() { - super(); - } - @org.jetbrains.annotations.NotNull() public static final java.util.List test1() { return null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.fir.txt new file mode 100644 index 00000000000..a067b4b08a0 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.fir.txt @@ -0,0 +1,20 @@ +package test; + +public abstract interface ListUpdateCallback { + + public abstract void onInserted(int position, int count); +} + + +//////////////////// + +package test; + +public final class Test { + @org.jetbrains.annotations.NotNull() + private final test.ListUpdateCallback x = null; + + public Test() { + super(); + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.fir.txt new file mode 100644 index 00000000000..4ae78f54b50 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.fir.txt @@ -0,0 +1,20 @@ +package test; + +public final class Test { + @org.jetbrains.annotations.NotNull() + private final test.TypedListUpdateCallback x = null; + + public Test() { + super(); + } +} + + +//////////////////// + +package test; + +public abstract interface TypedListUpdateCallback { + + public abstract void onInserted(@org.jetbrains.annotations.NotNull() C position, @org.jetbrains.annotations.NotNull() C count, @org.jetbrains.annotations.NotNull() T item); +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.fir.txt new file mode 100644 index 00000000000..50ea4d221b4 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.fir.txt @@ -0,0 +1,82 @@ +/** + * public final class Foo : kotlin/Any { + * + * // signature: (Ljava/lang/String;)V + * public constructor(string: kotlin/String) + * + * // field: bar:LFoo$Bar; + * // getter: getBar()LFoo$Bar; + * public final val bar: Foo.Bar + * public final get + * + * // field: string:Ljava/lang/String; + * private final val string: kotlin/String + * private final get + * + * // nested class: Bar + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class Foo { + @org.jetbrains.annotations.NotNull() + private final java.lang.String string = null; + + @org.jetbrains.annotations.NotNull() + private final Foo.Bar bar = null; + + public Foo(@org.jetbrains.annotations.NotNull() java.lang.String string) { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final Foo.Bar getBar() { + return null; + } + + /** + * public final class Foo.Bar : kotlin/Any { + * + * // signature: (Ljava/lang/String;)V + * public constructor(string: kotlin/String) + * + * // field: bars:Ljava/util/ArrayList; + * // getter: getBars()Ljava/util/ArrayList; + * public final val bars: java/util/ArrayList (* = kotlin/collections/ArrayList^ *) + * public final get + * + * // field: string:Ljava/lang/String; + * // getter: getString()Ljava/lang/String; + * public final val string: kotlin/String + * public final get + * + * // nested class: Bar + * + * // module name: main + * } + */ + @kotlin.Metadata() + public static final class Bar { + @org.jetbrains.annotations.NotNull() + private final java.lang.String string = null; + + @org.jetbrains.annotations.NotNull() + private final java.util.ArrayList bars = null; + + public Bar(@org.jetbrains.annotations.NotNull() java.lang.String string) { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getString() { + return null; + } + + @org.jetbrains.annotations.NotNull() + public final java.util.ArrayList getBars() { + return null; + } + + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.fir.txt new file mode 100644 index 00000000000..842f6df2f9b --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt25071.fir.txt @@ -0,0 +1,83 @@ +package kapt; + +/** + * public final class kapt/StaticImport : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // field: l:Lkapt/StaticMethod; + * // getter: getL()Lkapt/StaticMethod; + * public final val l: kapt/StaticMethod! + * public final get + * + * // field: m:Lkapt/StaticMethod; + * // getter: getM()Lkapt/StaticMethod; + * public final val m: kapt/StaticMethod! + * public final get + * + * // field: x:Ljava/util/Collection; + * // getter: getX()Ljava/util/Collection; + * public final val x: kotlin/collections/MutableCollection..kotlin/collections/Collection? + * public final get + * + * // field: y:I + * // getter: getY()I + * public final val y: kotlin/Int + * public final get + * + * // module name: main + * } + */ +@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 int y = 0; + + public StaticImport() { + super(); + } + + public final java.util.Collection getX() { + return null; + } + + public final kapt.StaticMethod getL() { + return null; + } + + public final kapt.StaticMethod getM() { + return null; + } + + public final int getY() { + return 0; + } +} + + +//////////////////// + +package my.lib; + +/** + * package { + * + * // signature: func(Ljava/lang/String;)I + * public final fun kotlin/String.func(): kotlin/Int + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class LibKt { + + public static final int func(@org.jetbrains.annotations.NotNull() java.lang.String $this$func) { + return 0; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.fir.txt index a6ad7262cc5..5caa4880f07 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.fir.txt @@ -24,37 +24,27 @@ package test; @kotlin.Metadata() public abstract class BundleProperty extends test.NullableBundleProperty { - public BundleProperty(@org.jetbrains.annotations.Nullable() - java.lang.String key) { + 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) { + 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() - public final AA getValue(@org.jetbrains.annotations.NotNull() - java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() - kotlin.reflect.KProperty property) { + public final AA getValue(@org.jetbrains.annotations.NotNull() java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty property) { return null; } @java.lang.Override() - public final void setNullableValue(@org.jetbrains.annotations.NotNull() - java.lang.Object bundle, @org.jetbrains.annotations.NotNull() - java.lang.String key, @org.jetbrains.annotations.Nullable() - AA value) { + public final void setNullableValue(@org.jetbrains.annotations.NotNull() java.lang.Object bundle, @org.jetbrains.annotations.NotNull() java.lang.String key, @org.jetbrains.annotations.Nullable() AA value) { } - public abstract void setValue(@org.jetbrains.annotations.NotNull() - java.lang.Object bundle, @org.jetbrains.annotations.NotNull() - java.lang.String key, AA value); + public abstract void setValue(@org.jetbrains.annotations.NotNull() java.lang.Object bundle, @org.jetbrains.annotations.NotNull() java.lang.String key, AA value); } + //////////////////// package test; @@ -72,17 +62,13 @@ package test; @kotlin.Suppress(names = {"NOTHING_TO_INLINE"}) public final class Kt27126Kt { - public Kt27126Kt() { - super(); - } - @org.jetbrains.annotations.NotNull() - public static final test.BundleProperty charSequence(@org.jetbrains.annotations.Nullable() - java.lang.String key) { + public static final test.BundleProperty charSequence(@org.jetbrains.annotations.Nullable() java.lang.String key) { return null; } } + //////////////////// package test; @@ -120,38 +106,26 @@ public abstract class NullableBundleProperty implem @org.jetbrains.annotations.Nullable() private final java.lang.String key = null; - public NullableBundleProperty(@org.jetbrains.annotations.Nullable() - java.lang.String key) { + public NullableBundleProperty(@org.jetbrains.annotations.Nullable() java.lang.String key) { super(); } - private final java.lang.String toKey(@org.jetbrains.annotations.NotNull() - kotlin.reflect.KProperty $this$toKey) { + private final java.lang.String toKey(@org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty $this$toKey) { return null; } @org.jetbrains.annotations.Nullable() @java.lang.Override() - public EE getValue(@org.jetbrains.annotations.NotNull() - java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() - kotlin.reflect.KProperty property) { + public EE getValue(@org.jetbrains.annotations.NotNull() java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty property) { return null; } @java.lang.Override() - public void setValue(@org.jetbrains.annotations.NotNull() - java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() - kotlin.reflect.KProperty property, @org.jetbrains.annotations.Nullable() - EE value) { + public void setValue(@org.jetbrains.annotations.NotNull() java.lang.Object thisRef, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty property, @org.jetbrains.annotations.Nullable() EE value) { } @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 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 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); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.fir.txt index e2d9d199378..9d7df488edb 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.fir.txt @@ -16,6 +16,7 @@ public abstract interface InterfaceWithDefaults { } } + //////////////////// package foo; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt32596.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt32596.fir.txt index 5b15f48e9f0..3f92db15133 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt32596.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt32596.fir.txt @@ -18,8 +18,8 @@ public abstract @interface Anno { public abstract java.lang.Class klass(); } -//////////////////// +//////////////////// /** * public final class ErrorMissingAnnotation : kotlin/Any { @@ -39,8 +39,8 @@ public final class ErrorMissingAnnotation { } } -//////////////////// +//////////////////// /** * public final class ErrorMultipleMissingAnnotations : kotlin/Any { @@ -61,8 +61,8 @@ public final class ErrorMultipleMissingAnnotations { } } -//////////////////// +//////////////////// /** * public final class ErrorSomeMissingAnnotations : kotlin/Any { @@ -84,8 +84,8 @@ public final class ErrorSomeMissingAnnotations { } } -//////////////////// +//////////////////// /** * public final class FullyQualifiedMissingAnnotation : kotlin/Any { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt43786.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt43786.fir.txt index d43e83410e5..f0bb87b6934 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt43786.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt43786.fir.txt @@ -22,6 +22,7 @@ @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class Application { public DataStore _preferencesDataStore; + @org.jetbrains.annotations.NotNull() public static final Application.Companion Companion = null; @@ -34,8 +35,7 @@ public final class Application { return null; } - public final void set_preferencesDataStore(@org.jetbrains.annotations.NotNull() - DataStore p0) { + public final void set_preferencesDataStore(@org.jetbrains.annotations.NotNull() DataStore p0) { } @kotlin.jvm.JvmStatic() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt61729.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt61729.fir.txt index 12a3c9e03b2..524d0ada40b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt61729.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt61729.fir.txt @@ -15,6 +15,7 @@ package a; public abstract @interface LinkifyMask { } + //////////////////// package a; @@ -40,24 +41,6 @@ public final class SphinxLinkify { super(); } - private final void addLinks(@LinkifyMask() - int mask) { - } -} - -//////////////////// - -package b; - -public @interface RestrictTo { - - Scope[] value(); - - public static enum Scope { - /*public static final*/ LIBRARY_GROUP_PREFIX /* = new Scope() */; - - private Scope() { - super(); - } + private final void addLinks(@LinkifyMask() int mask) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt65453.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt65453.fir.txt index eb03636dc24..cbd84c5a47a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt65453.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt65453.fir.txt @@ -14,8 +14,8 @@ public abstract @interface A { } -//////////////////// +//////////////////// /** * package { @@ -29,11 +29,6 @@ public abstract @interface A { @kotlin.Metadata() public final class Kt65453Kt { - public Kt65453Kt() { - super(); - } - - public static final void foo(@org.jetbrains.annotations.NotNull() - kotlin.jvm.functions.Function1, kotlin.Unit> callback) { + public static final void foo(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1, kotlin.Unit> callback) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.fir.txt index 82773c258b7..9d0fb0894f7 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.fir.txt @@ -31,10 +31,13 @@ public final class Foo { @org.jetbrains.annotations.NotNull() private final kotlin.Lazy foo$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy bar$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy baz$delegate = null; + @org.jetbrains.annotations.NotNull() private final kotlin.Lazy> generic1$delegate = null; @@ -59,8 +62,8 @@ public final class Foo { } } -//////////////////// +//////////////////// /** * public abstract interface GenericIntf : kotlin/Any { @@ -72,8 +75,8 @@ public final class Foo { public abstract interface GenericIntf { } -//////////////////// +//////////////////// /** * public abstract interface Intf : kotlin/Any { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.fir.txt new file mode 100644 index 00000000000..a2be702ac77 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.fir.txt @@ -0,0 +1,22 @@ +/** + * public abstract interface EntryHolder : kotlin/Any { + * + * // signature: entry(Ljava/util/Map$Entry;)Ljava/util/Map$Entry; + * public abstract fun entry(p: kotlin/collections/Map.Entry>): kotlin/collections/Map.Entry + * + * // getter: getEntryProperty()Ljava/util/Map$Entry; + * public abstract val entryProperty: kotlin/collections/Map.Entry + * public abstract get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface EntryHolder { + + @org.jetbrains.annotations.NotNull() + public abstract java.util.Map.Entry entry(@org.jetbrains.annotations.NotNull() java.util.Map.Entry> p); + + @org.jetbrains.annotations.NotNull() + public abstract java.util.Map.Entry getEntryProperty(); +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.fir.txt index f8dcd43d897..9c040356db3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.fir.txt @@ -17,8 +17,6 @@ public final class Test { super(); } - public final void a(@org.jetbrains.annotations.NotNull() - ABC a, @org.jetbrains.annotations.NotNull() - BCD b) { + public final void a(@org.jetbrains.annotations.NotNull() ABC a, @org.jetbrains.annotations.NotNull() BCD b) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.fir.txt index f5e181f244c..bb60ce6d8ae 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.fir.txt @@ -20,8 +20,7 @@ public abstract class Cls { super(); } - public abstract void foo(@org.jetbrains.annotations.NotNull() - java.lang.String abc); + public abstract void foo(@org.jetbrains.annotations.NotNull() java.lang.String abc); @org.jetbrains.annotations.NotNull() public final java.lang.String bar(int bcd) { @@ -29,8 +28,8 @@ public abstract class Cls { } } -//////////////////// +//////////////////// /** * public abstract interface Intf : kotlin/Any { @@ -47,8 +46,7 @@ public abstract class Cls { @kotlin.Metadata() public abstract interface Intf { - public abstract void foo(@org.jetbrains.annotations.NotNull() - java.lang.String abc); + public abstract void foo(@org.jetbrains.annotations.NotNull() java.lang.String abc); @org.jetbrains.annotations.NotNull() public default java.lang.String bar(int bcd) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.fir.txt index cb454b33120..9c63d3a70d4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.fir.txt @@ -17,6 +17,7 @@ public final class InternalClass { } } + //////////////////// package modifiers; @@ -31,6 +32,7 @@ package modifiers; public abstract interface InternalInterface { } + //////////////////// package modifiers; @@ -67,6 +69,7 @@ public final class Modifiers { @kotlin.jvm.Transient() @org.jetbrains.annotations.NotNull() private final transient java.lang.String transientField = ""; + @kotlin.jvm.Volatile() @org.jetbrains.annotations.NotNull() private volatile java.lang.String volatileField = ""; @@ -85,8 +88,7 @@ public final class Modifiers { return null; } - public final void setVolatileField(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setVolatileField(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } @kotlin.jvm.Strictfp() @@ -101,19 +103,18 @@ public final class Modifiers { @kotlin.jvm.JvmOverloads() @org.jetbrains.annotations.NotNull() - public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() - java.lang.String a) { + public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() java.lang.String a) { return null; } @kotlin.jvm.JvmOverloads() @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(@org.jetbrains.annotations.NotNull() java.lang.String a, int n) { return null; } } + //////////////////// package modifiers; @@ -135,6 +136,7 @@ final class PrivateClass { } } + //////////////////// package modifiers; @@ -149,6 +151,7 @@ package modifiers; abstract interface PrivateInterface { } + //////////////////// package modifiers; @@ -170,6 +173,7 @@ public final class PublicClass { } } + //////////////////// package modifiers; @@ -191,6 +195,7 @@ public abstract class PublicClassPrivateConstructor { } } + //////////////////// package modifiers; @@ -224,7 +229,6 @@ public class PublicClassProtectedConstructor { @kotlin.Metadata() protected static abstract interface ProtectedInterface { } - /** * private abstract interface modifiers/PublicClassProtectedConstructor.PrivateInterface : kotlin/Any { * @@ -236,6 +240,7 @@ public class PublicClassProtectedConstructor { } } + //////////////////// package modifiers; @@ -250,6 +255,7 @@ package modifiers; public abstract interface PublicInterface { } + //////////////////// package modifiers; @@ -294,7 +300,6 @@ public abstract class SealedClass { super(); } } - /** * public open class modifiers/SealedClass.Two : modifiers/SealedClass { * @@ -311,7 +316,6 @@ public abstract class SealedClass { super(); } } - /** * public abstract class modifiers/SealedClass.Three : modifiers/SealedClass.Two { * @@ -328,7 +332,6 @@ public abstract class SealedClass { super(); } } - /** * public final class modifiers/SealedClass.Four : modifiers/SealedClass.Three { * diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.fir.txt new file mode 100644 index 00000000000..2173fa1973d --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.fir.txt @@ -0,0 +1,34 @@ +package test; + +/** + * multi-file class { + * // test/M1__AKt + * // test/M1__BKt + * } + */ +@kotlin.Metadata() +public final class M1 { + + public static final void bar() { + } + + public static final void foo() { + } +} + + +//////////////////// + +package test; + +/** + * multi-file class { + * // test/M2__CKt + * } + */ +@kotlin.Metadata() +public final class M2 { + + public static final void baz() { + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.fir.txt new file mode 100644 index 00000000000..f10e27e8a6b --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClassDefaultPackage.fir.txt @@ -0,0 +1,61 @@ +/** + * public final class AnotherRootClass : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class AnotherRootClass { + + public AnotherRootClass() { + super(); + } +} + + +//////////////////// + +/** + * public final class RootClass : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class RootClass { + + public RootClass() { + super(); + } +} + + +//////////////////// + +package test; + +/** + * multi-file class { + * // test/M1__BKt + * // test/M1__CKt + * } + */ +@kotlin.Metadata() +public final class M1 { + + @org.jetbrains.annotations.Nullable() + public static final AnotherRootClass bar() { + return null; + } + + @org.jetbrains.annotations.Nullable() + public static final RootClass foo() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multipleTypeConstraints.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multipleTypeConstraints.fir.txt new file mode 100644 index 00000000000..84d0c3ce2e5 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/multipleTypeConstraints.fir.txt @@ -0,0 +1,68 @@ +/** + * public final class C : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class C { + + public C() { + super(); + } +} + + +//////////////////// + +/** + * public abstract interface I1 : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface I1 { +} + + +//////////////////// + +/** + * public abstract interface I2 : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface I2 { +} + + +//////////////////// + +/** + * public abstract interface I3 : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface I3 { +} + + +//////////////////// + +/** + * public abstract interface I4 : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface I4 { +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.fir.txt index a3be52a9a9c..a5816f4b422 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.fir.txt @@ -34,9 +34,7 @@ public final class A { } @org.jetbrains.annotations.Nullable() - public final A f1(@org.jetbrains.annotations.NotNull() - A a, @org.jetbrains.annotations.NotNull() - A.B b) { + public final A f1(@org.jetbrains.annotations.NotNull() A a, @org.jetbrains.annotations.NotNull() A.B b) { return null; } @@ -60,8 +58,9 @@ public final class A { @org.jetbrains.annotations.Nullable() public abstract A.B getY(); - } + + } /** * public final object A.C : kotlin/Any { * @@ -81,11 +80,12 @@ public final class A { private C() { super(); } + } } -//////////////////// +//////////////////// /** * public final class A2 : kotlin/Any { @@ -183,7 +183,6 @@ public final class A2 { super(); } } - /** * public final class A2.B.C.D.E : kotlin/Any { * @@ -205,8 +204,8 @@ public final class A2 { } } -//////////////////// +//////////////////// /** * public final class Foo : kotlin/Any { @@ -227,10 +226,11 @@ public final class Foo { public Foo() { super(); } + } -//////////////////// +//////////////////// /** * public final class Test : kotlin/Any { @@ -293,7 +293,6 @@ public final class Test { } } } - /** * public final inner class Test.Inner : kotlin/Any { * @@ -310,7 +309,6 @@ public final class Test { super(); } } - /** * public final object Test.NestedObject : kotlin/Any { * @@ -329,7 +327,6 @@ public final class Test { super(); } } - /** * public abstract interface Test.NestedInterface : kotlin/Any { * @@ -339,7 +336,6 @@ public final class Test { @kotlin.Metadata() public static abstract interface NestedInterface { } - /** * public final enum class Test.NestedEnum : kotlin/Enum { * @@ -357,8 +353,9 @@ public final class Test { */ @kotlin.Metadata() public static enum NestedEnum { - /*public static final*/ BLACK /* = new NestedEnum() */, - /*public static final*/ WHITE /* = new NestedEnum() */; + BLACK, + WHITE; + NestedEnum() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.fir.txt index 8cc6d139af6..aff44010ac5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.fir.txt @@ -42,12 +42,16 @@ public final class NonExistentType { @org.jetbrains.annotations.NotNull() public static final NonExistentType INSTANCE = null; + @org.jetbrains.annotations.NotNull() private static final ABCDEF 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.NotNull() private static final ABCDEF, kotlin.Unit>> d = null; @@ -81,15 +85,12 @@ public final class NonExistentType { } @org.jetbrains.annotations.NotNull() - public final ABCDEF a(@org.jetbrains.annotations.NotNull() - ABCDEF a, @org.jetbrains.annotations.NotNull() - java.lang.String s) { + 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) { + public final ABCDEF b(@org.jetbrains.annotations.NotNull() java.lang.String s) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.fir.txt index 39e76e3cc39..698315eb4bb 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.fir.txt @@ -17,8 +17,8 @@ public final class NonExistentClassWIthoutCorrectionKt { } -//////////////////// +//////////////////// /** * public final object NonExistentType : kotlin/Any { @@ -101,19 +101,29 @@ public final class NonExistentClassWIthoutCorrectionKt { public final class NonExistentType { @org.jetbrains.annotations.NotNull() public static final NonExistentType INSTANCE = null; + @org.jetbrains.annotations.NotNull() private static final ABCDEF 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.NotNull() private static final ABCDEF, kotlin.Unit>> d = null; + public static java.lang.String string2; + public static ABC coocoo; + public static ABC coocoo2; + public static ABC coocoo21; + public static ABC coocoo3; + public static ABC> coocoo31; private NonExistentType() { @@ -145,8 +155,7 @@ public final class NonExistentType { return null; } - public final void setString2(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setString2(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } @org.jetbrains.annotations.NotNull() @@ -154,8 +163,7 @@ public final class NonExistentType { return null; } - public final void setCoocoo(@org.jetbrains.annotations.NotNull() - ABC p0) { + public final void setCoocoo(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() @@ -163,8 +171,7 @@ public final class NonExistentType { return null; } - public final void setCoocoo2(@org.jetbrains.annotations.NotNull() - ABC p0) { + public final void setCoocoo2(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() @@ -172,8 +179,7 @@ public final class NonExistentType { return null; } - public final void setCoocoo21(@org.jetbrains.annotations.NotNull() - ABC p0) { + public final void setCoocoo21(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() @@ -181,8 +187,7 @@ public final class NonExistentType { return null; } - public final void setCoocoo3(@org.jetbrains.annotations.NotNull() - ABC p0) { + public final void setCoocoo3(@org.jetbrains.annotations.NotNull() ABC p0) { } @org.jetbrains.annotations.NotNull() @@ -190,20 +195,16 @@ public final class NonExistentType { return null; } - public final void setCoocoo31(@org.jetbrains.annotations.NotNull() - ABC> p0) { + public final void setCoocoo31(@org.jetbrains.annotations.NotNull() ABC> p0) { } @org.jetbrains.annotations.NotNull() - public final ABCDEF a(@org.jetbrains.annotations.NotNull() - ABCDEF a, @org.jetbrains.annotations.NotNull() - java.lang.String s) { + 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) { + public final ABCDEF b(@org.jetbrains.annotations.NotNull() java.lang.String s) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.fir.txt index c88492b2f65..c4492013744 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.fir.txt @@ -143,38 +143,69 @@ 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 = 0; + public static final byte byte50 = 50; + public static final short short5 = 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 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; + + 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 floatPositiveInfinity = 1.0F / 0.0F; + 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"; + public static final java.lang.String stringQuotes = "quotes \" ''quotes"; + @org.jetbrains.annotations.NotNull() public static final java.lang.String stringRN = "\r\n"; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/properties.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/properties.fir.txt index 3cb7836e835..27199bed358 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/properties.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/properties.fir.txt @@ -52,18 +52,24 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.String simple = "123"; + @org.jetbrains.annotations.NotNull() private final java.lang.String inferType = null; + @org.jetbrains.annotations.NotNull() private final java.lang.String getter = "O"; + @org.jetbrains.annotations.NotNull() private final java.lang.Class constJavaClassValue = null; + @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass constClassValue = null; - @java.lang.Deprecated() + + @java.lang.Deprecated private boolean isBoolean = false; + @org.jetbrains.annotations.NotNull() - @java.lang.Deprecated() + @java.lang.Deprecated private kotlin.Unit unit; public Test() { @@ -95,7 +101,7 @@ public final class Test { return null; } - @java.lang.Deprecated() + @java.lang.Deprecated public final boolean isBoolean() { return false; } @@ -105,12 +111,12 @@ public final class Test { public static void isBoolean$annotations() { } - @java.lang.Deprecated() + @java.lang.Deprecated public final void setBoolean(boolean p0) { } @org.jetbrains.annotations.NotNull() - @java.lang.Deprecated() + @java.lang.Deprecated public final kotlin.Unit getUnit() { return null; } @@ -120,8 +126,7 @@ public final class Test { public static void getUnit$annotations() { } - @java.lang.Deprecated() - public final void setUnit(@org.jetbrains.annotations.NotNull() - kotlin.Unit p0) { + @java.lang.Deprecated + public final void setUnit(@org.jetbrains.annotations.NotNull() kotlin.Unit p0) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.fir.txt index b242cdafbc9..321dd941ffe 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.fir.txt @@ -12,8 +12,8 @@ public abstract @interface Anno { } -//////////////////// +//////////////////// /** * public final annotation class Anno2 : kotlin/Annotation { @@ -31,8 +31,8 @@ public abstract @interface Anno { public abstract @interface Anno2 { } -//////////////////// +//////////////////// /** * public final class Test : kotlin/Any { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.fir.txt index 0169b1ea605..7967b3de5a9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.fir.txt @@ -1,24 +1,3 @@ -package androidx.annotation; - -public interface Box { - - @RecentlyNullable() - public String foo(); -} - -//////////////////// - -package androidx.annotation; - -import java.lang.annotation.*; - -@Retention(value = RetentionPolicy.CLASS) -@Target(value = {ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) -@interface RecentlyNullable { -} - -//////////////////// - package app; /** @@ -49,8 +28,7 @@ public final class KBox implements androidx.annotation.Box { return null; } - public KBox(@org.jetbrains.annotations.NotNull() - androidx.annotation.Box delegate) { + public KBox(@org.jetbrains.annotations.NotNull() androidx.annotation.Box delegate) { super(); } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.fir.txt index aa7a69d0298..970fc87bd61 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.fir.txt @@ -24,8 +24,8 @@ public abstract @interface AnnoArray { public abstract java.lang.String[] a(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoBoolean : kotlin/Annotation { @@ -53,8 +53,8 @@ public abstract @interface AnnoBoolean { public abstract boolean bool(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoChar : kotlin/Annotation { @@ -82,8 +82,8 @@ public abstract @interface AnnoChar { public abstract char chr(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoClass : kotlin/Annotation { @@ -111,8 +111,8 @@ public abstract @interface AnnoClass { public abstract java.lang.Class c(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoDouble : kotlin/Annotation { @@ -140,8 +140,8 @@ public abstract @interface AnnoDouble { public abstract double dbl(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoEnum : kotlin/Annotation { @@ -169,8 +169,8 @@ public abstract @interface AnnoEnum { public abstract Color c(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoFloat : kotlin/Annotation { @@ -198,8 +198,8 @@ public abstract @interface AnnoFloat { public abstract float flt(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoInt : kotlin/Annotation { @@ -227,8 +227,8 @@ public abstract @interface AnnoInt { public abstract int i(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoIntArray : kotlin/Annotation { @@ -256,8 +256,8 @@ public abstract @interface AnnoIntArray { public abstract int[] b(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoLong : kotlin/Annotation { @@ -285,8 +285,8 @@ public abstract @interface AnnoLong { public abstract long l(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoLongArray : kotlin/Annotation { @@ -314,8 +314,8 @@ public abstract @interface AnnoLongArray { public abstract long[] b(); } -//////////////////// +//////////////////// /** * public final annotation class AnnoString : kotlin/Annotation { @@ -343,8 +343,8 @@ public abstract @interface AnnoString { public abstract java.lang.String s(); } -//////////////////// +//////////////////// /** * public final enum class Color : kotlin/Enum { @@ -361,7 +361,8 @@ public abstract @interface AnnoString { */ @kotlin.Metadata() public enum Color { - /*public static final*/ BLACK /* = new Color() */; + BLACK; + Color() { } @@ -372,8 +373,8 @@ public enum Color { } } -//////////////////// +//////////////////// /** * public final class Test : kotlin/Any { @@ -412,8 +413,8 @@ public final class Test { } } -//////////////////// +//////////////////// /** * public final class Test2 : kotlin/Any { @@ -428,7 +429,7 @@ public final class Test { @AnnoChar(x = 100, chr = 'c') @AnnoBoolean(x = 100, bool = false) @AnnoInt(x = 100, i = 5) -@AnnoFloat(x = 100, flt = 1.0F) +@AnnoFloat(x = 100, flt = 1.0f) @AnnoDouble(x = 100, dbl = 4.0) @AnnoString(x = 100, s = "AAA") @AnnoIntArray(x = 100, b = {1, 2, 3}) @@ -441,33 +442,3 @@ public final class Test2 { super(); } } - -//////////////////// - -package lib; - -public @interface Anno { - - String[] construct() default {}; - - String value(); -} - -//////////////////// - -package lib; - -public class R { - - public R() { - super(); - } - - public static class id { - - public id() { - super(); - } - public static final int textView = 100; - } -} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.fir.txt index a3a7a345f96..fb112edaaf3 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.fir.txt @@ -17,6 +17,7 @@ public abstract interface Named { public abstract java.lang.String getName(); } + //////////////////// package secondary; @@ -48,12 +49,10 @@ public final class Product2 implements secondary.Named { return null; } - public void setName(@org.jetbrains.annotations.Nullable() - java.lang.String p0) { + public void setName(@org.jetbrains.annotations.Nullable() java.lang.String p0) { } - public Product2(@org.jetbrains.annotations.NotNull() - java.lang.String otherName) { + public Product2(@org.jetbrains.annotations.NotNull() java.lang.String otherName) { super(); } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.fir.txt new file mode 100644 index 00000000000..6619f206e5e --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.fir.txt @@ -0,0 +1,38 @@ +package test; + +/** + * package { + * + * // signature: foo()V + * public final fun foo(): kotlin/Unit + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class AKt { + + public static final void foo() { + } +} + + +//////////////////// + +package test; + +/** + * package { + * + * // signature: bar()V + * public final fun bar(): kotlin/Unit + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class BKt { + + public static final void bar() { + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/starImports.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/starImports.fir.txt index 315e14563cc..ee89a406b8a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/starImports.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/starImports.fir.txt @@ -13,10 +13,6 @@ */ @kotlin.Metadata() public final class ResolvedKt { - - public ResolvedKt() { - super(); - } @org.jetbrains.annotations.Nullable() private static kotlin.io.encoding.Base64 base64 = null; @@ -25,13 +21,12 @@ public final class ResolvedKt { return null; } - public static final void setBase64(@org.jetbrains.annotations.Nullable() - kotlin.io.encoding.Base64 p0) { + public static final void setBase64(@org.jetbrains.annotations.Nullable() kotlin.io.encoding.Base64 p0) { } } -//////////////////// +//////////////////// import kotlin.io.encoding.*; @@ -51,10 +46,6 @@ import kotlin.io.encoding.*; @kotlin.Metadata() @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"}) public final class UnresolvedKt { - - public UnresolvedKt() { - super(); - } @org.jetbrains.annotations.NotNull() private static Base65 base65 = null; @@ -63,7 +54,6 @@ public final class UnresolvedKt { return null; } - public static final void setBase65(@org.jetbrains.annotations.NotNull() - Base65 p0) { + public static final void setBase65(@org.jetbrains.annotations.NotNull() Base65 p0) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.fir.txt index 296868a9a78..922091de71e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.fir.txt @@ -26,10 +26,11 @@ public abstract @interface Anno { public abstract StrangeEnum size(); public abstract java.lang.String name(); + } -//////////////////// +//////////////////// /** * public final enum class StrangeEnum : kotlin/Enum { @@ -57,7 +58,8 @@ public abstract @interface Anno { */ @kotlin.Metadata() public enum StrangeEnum { - /*public static final*/ InvalidFieldName /* = new StrangeEnum() */; + InvalidFieldName; + @org.jetbrains.annotations.NotNull() private final java.lang.String size = null; @@ -75,8 +77,8 @@ public enum StrangeEnum { } } -//////////////////// +//////////////////// /** * public final class Test : kotlin/Any { @@ -115,6 +117,7 @@ public enum StrangeEnum { public final class Test { public final java.lang.String simpleName = null; + public Test() { super(); } @@ -124,17 +127,16 @@ public final class Test { return null; } + public final void simpleFun() { } @Anno(name = "Woofwoof", size = StrangeEnum.InvalidFieldName) - public final void simpleFun2(@org.jetbrains.annotations.NotNull() - java.lang.String a, @org.jetbrains.annotations.NotNull() - java.lang.String b) { + public final void simpleFun2(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() java.lang.String b) { } - public final void strangeFun4(@org.jetbrains.annotations.NotNull() - java.lang.String a, @org.jetbrains.annotations.NotNull() - java.lang.String p1_949560896) { + + public final void strangeFun4(@org.jetbrains.annotations.NotNull() java.lang.String a, @org.jetbrains.annotations.NotNull() java.lang.String p1_949560896) { } + } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.fir.txt index 834a527c162..a2756374152 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.fir.txt @@ -1,7 +1,6 @@ public abstract class BaseClass { - public BaseClass(@org.jetbrains.annotations.NotNull() - Context context, int num, boolean bool) { + public BaseClass(@org.jetbrains.annotations.NotNull() Context context, int num, boolean bool) { super(); } @@ -9,19 +8,18 @@ public abstract class BaseClass { public abstract Result doJob(); } -//////////////////// +//////////////////// public abstract interface Context { } -//////////////////// +//////////////////// public final class Inheritor extends BaseClass { - public Inheritor(@org.jetbrains.annotations.NotNull() - Context context) { + public Inheritor(@org.jetbrains.annotations.NotNull() Context context) { super(null, 0, false); } @@ -32,12 +30,13 @@ public final class Inheritor extends BaseClass { } } + //////////////////// - public enum Result { - /*public static final*/ SUCCESS /* = new Result() */, - /*public static final*/ ERROR /* = new Result() */; + SUCCESS, + ERROR; + Result() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/superConstructorCall.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/superConstructorCall.fir.txt new file mode 100644 index 00000000000..a83a9ac7292 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/superConstructorCall.fir.txt @@ -0,0 +1,52 @@ +package test; + +/** + * public abstract class test/A : kotlin/Any { + * + * // signature: (Ljava/lang/String;)V + * public constructor(s: kotlin/String) + * + * // field: s:Ljava/lang/String; + * // getter: getS()Ljava/lang/String; + * public final val s: kotlin/String + * public final get + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract class A { + @org.jetbrains.annotations.NotNull() + private final java.lang.String s = null; + + public A(@org.jetbrains.annotations.NotNull() java.lang.String s) { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getS() { + return null; + } +} + + +//////////////////// + +package test; + +/** + * public final class test/B : test/A { + * + * // signature: ()V + * public constructor() + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class B extends test.A { + + public B() { + super(null); + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.fir.txt new file mode 100644 index 00000000000..1a75a39fe65 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.fir.txt @@ -0,0 +1,48 @@ +/** + * public open class Test : kotlin/Any { + * + * // signature: ()V + * public constructor() + * + * // signature: getTest(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + * public open suspend fun getTest(text: kotlin/String): kotlin/String + * + * // signature: getTestInvalid(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + * public open suspend fun getTestInvalid(te xt: kotlin/String): kotlin/String + * + * // signature: getTestNoSuspend(Ljava/lang/String;)Ljava/lang/String; + * public open fun getTestNoSuspend(text: kotlin/String): kotlin/String + * + * // signature: getTestNoSuspendInvalid(Ljava/lang/String;)Ljava/lang/String; + * public open fun getTestNoSuspendInvalid(te xt: kotlin/String): kotlin/String + * + * // module name: main + * } + */ +@kotlin.Metadata() +public class Test { + + public Test() { + super(); + } + + @org.jetbrains.annotations.NotNull() + public java.lang.String getTestNoSuspend(@org.jetbrains.annotations.NotNull() java.lang.String text) { + return null; + } + + @org.jetbrains.annotations.Nullable() + public java.lang.Object getTest(@org.jetbrains.annotations.NotNull() java.lang.String text, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation $completion) { + return null; + } + + @org.jetbrains.annotations.NotNull() + public java.lang.String getTestNoSuspendInvalid(@org.jetbrains.annotations.NotNull() java.lang.String p0_55085957) { + return null; + } + + @org.jetbrains.annotations.Nullable() + public java.lang.Object getTestInvalid(@org.jetbrains.annotations.NotNull() java.lang.String p0_55085957, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation $completion) { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.fir.txt index 5f1190e68af..5c0776c658b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.fir.txt @@ -21,8 +21,7 @@ public final class Foo { } @org.jetbrains.annotations.Nullable() - public final java.lang.Object a(@org.jetbrains.annotations.NotNull() - kotlin.coroutines.Continuation $completion) { + public final java.lang.Object a(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation $completion) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendFunctionWithBigArity.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendFunctionWithBigArity.fir.txt new file mode 100644 index 00000000000..4c81598c0e1 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/suspendFunctionWithBigArity.fir.txt @@ -0,0 +1,30 @@ +/** + * public abstract interface Flow : kotlin/Any { + * + * // module name: main + * } + */ +@kotlin.Metadata() +public abstract interface Flow { +} + + +//////////////////// + +/** + * package { + * + * // signature: combine(LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;LFlow;Lkotlin/jvm/functions/FunctionN;)LFlow; + * public final fun combine(flow: Flow, flow2: Flow, flow3: Flow, flow4: Flow, flow5: Flow, flow6: Flow, flow7: Flow, flow8: Flow, flow9: Flow, flow10: Flow, flow11: Flow, flow12: Flow, flow13: Flow, flow14: Flow, flow15: Flow, flow16: Flow, flow17: Flow, flow18: Flow, flow19: Flow, flow20: Flow, flow21: Flow, flow22: Flow, flow23: Flow, transform: suspend kotlin/Function24, kotlin/Any?>): Flow + * + * // module name: main + * } + */ +@kotlin.Metadata() +public final class SuspendFunctionWithBigArityKt { + + @org.jetbrains.annotations.NotNull() + public static final Flow combine(@org.jetbrains.annotations.NotNull() Flow flow, @org.jetbrains.annotations.NotNull() Flow flow2, @org.jetbrains.annotations.NotNull() Flow flow3, @org.jetbrains.annotations.NotNull() Flow flow4, @org.jetbrains.annotations.NotNull() Flow flow5, @org.jetbrains.annotations.NotNull() Flow flow6, @org.jetbrains.annotations.NotNull() Flow flow7, @org.jetbrains.annotations.NotNull() Flow flow8, @org.jetbrains.annotations.NotNull() Flow flow9, @org.jetbrains.annotations.NotNull() Flow flow10, @org.jetbrains.annotations.NotNull() Flow flow11, @org.jetbrains.annotations.NotNull() Flow flow12, @org.jetbrains.annotations.NotNull() Flow flow13, @org.jetbrains.annotations.NotNull() Flow flow14, @org.jetbrains.annotations.NotNull() Flow flow15, @org.jetbrains.annotations.NotNull() Flow flow16, @org.jetbrains.annotations.NotNull() Flow flow17, @org.jetbrains.annotations.NotNull() Flow flow18, @org.jetbrains.annotations.NotNull() Flow flow19, @org.jetbrains.annotations.NotNull() Flow flow20, @org.jetbrains.annotations.NotNull() Flow flow21, @org.jetbrains.annotations.NotNull() Flow flow22, @org.jetbrains.annotations.NotNull() Flow flow23, @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.FunctionN transform) { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.fir.txt index 67bb1b00f74..c85389b1bab 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.fir.txt @@ -20,6 +20,7 @@ public abstract @interface Anno { public abstract java.lang.String value(); } + //////////////////// package test.another; @@ -61,26 +62,15 @@ package test.another; */ @kotlin.Metadata() public final class TopLevelKt { - - public TopLevelKt() { - super(); - } public static final int topLevelConstProperty = 2; + private static final int topLevelProperty = 2; - public static final void extensionFunction(@Anno(value = "rec") - @org.jetbrains.annotations.NotNull() - java.lang.String $this$extensionFunction, @Anno(value = "1") - @org.jetbrains.annotations.NotNull() - java.lang.String a, @Anno(value = "2") - @org.jetbrains.annotations.NotNull() - java.lang.String b) { + public static final void extensionFunction(@Anno(value = "rec") @org.jetbrains.annotations.NotNull() java.lang.String $this$extensionFunction, @Anno(value = "1") @org.jetbrains.annotations.NotNull() java.lang.String a, @Anno(value = "2") @org.jetbrains.annotations.NotNull() java.lang.String b) { } @org.jetbrains.annotations.NotNull() - public static final java.lang.String getExtensionProperty(@Anno(value = "propRec") - @org.jetbrains.annotations.NotNull() - T $this$extensionProperty) { + public static final java.lang.String getExtensionProperty(@Anno(value = "propRec") @org.jetbrains.annotations.NotNull() T $this$extensionProperty) { return null; } @@ -98,11 +88,7 @@ public final class TopLevelKt { return null; } - public static final void setExtensionProperty(@Anno(value = "propRec") - @org.jetbrains.annotations.NotNull() - T $this$extensionProperty, @Anno(value = "setparam") - @org.jetbrains.annotations.NotNull() - java.lang.String setParamName) { + public static final void setExtensionProperty(@Anno(value = "propRec") @org.jetbrains.annotations.NotNull() T $this$extensionProperty, @Anno(value = "setparam") @org.jetbrains.annotations.NotNull() java.lang.String setParamName) { } @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/typeAnnotations.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/typeAnnotations.fir.txt index c3d69f6236f..b411df3e07f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/typeAnnotations.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/typeAnnotations.fir.txt @@ -16,6 +16,7 @@ package org.jetbrains; public abstract @interface A { } + //////////////////// package org.jetbrains; @@ -56,6 +57,7 @@ public final class Outer { } } + //////////////////// package org.jetbrains; @@ -72,14 +74,8 @@ package org.jetbrains; @kotlin.Metadata() public final class TypeAnnotationsKt { - public TypeAnnotationsKt() { - super(); - } - @org.jetbrains.annotations.NotNull() - public static final java.lang.String foo(@org.jetbrains.annotations.NotNull() - java.util.List x, @org.jetbrains.annotations.NotNull() - org.jetbrains.Outer.Inner y, int z) { + public static final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.util.List x, @org.jetbrains.annotations.NotNull() org.jetbrains.Outer.Inner y, int z) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unresolvedDelegateExpression.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unresolvedDelegateExpression.fir.txt index 76dc88e397b..891b6398369 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unresolvedDelegateExpression.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unresolvedDelegateExpression.fir.txt @@ -34,8 +34,8 @@ public final class B implements NonExisting { } } -//////////////////// +//////////////////// /** * public open class C : kotlin/Any { @@ -54,8 +54,8 @@ public class C { } } -//////////////////// +//////////////////// /** * public final class D : I { @@ -75,8 +75,8 @@ public final class D implements I { } } -//////////////////// +//////////////////// /** * public final class E : error/NonExistentClass { @@ -96,8 +96,8 @@ public final class E implements NonExisting { } } -//////////////////// +//////////////////// /** * public abstract interface I : kotlin/Any { @@ -109,8 +109,8 @@ public final class E implements NonExisting { public abstract interface I { } -//////////////////// +//////////////////// /** * package { @@ -125,8 +125,7 @@ public abstract interface I { public final class UnresolvedDelegateExpressionKt { @org.jetbrains.annotations.NotNull() - public static final java.lang.String flaf(@org.jetbrains.annotations.NotNull() - C $this$flaf) { + public static final java.lang.String flaf(@org.jetbrains.annotations.NotNull() C $this$flaf) { return null; } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.fir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.fir.txt index 6110f0629ce..51204c635f4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.fir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.fir.txt @@ -19,6 +19,7 @@ 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; @@ -37,8 +38,8 @@ public final class Boo { } } -//////////////////// +//////////////////// /** * public final object Foo : kotlin/Any { @@ -125,25 +126,39 @@ public final class Boo { public final class Foo { @org.jetbrains.annotations.NotNull() public static final Foo INSTANCE = null; + @org.jetbrains.annotations.NotNull() public static final java.lang.String aString = "foo"; + public static final int aInt = 3; + @org.jetbrains.annotations.NotNull() private static final java.lang.String bString = "bar"; + private static final int bInt = 5; + @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; + private static final int f = 8; + @org.jetbrains.annotations.NotNull() private static final java.lang.String g = "ab"; + private static final int h = -4; + private static final int i = 2147483647; + @org.jetbrains.annotations.NotNull() private static final java.lang.String j = null; + @org.jetbrains.annotations.NotNull() private static final java.lang.String k = null; @@ -165,8 +180,7 @@ public final class Foo { return null; } - public final void setCString(@org.jetbrains.annotations.NotNull() - java.lang.String p0) { + public final void setCString(@org.jetbrains.annotations.NotNull() java.lang.String p0) { } public final int getCInt() { @@ -213,8 +227,8 @@ public final class Foo { } } -//////////////////// +//////////////////// /** * public final class HavingState : kotlin/Any { @@ -294,27 +308,39 @@ public final class Foo { public final class HavingState { @org.jetbrains.annotations.NotNull() private final State state = State.START; + @org.jetbrains.annotations.NotNull() private final State[] stateArray = {State.START}; + @org.jetbrains.annotations.NotNull() 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}; + 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; + @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass clazz = null; + @org.jetbrains.annotations.NotNull() private final java.lang.Class javaClass = null; + @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass anonymous = null; @@ -387,8 +413,8 @@ public final class HavingState { } } -//////////////////// +//////////////////// /** * public final enum class State : kotlin/Enum { @@ -407,8 +433,9 @@ public final class HavingState { */ @kotlin.Metadata() public enum State { - /*public static final*/ START /* = new State() */, - /*public static final*/ FINISH /* = new State() */; + START, + FINISH; + State() { } diff --git a/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/StubGenerator.kt b/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/StubGenerator.kt index c459886f90d..72f47aaa2f4 100644 --- a/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/StubGenerator.kt +++ b/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/StubGenerator.kt @@ -158,6 +158,7 @@ private class StubGenerator( } private fun Printer.printImports(file: KtFile) { + var hasImports = false if (unresolvedSimpleNames.isEmpty()) return val importedShortNames = mutableSetOf() @@ -176,7 +177,6 @@ private class StubGenerator( if (!acceptableByName) continue - val importedReference = importDirective.importedReference ?.getCalleeExpressionIfAny() ?.references @@ -197,7 +197,9 @@ private class StubGenerator( importedShortNames.add(importedFqName.shortName().asString()) -> printWithNoIndent(importedFqName) } printlnWithNoIndent(";") + hasImports = true } + if (hasImports) printlnWithNoIndent() } private inner class ClassGenerator(private val psiClass: PsiClass) { @@ -216,7 +218,6 @@ private class StubGenerator( else -> "class" } calculateMetadata(psiClass)?.let { printMetadata(it) } - printIndent() printModifiers(psiClass) printWithNoIndent(classWord, " ", simpleName) printTypeParams(psiClass.typeParameters) @@ -245,7 +246,7 @@ private class StubGenerator( printType(type) } } - printlnWithNoIndent("{") + printlnWithNoIndent(" {") pushIndent() if (psiClass.isEnum) { @@ -270,8 +271,9 @@ private class StubGenerator( .onEach { lineMappings.registerField(psiClass, it) } .associateWith { MemberData(it.name, it.signature, lineMappings.getPosition(psiClass, it)) } - fieldsPositions.keys.sortedWith(MembersPositionComparator(classPosition, fieldsPositions)).forEach { - printField(it) + fieldsPositions.keys.sortedWith(MembersPositionComparator(classPosition, fieldsPositions)).forEachIndexed { index, field -> + if (index > 0) printlnWithNoIndent() + printField(field) } val methodsPositions = psiClass.methods @@ -283,16 +285,18 @@ private class StubGenerator( .onEach { lineMappings.registerMethod(psiClass, it) } .associateWith { MemberData(it.name, it.signature, lineMappings.getPosition(psiClass, it)) } - if (fieldsPositions.isNotEmpty() && methodsPositions.isNotEmpty()) printlnWithNoIndent() + if (methodsPositions.isNotEmpty()) printlnWithNoIndent() methodsPositions.keys.sortedWith(MembersPositionComparator(classPosition, methodsPositions)) - .forEach { - lineMappings.registerSignature(javacSignature(it), it) - printMethod(it) + .forEachIndexed { index, method -> + lineMappings.registerSignature(javacSignature(method), method) + if (index > 0) printlnWithNoIndent() + printMethod(method) } if (psiClass.innerClasses.isNotEmpty() && (fieldsPositions.isNotEmpty() || methodsPositions.isNotEmpty())) println() - psiClass.innerClasses.forEach { - with(ClassGenerator(it)) { printClass() } + psiClass.innerClasses.forEachIndexed { i, innerClass -> + if (i > 0) printWithNoIndent() + with(ClassGenerator(innerClass)) { printClass() } } popIndent() println("}") @@ -305,7 +309,7 @@ private class StubGenerator( comment.split("\n").forEach { println(" * ", it) } - println("*/") + println(" */") } } @@ -322,7 +326,6 @@ private class StubGenerator( printWithNoIndent(" = ", defaultValue(field.type)) } printlnWithNoIndent(";") - printlnWithNoIndent() } private fun Printer.printMethod(method: PsiMethod) { @@ -384,8 +387,6 @@ private class StubGenerator( popIndent() println("}") } - - printlnWithNoIndent() } private fun javacSignature(method: PsiMethod) = printToString { @@ -434,7 +435,12 @@ private class StubGenerator( } private fun Printer.printTypeSignature(type: PsiType, annotated: Boolean) { - printWithNoIndent((if (type is PsiClassType && isErroneous(type)) type.rawType() else type).getCanonicalText(annotated).replace('$', '.')) + printWithNoIndent( + (if (type is PsiClassType && isErroneous(type)) type.rawType() else type) + .getCanonicalText(annotated) + .replace('$', '.') + .replace(",", ", ") + ) } private fun Printer.printTypeParams(typeParameters: Array) { @@ -571,7 +577,7 @@ private class StubGenerator( } printWithNoIndent("}") } - is PsiAnnotation -> printToString { printAnnotation(v, false) } + is PsiAnnotation -> printToString { printAnnotation(v, false) }.trim() else -> v.text } } ?: return diff --git a/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Handler.kt b/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Handler.kt index ec7f306b04c..3fdc758b693 100644 --- a/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Handler.kt +++ b/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Handler.kt @@ -20,13 +20,11 @@ import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.EXPECTED_ERROR import org.jetbrains.kotlin.kapt3.test.handlers.ClassFileToSourceKaptStubHandler import org.jetbrains.kotlin.kapt3.test.handlers.removeMetadataAnnotationContents import org.jetbrains.kotlin.kapt3.test.messageCollectorProvider -import org.jetbrains.kotlin.kapt3.util.prettyPrint import org.jetbrains.kotlin.test.Assertions import org.jetbrains.kotlin.test.model.AnalysisHandler import org.jetbrains.kotlin.test.model.TestArtifactKind import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices -import org.jetbrains.kotlin.test.services.getRealJavaFiles import org.jetbrains.kotlin.test.services.sourceFileProvider import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF import org.jetbrains.kotlin.test.utils.withExtension @@ -46,13 +44,13 @@ internal class Kapt4Handler(testServices: TestServices) : AnalysisHandler { val (kaptContext, kaptStubs) = info val convertedFiles = kaptStubs.mapIndexed { index, stub -> @@ -121,16 +118,13 @@ internal class Kapt4Handler(testServices: TestServices) : AnalysisHandler 0, "parseFiles()" returns the empty list val oldErrorCount = kaptContext.compiler.log.nerrors kaptContext.compiler.log.nerrors = 0 try { - val parsedJavaFiles = kaptContext.parseJavaFiles(allJavaFiles) + val parsedJavaFiles = kaptContext.parseJavaFiles(convertedFiles) for (tree in parsedJavaFiles) { val actualFile = File(tree.sourceFile.toUri())