From 6521729466a16157eb5542c72f6b0a40e82f7a81 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 31 May 2023 15:05:58 +0300 Subject: [PATCH] [Test] Update dumps of fir metadata where it differs on different platforms --- ... SelfReferentialAnnotation.fir.k1.jvm.txt} | 0 .../SelfReferentialAnnotation.fir.k2.jvm.txt | 34 ++++++++++++++ .../SelfReferentialAnnotation.fir.k2.klib.txt | 34 ++++++++++++++ .../annotations/SelfReferentialAnnotation.kt | 3 +- ...> ClassObjectPropertyField.fir.k1.jvm.txt} | 0 .../ClassObjectPropertyField.fir.k2.jvm.txt | 18 ++++++++ .../ClassObjectPropertyField.fir.k2.klib.txt | 18 ++++++++ .../classMembers/ClassObjectPropertyField.kt | 1 + .../{Getter.fir.txt => Getter.fir.k1.jvm.txt} | 0 .../classMembers/Getter.fir.k2.jvm.txt | 12 +++++ .../classMembers/Getter.fir.k2.klib.txt | 12 +++++ .../annotations/classMembers/Getter.kt | 1 + ...rWithInlineClassParameters.fir.k1.jvm.txt} | 0 ...rWithInlineClassParameters.fir.k2.jvm.txt} | 0 ...rWithInlineClassParameters.fir.k2.klib.txt | 43 +++++++++++++++++ ...denConstructorWithInlineClassParameters.kt | 3 +- ...d.fir.txt => PropertyField.fir.k1.jvm.txt} | 0 .../PropertyField.fir.k2.jvm.txt} | 0 .../PropertyField.fir.k2.klib.txt | 13 ++++++ .../annotations/classMembers/PropertyField.kt | 1 + ...onOnInlineClassCosntructor.fir.k1.jvm.txt} | 0 ...ionOnInlineClassCosntructor.fir.k2.jvm.txt | 14 ++++++ ...onOnInlineClassCosntructor.fir.k2.klib.txt | 13 ++++++ ...edApiAnnotationOnInlineClassCosntructor.kt | 3 +- .../{Setter.fir.txt => Setter.fir.k1.jvm.txt} | 0 .../classMembers/Setter.fir.k2.jvm.txt | 13 ++++++ .../classMembers/Setter.fir.k2.klib.txt | 13 ++++++ .../annotations/classMembers/Setter.kt | 1 + .../{Getter.fir.txt => Getter.fir.k1.jvm.txt} | 0 .../packageMembers/Getter.fir.k2.jvm.txt | 8 ++++ .../packageMembers/Getter.fir.k2.klib.txt | 7 +++ .../annotations/packageMembers/Getter.kt | 1 + ...d.fir.txt => PropertyField.fir.k1.jvm.txt} | 0 .../PropertyField.fir.k2.jvm.txt | 9 ++++ .../PropertyField.fir.k2.klib.txt | 8 ++++ .../packageMembers/PropertyField.kt | 1 + .../{Setter.fir.txt => Setter.fir.k1.jvm.txt} | 0 .../packageMembers/Setter.fir.k2.jvm.txt | 9 ++++ .../packageMembers/Setter.fir.k2.klib.txt | 8 ++++ .../annotations/packageMembers/Setter.kt | 1 + ...txt => StringArrayArgument.fir.k1.jvm.txt} | 0 .../StringArrayArgument.fir.k2.jvm.txt | 15 ++++++ .../StringArrayArgument.fir.k2.klib.txt | 14 ++++++ .../packageMembers/StringArrayArgument.kt | 1 + ...txt => SupertypesAndBounds.fir.k1.jvm.txt} | 0 .../types/SupertypesAndBounds.fir.k2.jvm.txt | 9 ++++ .../types/SupertypesAndBounds.fir.k2.klib.txt | 9 ++++ .../annotations/types/SupertypesAndBounds.kt | 1 + ....fir.txt => DelegateTarget.fir.k1.jvm.txt} | 0 .../DelegateTarget.fir.k2.jvm.txt | 19 ++++++++ .../DelegateTarget.fir.k2.klib.txt | 19 ++++++++ .../withUseSiteTarget/DelegateTarget.kt | 1 + .../FieldTarget.fir.k1.jvm.txt | 13 ++++++ .../FieldTarget.fir.k2.jvm.txt | 13 ++++++ .../FieldTarget.fir.k2.klib.txt | 13 ++++++ .../withUseSiteTarget/FieldTarget.kt | 1 + ...txt => PropertyAndAccessor.fir.k1.jvm.txt} | 0 ...txt => PropertyAndAccessor.fir.k2.jvm.txt} | 0 .../PropertyAndAccessor.fir.k2.klib.txt | 30 ++++++++++++ .../withUseSiteTarget/PropertyAndAccessor.kt | 1 + ....fir.txt => ReceiverTarget.fir.k1.jvm.txt} | 0 .../ReceiverTarget.fir.k2.jvm.txt | 18 ++++++++ .../ReceiverTarget.fir.k2.klib.txt | 18 ++++++++ .../withUseSiteTarget/ReceiverTarget.kt | 3 +- ...fir.txt => AllBoundsInWhen.fir.k1.jvm.txt} | 0 .../AllBoundsInWhen.fir.k2.jvm.txt | 6 +++ .../AllBoundsInWhen.fir.k2.klib.txt | 6 +++ .../kotlinSignature/AllBoundsInWhen.kt | 1 + ...t => FunClassParamNullable.fir.k1.jvm.txt} | 0 .../FunClassParamNullable.fir.k2.jvm.txt | 1 + .../FunClassParamNullable.fir.k2.klib.txt | 1 + .../FunClassParamNullable.kt | 1 + ...t => ExtValIntCharSequence.fir.k1.jvm.txt} | 0 .../prop/ExtValIntCharSequence.fir.k2.jvm.txt | 3 ++ .../ExtValIntCharSequence.fir.k2.klib.txt | 2 + .../prop/ExtValIntCharSequence.kt | 1 + ... => ExtValIntCharSequenceQ.fir.k1.jvm.txt} | 0 .../ExtValIntCharSequenceQ.fir.k2.jvm.txt | 3 ++ .../ExtValIntCharSequenceQ.fir.k2.klib.txt | 2 + .../prop/ExtValIntCharSequenceQ.kt | 1 + ...WithConstantValueAttribute.fir.k1.jvm.txt} | 0 ...lWithConstantValueAttribute.fir.k2.jvm.txt | 29 ++++++++++++ ...WithConstantValueAttribute.fir.k2.klib.txt | 29 ++++++++++++ .../nonConstValWithConstantValueAttribute.kt | 1 + ...ons.fir.txt => Annotations.fir.k1.jvm.txt} | 0 .../typealias/Annotations.fir.k2.jvm.txt | 12 +++++ .../typealias/Annotations.fir.k2.klib.txt | 11 +++++ .../compiledKotlin/typealias/Annotations.kt | 1 + ...ationInAnnotationArguments.fir.k1.jvm.txt} | 0 ...tationInAnnotationArguments.fir.k2.jvm.txt | 46 +++++++++++++++++++ ...ationInAnnotationArguments.fir.k2.klib.txt | 46 +++++++++++++++++++ .../AnnotationInAnnotationArguments.kt | 1 + ...mFieldInInterfaceCompanion.fir.k1.jvm.txt} | 0 ...vmFieldInInterfaceCompanion.fir.k2.jvm.txt | 13 ++++++ ...mFieldInInterfaceCompanion.fir.k2.klib.txt | 13 ++++++ .../JvmFieldInInterfaceCompanion.kt | 1 + ...Entry.fir.txt => EnumEntry.fir.k1.jvm.txt} | 0 .../classMembers/EnumEntry.fir.k2.jvm.txt | 33 +++++++++++++ .../classMembers/EnumEntry.fir.k2.klib.txt | 33 +++++++++++++ .../annotations/classMembers/EnumEntry.kt | 1 + ...fir.k1.txt => functionName.fir.k1.jvm.txt} | 0 ...fir.k2.txt => functionName.fir.k2.jvm.txt} | 0 .../functionName.fir.k2.klib.txt | 13 ++++++ .../platformNames/functionName.kt | 1 + 104 files changed, 808 insertions(+), 4 deletions(-) rename compiler/testData/loadJava/compiledKotlin/annotations/{SelfReferentialAnnotation.fir.txt => SelfReferentialAnnotation.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{ClassObjectPropertyField.fir.txt => ClassObjectPropertyField.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{Getter.fir.txt => Getter.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{HiddenConstructorWithInlineClassParameters.fir.k1.txt => HiddenConstructorWithInlineClassParameters.fir.k1.jvm.txt} (100%) rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{HiddenConstructorWithInlineClassParameters.fir.k2.txt => HiddenConstructorWithInlineClassParameters.fir.k2.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{PropertyField.fir.txt => PropertyField.fir.k1.jvm.txt} (100%) rename compiler/testData/loadJava/compiledKotlin/annotations/{withUseSiteTarget/FieldTarget.fir.txt => classMembers/PropertyField.fir.k2.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{PublishedApiAnnotationOnInlineClassCosntructor.fir.txt => PublishedApiAnnotationOnInlineClassCosntructor.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/classMembers/{Setter.fir.txt => Setter.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/{Getter.fir.txt => Getter.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/{PropertyField.fir.txt => PropertyField.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/{Setter.fir.txt => Setter.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/{StringArrayArgument.fir.txt => StringArrayArgument.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/types/{SupertypesAndBounds.fir.txt => SupertypesAndBounds.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/{DelegateTarget.fir.txt => DelegateTarget.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.klib.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k1.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/{PropertyAndAccessor.fir.k1.txt => PropertyAndAccessor.fir.k1.jvm.txt} (100%) rename compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/{PropertyAndAccessor.fir.k2.txt => PropertyAndAccessor.fir.k2.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/{ReceiverTarget.fir.txt => ReceiverTarget.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/{AllBoundsInWhen.fir.txt => AllBoundsInWhen.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/{FunClassParamNullable.fir.txt => FunClassParamNullable.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/prop/{ExtValIntCharSequence.fir.txt => ExtValIntCharSequence.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/prop/{ExtValIntCharSequenceQ.fir.txt => ExtValIntCharSequenceQ.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/prop/{nonConstValWithConstantValueAttribute.fir.txt => nonConstValWithConstantValueAttribute.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlin/typealias/{Annotations.fir.txt => Annotations.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/{AnnotationInAnnotationArguments.fir.txt => AnnotationInAnnotationArguments.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/{JvmFieldInInterfaceCompanion.fir.txt => JvmFieldInInterfaceCompanion.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/{EnumEntry.fir.txt => EnumEntry.fir.k1.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.jvm.txt create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.klib.txt rename compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/{functionName.fir.k1.txt => functionName.fir.k1.jvm.txt} (100%) rename compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/{functionName.fir.k2.txt => functionName.fir.k2.jvm.txt} (100%) create mode 100644 compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.klib.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.jvm.txt new file mode 100644 index 00000000000..d41d7572fcc --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.jvm.txt @@ -0,0 +1,34 @@ +public final annotation class Ann : R|kotlin/Annotation| { + public final val e: R|kotlin/Int| + public get(): R|kotlin/Int| + + public constructor(e: R|kotlin/Int|): R|test/Ann| + +} + +@R|test/MyRequiresOptIn|(a = String(), b = R|test/MyRequiresOptIn.MyLevel.ERROR|) public final annotation class MyRequiresOptIn : R|kotlin/Annotation| { + public final val a: R|kotlin/String| = String() + public get(): R|kotlin/String| + + public final val b: R|test/MyRequiresOptIn.MyLevel| = test/MyRequiresOptIn.MyLevel.ERROR + public get(): R|test/MyRequiresOptIn.MyLevel| + + public constructor(a: R|kotlin/String| = STUB, b: R|test/MyRequiresOptIn.MyLevel| = STUB): R|test/MyRequiresOptIn| + + public final enum class MyLevel : R|kotlin/Enum| { + private constructor(): R|test/MyRequiresOptIn.MyLevel| + + public final static enum entry WARNING: R|test/MyRequiresOptIn.MyLevel| + public final static enum entry ERROR: R|test/MyRequiresOptIn.MyLevel| + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|test/MyRequiresOptIn.MyLevel| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.klib.txt new file mode 100644 index 00000000000..79af33aa62c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.fir.k2.klib.txt @@ -0,0 +1,34 @@ +public final annotation class Ann : R|kotlin/Annotation| { + public final val e: R|kotlin/Int| + public get(): R|kotlin/Int| + + public constructor(@R|test/Ann|(e = Int(1)) e: R|kotlin/Int|): R|test/Ann| + +} + +@R|test/MyRequiresOptIn|(a = String(), b = R|test/MyRequiresOptIn.MyLevel.ERROR|) public final annotation class MyRequiresOptIn : R|kotlin/Annotation| { + public final val a: R|kotlin/String| + public get(): R|kotlin/String| + + public final val b: R|test/MyRequiresOptIn.MyLevel| + public get(): R|test/MyRequiresOptIn.MyLevel| + + public constructor(a: R|kotlin/String| = STUB, @R|test/MyRequiresOptIn|(a = String(), b = R|test/MyRequiresOptIn.MyLevel.WARNING|) b: R|test/MyRequiresOptIn.MyLevel| = STUB): R|test/MyRequiresOptIn| + + public final enum class MyLevel : R|kotlin/Enum| { + private constructor(): R|test/MyRequiresOptIn.MyLevel| + + public final static enum entry WARNING: R|test/MyRequiresOptIn.MyLevel| + public final static enum entry ERROR: R|test/MyRequiresOptIn.MyLevel| + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|test/MyRequiresOptIn.MyLevel| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.kt b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.kt index cc631db2a91..1fdc748bd14 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/SelfReferentialAnnotation.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // NO_CHECK_SOURCE_VS_BINARY // MUTE_REASON: KT-58935 @@ -14,4 +15,4 @@ public annotation class MyRequiresOptIn( WARNING, ERROR, } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.jvm.txt new file mode 100644 index 00000000000..1181c3647c7 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.jvm.txt @@ -0,0 +1,18 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public constructor(): R|test/Class| + + public final companion object Companion : R|kotlin/Any| { + field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + private constructor(): R|test/Class.Companion| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.klib.txt new file mode 100644 index 00000000000..97afcc13c7c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.k2.klib.txt @@ -0,0 +1,18 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public constructor(): R|test/Class| + + public final companion object Companion : R|kotlin/Any| { + public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + private constructor(): R|test/Class.Companion| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt index 45b800c8ef4..e1330613394 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.jvm.txt new file mode 100644 index 00000000000..024102a455c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.jvm.txt @@ -0,0 +1,12 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final val property: R|kotlin/Int| + @R|test/Anno|() public get(): R|kotlin/Int| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.klib.txt new file mode 100644 index 00000000000..f9cd7eb60cf --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.k2.klib.txt @@ -0,0 +1,12 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final val property: R|kotlin/Int| + @PROPERTY_GETTER:R|test/Anno|() public get(): R|kotlin/Int| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt index f1c5412c57f..96a89c2990a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k1.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k1.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.klib.txt new file mode 100644 index 00000000000..b3cc2575986 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.k2.klib.txt @@ -0,0 +1,43 @@ +public final annotation class Ann : R|kotlin/Annotation| { + public constructor(): R|test/Ann| + +} + +public sealed class Sealed : R|kotlin/Any| { + public final val z: R|test/Z| + public get(): R|test/Z| + + @R|test/Ann|() protected constructor(@R|test/Ann|() z: R|test/Z|): R|test/Sealed| + + public final class Derived : R|test/Sealed| { + @R|test/Ann|() public constructor(z: R|test/Z|): R|test/Sealed.Derived| + + } + +} + +public final class Test : R|kotlin/Any| { + public final val z: R|test/Z| + public get(): R|test/Z| + + @R|test/Ann|() public constructor(@R|test/Ann|() z: R|test/Z|): R|test/Test| + + @R|test/Ann|() public constructor(z: R|test/Z|, @R|test/Ann|() a: R|kotlin/Int|): R|test/Test| + + @R|test/Ann|() private constructor(z: R|test/Z|, @R|test/Ann|() s: R|kotlin/String|): R|test/Test| + +} + +public final inline class Z : R|kotlin/Any| { + public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean| + + public open fun hashCode(): R|kotlin/Int| + + public open fun toString(): R|kotlin/String| + + public final val x: R|kotlin/Int| + public get(): R|kotlin/Int| + + public constructor(x: R|kotlin/Int|): R|test/Z| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.kt index 3f8d4d98b1e..5b3ff67a8d6 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // !LANGUAGE: +InlineClasses // NO_CHECK_SOURCE_VS_BINARY package test @@ -13,4 +14,4 @@ class Test @Ann constructor(@Ann val z: Z) { sealed class Sealed @Ann constructor(@Ann val z: Z) { class Derived @Ann constructor(z: Z) : Sealed(z) -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k2.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k2.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k2.klib.txt new file mode 100644 index 00000000000..3088661cbb9 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.k2.klib.txt @@ -0,0 +1,13 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt index 85be48f9106..f002baf72d0 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.jvm.txt new file mode 100644 index 00000000000..7d5c07fbbe9 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.jvm.txt @@ -0,0 +1,14 @@ +@R|kotlin/jvm/JvmInline|() public final inline class Z : R|kotlin/Any| { + public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean| + + public open fun hashCode(): R|kotlin/Int| + + public open fun toString(): R|kotlin/String| + + public final val value: R|kotlin/Int| + public get(): R|kotlin/Int| + + @R|kotlin/PublishedApi|() internal constructor(value: R|kotlin/Int|): R|test/Z| + +} + diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.klib.txt new file mode 100644 index 00000000000..01998465158 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.k2.klib.txt @@ -0,0 +1,13 @@ +public final inline class Z : R|kotlin/Any| { + public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean| + + public open fun hashCode(): R|kotlin/Int| + + public open fun toString(): R|kotlin/String| + + public final val value: R|kotlin/Int| + public get(): R|kotlin/Int| + + @R|kotlin/PublishedApi|() internal constructor(value: R|kotlin/Int|): R|test/Z| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.kt index e1adaa1e3ee..1273f08baa1 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.kt @@ -1,6 +1,7 @@ +// PLATFORM_DEPENDANT_METADATA // !LANGUAGE: +InlineClasses // NO_CHECK_SOURCE_VS_BINARY package test -inline class Z @PublishedApi internal constructor(val value: Int) \ No newline at end of file +inline class Z @PublishedApi internal constructor(val value: Int) diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.jvm.txt new file mode 100644 index 00000000000..3e5a503df12 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.jvm.txt @@ -0,0 +1,13 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + @R|test/Anno|() public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.klib.txt new file mode 100644 index 00000000000..035860465e9 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.k2.klib.txt @@ -0,0 +1,13 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + @PROPERTY_SETTER:R|test/Anno|() public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt index bc71323080d..0d2b8e4947e 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.jvm.txt new file mode 100644 index 00000000000..885179cc5f2 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.jvm.txt @@ -0,0 +1,8 @@ +public final val property: R|kotlin/Int| + @R|test/Anno|() public get(): R|kotlin/Int| + +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.klib.txt new file mode 100644 index 00000000000..84452b3975c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.k2.klib.txt @@ -0,0 +1,7 @@ +public final val property: R|kotlin/Int| + @PROPERTY_GETTER:R|test/Anno|() public get(): R|kotlin/Int| + +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt index a3c874f2c8d..8d7b4528430 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.jvm.txt new file mode 100644 index 00000000000..3d66a752793 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.jvm.txt @@ -0,0 +1,9 @@ +field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.klib.txt new file mode 100644 index 00000000000..c34ae1d1cb8 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.k2.klib.txt @@ -0,0 +1,8 @@ +public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt index 1eec44b4221..569b3c83979 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.jvm.txt new file mode 100644 index 00000000000..18ceb23994b --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.jvm.txt @@ -0,0 +1,9 @@ +public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + @R|test/Anno|() public set(value: R|kotlin/Int|): R|kotlin/Unit| + +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.klib.txt new file mode 100644 index 00000000000..ede9927f4fe --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.k2.klib.txt @@ -0,0 +1,8 @@ +public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + @PROPERTY_SETTER:R|test/Anno|() public set(value: R|kotlin/Int|): R|kotlin/Unit| + +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt index 02b8f103f76..f87362ca0c6 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.jvm.txt new file mode 100644 index 00000000000..fa0e6675255 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.jvm.txt @@ -0,0 +1,15 @@ +field:@FIELD:R|test/Anno|(t = (String(prosper))) public final val bar: R|kotlin/Int| + public get(): R|kotlin/Int| + +@R|test/Anno|(t = ()) public final fun baz(): R|kotlin/Unit| + +@R|test/Anno|(t = (String(live), String(long))) public final fun foo(): R|kotlin/Unit| + +public final annotation class Anno : R|kotlin/Annotation| { + public final val t: R|kotlin/Array| + public get(): R|kotlin/Array| + + public constructor(vararg t: R|kotlin/Array|): R|test/Anno| + +} + diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.klib.txt new file mode 100644 index 00000000000..a6686b5b367 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.k2.klib.txt @@ -0,0 +1,14 @@ +public final val bar: R|kotlin/Int| + public get(): R|kotlin/Int| + +@R|test/Anno|() public final fun baz(): R|kotlin/Unit| + +@R|test/Anno|(t = String(live)) public final fun foo(): R|kotlin/Unit| + +public final annotation class Anno : R|kotlin/Annotation| { + public final val t: R|kotlin/Array| + public get(): R|kotlin/Array| + + public constructor(vararg t: R|kotlin/Array|): R|test/Anno| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt index 5bf32beb5b0..66c5a21233d 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA //ALLOW_AST_ACCESS package test diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.jvm.txt new file mode 100644 index 00000000000..01cf6587a63 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.jvm.txt @@ -0,0 +1,9 @@ +@R|kotlin/annotation/Target|(allowedTargets = (R|kotlin/annotation/AnnotationTarget.TYPE|)) public final annotation class A : R|kotlin/Annotation| { + public constructor(): R|test/A| + +} + +public abstract interface Foo : R|@R|test/A|() java/io/Serializable| { + public abstract fun bar(): R|kotlin/Unit| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.klib.txt new file mode 100644 index 00000000000..4fa64f4e5f5 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.k2.klib.txt @@ -0,0 +1,9 @@ +@R|kotlin/annotation/Target|(allowedTargets = (R|kotlin/annotation/AnnotationTarget.TYPE|)) public final annotation class A : R|kotlin/Annotation| { + public constructor(): R|test/A| + +} + +public abstract interface Foo : R|@R|test/A|() kotlin/io/Serializable| { + public abstract fun bar(): R|kotlin/Unit| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt index 1f9b342d500..b5a838da876 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA //ALLOW_AST_ACCESS package test diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.jvm.txt new file mode 100644 index 00000000000..acb39e8dce5 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.jvm.txt @@ -0,0 +1,19 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + field:@PROPERTY_DELEGATE_FIELD:R|test/Anno|() public final val property: R|kotlin/String| + public get(): R|kotlin/String| + + public constructor(): R|test/Class| + +} + +public final class CustomDelegate : R|kotlin/Any| { + public final operator fun getValue(thisRef: R|kotlin/Any?|, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String| + + public constructor(): R|test/CustomDelegate| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.klib.txt new file mode 100644 index 00000000000..37b7156fc39 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.k2.klib.txt @@ -0,0 +1,19 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final val property: R|kotlin/String| + public get(): R|kotlin/String| + + public constructor(): R|test/Class| + +} + +public final class CustomDelegate : R|kotlin/Any| { + public final operator fun getValue(thisRef: R|kotlin/Any?|, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String| + + public constructor(): R|test/CustomDelegate| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.kt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.kt index f11a028ac35..2efa0ddff68 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // ALLOW_AST_ACCESS package test diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k1.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k1.jvm.txt new file mode 100644 index 00000000000..35f1780110c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k1.jvm.txt @@ -0,0 +1,13 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.jvm.txt new file mode 100644 index 00000000000..35f1780110c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.jvm.txt @@ -0,0 +1,13 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.klib.txt new file mode 100644 index 00000000000..3088661cbb9 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.k2.klib.txt @@ -0,0 +1,13 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public constructor(): R|test/Anno| + +} + +public final class Class : R|kotlin/Any| { + public final var property: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/Class| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt index 85be48f9106..f002baf72d0 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class Anno diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k1.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k1.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.klib.txt new file mode 100644 index 00000000000..602af071e88 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.k2.klib.txt @@ -0,0 +1,30 @@ +public final annotation class A : R|kotlin/Annotation| { + public final val value: R|kotlin/String| + public get(): R|kotlin/String| + + public constructor(value: R|kotlin/String|): R|test/A| + +} + +public final annotation class B : R|kotlin/Annotation| { + public final val value: R|kotlin/Array| + public get(): R|kotlin/Array| + + public constructor(value: R|kotlin/Array|): R|test/B| + +} + +public abstract interface I : R|kotlin/Any| { + @PROPERTY:R|test/A|(value = String(property)) public abstract var propertyAndGetter: R|kotlin/Int| + @PROPERTY_GETTER:R|test/B|(value = (String(getter))) public get(): R|kotlin/Int| + public set(value: R|kotlin/Int|): R|kotlin/Unit| + + @PROPERTY:R|test/A|(value = String(property)) public abstract var propertyAndSetter: R|kotlin/Int| + public get(): R|kotlin/Int| + @PROPERTY_SETTER:R|test/B|(value = (String(setter))) public set(value: R|kotlin/Int|): R|kotlin/Unit| + + public abstract var getterAndSetter: R|kotlin/Int| + @PROPERTY_GETTER:R|test/A|(value = String(getter)) public get(): R|kotlin/Int| + @PROPERTY_SETTER:R|test/B|(value = (String(setter))) public set(value: R|kotlin/Int|): R|kotlin/Unit| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.kt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.kt index fa3140be2e8..5cf15d95648 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class A(val value: String) diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.jvm.txt new file mode 100644 index 00000000000..c17ab8d9534 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.jvm.txt @@ -0,0 +1,18 @@ +public final class A : R|kotlin/Any| { + public final fun @RECEIVER:R|test/Ann|() R|kotlin/String|.myLength(@R|test/Ann|() q: R|kotlin/String|): R|kotlin/Int| + + public final val @RECEIVER:R|test/Ann|() R|kotlin/String|.myLength2: R|kotlin/Int| + public get(): R|kotlin/Int| + + public final var @RECEIVER:R|test/Ann|() R|kotlin/String|.myLength3: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(v: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/A| + +} + +@R|kotlin/annotation/Target|(allowedTargets = (R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|)) public final annotation class Ann : R|kotlin/Annotation| { + public constructor(): R|test/Ann| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.klib.txt new file mode 100644 index 00000000000..7615927b799 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.k2.klib.txt @@ -0,0 +1,18 @@ +public final class A : R|kotlin/Any| { + public final fun R|kotlin/String|.myLength(@R|test/Ann|() q: R|kotlin/String|): R|kotlin/Int| + + public final val R|kotlin/String|.myLength2: R|kotlin/Int| + public get(): R|kotlin/Int| + + public final var R|kotlin/String|.myLength3: R|kotlin/Int| + public get(): R|kotlin/Int| + public set(v: R|kotlin/Int|): R|kotlin/Unit| + + public constructor(): R|test/A| + +} + +@R|kotlin/annotation/Target|(allowedTargets = (R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|)) public final annotation class Ann : R|kotlin/Annotation| { + public constructor(): R|test/Ann| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt index 35675040951..c552db640a5 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA //ALLOW_AST_ACCESS package test @@ -17,4 +18,4 @@ class A { get() = length set(v) {} -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.jvm.txt new file mode 100644 index 00000000000..ab65d2f84a1 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.jvm.txt @@ -0,0 +1,6 @@ +public open class AllBoundsInWhen : R|kotlin/Any| { + public open fun foo(): R|kotlin/Unit| + + public constructor(): R|test/AllBoundsInWhen| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.klib.txt new file mode 100644 index 00000000000..5abe86294fe --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.k2.klib.txt @@ -0,0 +1,6 @@ +public open class AllBoundsInWhen : R|kotlin/Any| { + public open fun foo(): R|kotlin/Unit| + + public constructor(): R|test/AllBoundsInWhen| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt index 1b2faa5e906..df25063d077 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test import java.io.Serializable diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.jvm.txt new file mode 100644 index 00000000000..f0627af3324 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.jvm.txt @@ -0,0 +1 @@ +public final fun ff(p: R|kotlin/collections/List|): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.klib.txt new file mode 100644 index 00000000000..b7556192e7c --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.k2.klib.txt @@ -0,0 +1 @@ +public final fun ff(p: R|kotlin/collections/List|): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt index fc79919cce0..0e47811eff7 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA //ALLOW_AST_ACCESS package test diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.jvm.txt new file mode 100644 index 00000000000..0ab97adf02e --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.jvm.txt @@ -0,0 +1,3 @@ +public final val R|kotlin/Int|.ggg: R|java/lang/CharSequence| + public get(): R|java/lang/CharSequence| + diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.klib.txt new file mode 100644 index 00000000000..636936d4036 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.k2.klib.txt @@ -0,0 +1,2 @@ +public final val R|kotlin/Int|.ggg: R|kotlin/CharSequence| + public get(): R|kotlin/CharSequence| diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt index 4d11a8c99f3..5b016d46c68 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test import java.lang.CharSequence diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.jvm.txt new file mode 100644 index 00000000000..8c8ecfde183 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.jvm.txt @@ -0,0 +1,3 @@ +public final val R|kotlin/Int|.ggg: R|java/lang/CharSequence?| + public get(): R|java/lang/CharSequence?| + diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.klib.txt new file mode 100644 index 00000000000..e4219d8e0ea --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.k2.klib.txt @@ -0,0 +1,2 @@ +public final val R|kotlin/Int|.ggg: R|kotlin/CharSequence?| + public get(): R|kotlin/CharSequence?| diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt index 8c89b50f3df..2da3aa5bb3f 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt +++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test import java.lang.CharSequence diff --git a/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.txt b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.txt rename to compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.jvm.txt new file mode 100644 index 00000000000..5387b275946 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.jvm.txt @@ -0,0 +1,29 @@ +public final val nonConstVal1: R|kotlin/Int| + public get(): R|kotlin/Int| + +public final class C : R|kotlin/Any| { + public final val nonConstVal2: R|kotlin/Int| + public get(): R|kotlin/Int| + + public constructor(): R|test/C| + + public final companion object Companion : R|kotlin/Any| { + public final val nonConstVal3: R|kotlin/Int| + public get(): R|kotlin/Int| + + private constructor(): R|test/C.Companion| + + } + +} + +public abstract interface I : R|kotlin/Any| { + public final companion object Companion : R|kotlin/Any| { + public final val nonConstVal4: R|kotlin/Int| + public get(): R|kotlin/Int| + + private constructor(): R|test/I.Companion| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.klib.txt new file mode 100644 index 00000000000..f2bc78eecdc --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.fir.k2.klib.txt @@ -0,0 +1,29 @@ +public final val nonConstVal1: R|kotlin/Int| = Int(1) + public get(): R|kotlin/Int| + +public final class C : R|kotlin/Any| { + public final val nonConstVal2: R|kotlin/Int| = Int(2) + public get(): R|kotlin/Int| + + public constructor(): R|test/C| + + public final companion object Companion : R|kotlin/Any| { + public final val nonConstVal3: R|kotlin/Int| = Int(3) + public get(): R|kotlin/Int| + + private constructor(): R|test/C.Companion| + + } + +} + +public abstract interface I : R|kotlin/Any| { + public final companion object Companion : R|kotlin/Any| { + public final val nonConstVal4: R|kotlin/Int| = Int(4) + public get(): R|kotlin/Int| + + private constructor(): R|test/I.Companion| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt index f6b1c34f991..8e26bd79338 100644 --- a/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt +++ b/compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // !LANGUAGE: -NoConstantValueAttributeForNonConstVals // IGNORE_BACKEND: JVM_IR //ALLOW_AST_ACCESS diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.txt rename to compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.jvm.txt new file mode 100644 index 00000000000..309dcf885c2 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.jvm.txt @@ -0,0 +1,12 @@ +@R|test/Ann|() public final typealias A1 = R|kotlin/String| + +@R|test/Ann|(value = String(OK)) public final typealias A2 = R|kotlin/String| + +@R|kotlin/annotation/Target|(allowedTargets = (R|kotlin/annotation/AnnotationTarget.TYPEALIAS|)) public final annotation class Ann : R|kotlin/Annotation| { + public final val value: R|kotlin/String| = String() + public get(): R|kotlin/String| + + public constructor(value: R|kotlin/String| = STUB): R|test/Ann| + +} + diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.klib.txt new file mode 100644 index 00000000000..6b2f7194041 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.k2.klib.txt @@ -0,0 +1,11 @@ +@R|test/Ann|() public final typealias A1 = R|kotlin/String| + +@R|test/Ann|(value = String(OK)) public final typealias A2 = R|kotlin/String| + +@R|kotlin/annotation/Target|(allowedTargets = (R|kotlin/annotation/AnnotationTarget.TYPEALIAS|)) public final annotation class Ann : R|kotlin/Annotation| { + public final val value: R|kotlin/String| + public get(): R|kotlin/String| + + public constructor(value: R|kotlin/String| = STUB): R|test/Ann| + +} diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.kt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.kt index 38ebc070f9d..69c121d4a62 100644 --- a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.kt +++ b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA //ALLOW_AST_ACCESS // NO_CHECK_SOURCE_VS_BINARY //^ While compiling source, we do not store annotation default values, but we load them when reading compiled files diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.jvm.txt new file mode 100644 index 00000000000..5cb215b3a86 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.jvm.txt @@ -0,0 +1,46 @@ +@R|test/OptionGroups|(o1 = @R|test/StringOptions|(option = (String(abc), String(d), String(ef))) , o2 = @R|test/EnumOption|(option = R|test/E.ENTRY|) ) public final class AnnotationInAnnotationArguments : R|kotlin/Any| { + public constructor(): R|test/AnnotationInAnnotationArguments| + +} + +public final enum class E : R|kotlin/Enum| { + private constructor(): R|test/E| + + public final static enum entry ENTRY: R|test/E| + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|test/E| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + +} + +public final annotation class EnumOption : R|kotlin/Annotation| { + public final val option: R|test/E| + public get(): R|test/E| + + public constructor(option: R|test/E|): R|test/EnumOption| + +} + +public final annotation class OptionGroups : R|kotlin/Annotation| { + public final val o1: R|test/StringOptions| + public get(): R|test/StringOptions| + + public final val o2: R|test/EnumOption| + public get(): R|test/EnumOption| + + public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|): R|test/OptionGroups| + +} + +public final annotation class StringOptions : R|kotlin/Annotation| { + public final val option: R|kotlin/Array| + public get(): R|kotlin/Array| + + public constructor(vararg option: R|kotlin/Array|): R|test/StringOptions| + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.klib.txt new file mode 100644 index 00000000000..7c8893de891 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.k2.klib.txt @@ -0,0 +1,46 @@ +@R|test/OptionGroups|(o1 = @R|test/StringOptions|(option = String(abc)) , o2 = @R|test/EnumOption|(option = R|test/E.ENTRY|) ) public final class AnnotationInAnnotationArguments : R|kotlin/Any| { + public constructor(): R|test/AnnotationInAnnotationArguments| + +} + +public final enum class E : R|kotlin/Enum| { + private constructor(): R|test/E| + + public final static enum entry ENTRY: R|test/E| + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|test/E| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + +} + +public final annotation class EnumOption : R|kotlin/Annotation| { + public final val option: R|test/E| + public get(): R|test/E| + + public constructor(option: R|test/E|): R|test/EnumOption| + +} + +public final annotation class OptionGroups : R|kotlin/Annotation| { + public final val o1: R|test/StringOptions| + public get(): R|test/StringOptions| + + public final val o2: R|test/EnumOption| + public get(): R|test/EnumOption| + + public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|): R|test/OptionGroups| + +} + +public final annotation class StringOptions : R|kotlin/Annotation| { + public final val option: R|kotlin/Array| + public get(): R|kotlin/Array| + + public constructor(vararg option: R|kotlin/Array|): R|test/StringOptions| + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt index d944fd22331..a7b6459cd70 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // ALLOW_AST_ACCESS package test diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.jvm.txt new file mode 100644 index 00000000000..72399ef5df5 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.jvm.txt @@ -0,0 +1,13 @@ +public abstract interface I : R|kotlin/Any| { + public final companion object Companion : R|kotlin/Any| { + field:@FIELD:R|kotlin/jvm/JvmField|() public final val x: R|kotlin/String| + public get(): R|kotlin/String| + + field:@FIELD:R|kotlin/jvm/JvmField|() public final val y: R|kotlin/String| + public get(): R|kotlin/String| + + private constructor(): R|test/I.Companion| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.klib.txt new file mode 100644 index 00000000000..0ed4159bafa --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.k2.klib.txt @@ -0,0 +1,13 @@ +public abstract interface I : R|kotlin/Any| { + public final companion object Companion : R|kotlin/Any| { + public final val x: R|kotlin/String| = String(x) + public get(): R|kotlin/String| + + public final val y: R|kotlin/String| = String(y) + public get(): R|kotlin/String| + + private constructor(): R|test/I.Companion| + + } + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt index 6193a2ec541..cf80f2b4e09 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // NO_CHECK_SOURCE_VS_BINARY package test diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.jvm.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.jvm.txt new file mode 100644 index 00000000000..3fb04058025 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.jvm.txt @@ -0,0 +1,33 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public final val value: R|kotlin/String| = String(0) + public get(): R|kotlin/String| + + public final val x: R|kotlin/Int| = Int(0) + public get(): R|kotlin/Int| + + public constructor(value: R|kotlin/String| = STUB, x: R|kotlin/Int| = STUB): R|test/Anno| + +} + +public final annotation class Bnno : R|kotlin/Annotation| { + public constructor(): R|test/Bnno| + +} + +public final enum class Eee : R|kotlin/Enum| { + private constructor(): R|test/Eee| + + public final static enum entry Entry1: R|test/Eee| + public final static enum entry Entry2: R|test/Eee| + public final static enum entry Entry3: R|test/Eee| + public final static enum entry Entry4: R|test/Eee| + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|test/Eee| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.klib.txt new file mode 100644 index 00000000000..030696e1e5a --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.k2.klib.txt @@ -0,0 +1,33 @@ +public final annotation class Anno : R|kotlin/Annotation| { + public final val value: R|kotlin/String| + public get(): R|kotlin/String| + + public final val x: R|kotlin/Int| + public get(): R|kotlin/Int| + + public constructor(value: R|kotlin/String| = STUB, x: R|kotlin/Int| = STUB): R|test/Anno| + +} + +public final annotation class Bnno : R|kotlin/Annotation| { + public constructor(): R|test/Bnno| + +} + +public final enum class Eee : R|kotlin/Enum| { + private constructor(): R|test/Eee| + + public final static enum entry Entry1: R|test/Eee| + public final static enum entry Entry2: R|test/Eee| + public final static enum entry Entry3: R|test/Eee| + public final static enum entry Entry4: R|test/Eee| + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|test/Eee| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt index 11d3dd45b4e..8204b97a3f5 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA // ALLOW_AST_ACCESS // NO_CHECK_SOURCE_VS_BINARY //^ While compiling source, we do not store annotation default values, but we load them when reading compiled files diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k1.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k1.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k1.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k1.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.jvm.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.jvm.txt diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.klib.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.klib.txt new file mode 100644 index 00000000000..8d739955ad8 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.klib.txt @@ -0,0 +1,13 @@ +@R|test/A|(s = String(1)) public final fun foo(): R|kotlin/String| + +public final var v: R|kotlin/Int| + @PROPERTY_GETTER:R|test/A|(s = String(3)) public get(): R|kotlin/Int| + @PROPERTY_SETTER:R|test/A|(s = String(4)) public set(value: R|kotlin/Int|): R|kotlin/Unit| + +public final annotation class A : R|kotlin/Annotation| { + public final val s: R|kotlin/String| + public get(): R|kotlin/String| + + public constructor(s: R|kotlin/String|): R|test/A| + +} diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt index 558c2082036..4df29ef121e 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt @@ -1,3 +1,4 @@ +// PLATFORM_DEPENDANT_METADATA package test annotation class A(val s: String)