diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index d33e789c743..61eb2711916 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -858,7 +858,7 @@ class FirElementSerializer private constructor( } } } - + private fun fillFromPossiblyInnerType(builder: ProtoBuf.Type.Builder, type: ConeClassLikeType) { val classifierSymbol = type.lookupTag.toSymbol(session) if (classifierSymbol != null) { diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java index 74ed7a5518e..c3242240844 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java +++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java @@ -34,6 +34,11 @@ public class K1KotlinpTestGenerated extends AbstractK1KotlinpTest { runTest("libraries/tools/kotlinp/testData/Annotations.kt"); } + @TestMetadata("Constants.kt") + public void testConstants() throws Exception { + runTest("libraries/tools/kotlinp/testData/Constants.kt"); + } + @TestMetadata("ContextReceivers.kt") public void testContextReceivers() throws Exception { runTest("libraries/tools/kotlinp/testData/ContextReceivers.kt"); diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java index c0dfcad3302..b97f15ca58f 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java +++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java @@ -34,6 +34,11 @@ public class K2KotlinpTestGenerated extends AbstractK2KotlinpTest { runTest("libraries/tools/kotlinp/testData/Annotations.kt"); } + @TestMetadata("Constants.kt") + public void testConstants() throws Exception { + runTest("libraries/tools/kotlinp/testData/Constants.kt"); + } + @TestMetadata("ContextReceivers.kt") public void testContextReceivers() throws Exception { runTest("libraries/tools/kotlinp/testData/ContextReceivers.kt"); diff --git a/libraries/tools/kotlinp/testData/Constants.kt b/libraries/tools/kotlinp/testData/Constants.kt new file mode 100644 index 00000000000..c09f4d9d20d --- /dev/null +++ b/libraries/tools/kotlinp/testData/Constants.kt @@ -0,0 +1,8 @@ +class A { + val constantString: String = "OK" + val constantInt: Int = 12 + val constantDouble: Double = 1.0 + val constantNull: String? = null +} + +const val four = 2 + 2 \ No newline at end of file diff --git a/libraries/tools/kotlinp/testData/Constants.txt b/libraries/tools/kotlinp/testData/Constants.txt new file mode 100644 index 00000000000..51eb1c4ddaa --- /dev/null +++ b/libraries/tools/kotlinp/testData/Constants.txt @@ -0,0 +1,46 @@ +// A.class +// ------------------------------------------ +public final class A : kotlin/Any { + + // signature: ()V + public constructor() + + // field: constantDouble:D + // getter: getConstantDouble()D + public final val constantDouble: kotlin/Double /* = ... */ + public final get + + // field: constantInt:I + // getter: getConstantInt()I + public final val constantInt: kotlin/Int /* = ... */ + public final get + + // field: constantNull:Ljava/lang/String; + // getter: getConstantNull()Ljava/lang/String; + public final val constantNull: kotlin/String? + public final get + + // field: constantString:Ljava/lang/String; + // getter: getConstantString()Ljava/lang/String; + public final val constantString: kotlin/String /* = ... */ + public final get + + // module name: test-module +} +// ConstantsKt.class +// ------------------------------------------ +package { + + // field: four:I + public final const val four: kotlin/Int /* = ... */ + public final get + + // module name: test-module +} +// META-INF/test-module.kotlin_module +// ------------------------------------------ +module { + package { + ConstantsKt + } +} diff --git a/libraries/tools/kotlinp/testData/VersionRequirement.kt b/libraries/tools/kotlinp/testData/VersionRequirement.kt index 142ba9edc45..849eb85cb93 100644 --- a/libraries/tools/kotlinp/testData/VersionRequirement.kt +++ b/libraries/tools/kotlinp/testData/VersionRequirement.kt @@ -1,5 +1,3 @@ -// IGNORE K2 - @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") package test