From e0f524b6b3e7ed913407692ace6a49cda2414ef5 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 3 Jan 2024 17:10:30 +0100 Subject: [PATCH] [LC] add tests on declarations with JvmName and value classes ^KT-63087 --- ...lassesByFqNameForLibraryTestGenerated.java | 12 +++++ ...ualityByFqNameForLibraryTestGenerated.java | 12 +++++ ...entingByFqNameForLibraryTestGenerated.java | 12 +++++ ...ClassesByFqNameForSourceTestGenerated.java | 12 +++++ ...qualityByFqNameForSourceTestGenerated.java | 12 +++++ ...rentingByFqNameForSourceTestGenerated.java | 12 +++++ ...ssInParametersWithJvmName.descriptors.java | 44 +++++++++++++++++++ .../ValueClassInParametersWithJvmName.java | 15 +++++++ .../ValueClassInParametersWithJvmName.kt | 29 ++++++++++++ ...ValueClassInParametersWithJvmName.lib.java | 44 +++++++++++++++++++ ...ssInParametersWithJvmName.descriptors.java | 42 ++++++++++++++++++ .../ValueClassInParametersWithJvmName.java | 27 ++++++++++++ .../ValueClassInParametersWithJvmName.kt | 27 ++++++++++++ ...ValueClassInParametersWithJvmName.lib.java | 42 ++++++++++++++++++ .../CompilerLightClassTestGenerated.java | 10 +++++ 15 files changed, 352 insertions(+) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.lib.java diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java index 58431549f9f..c35f944252e 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java @@ -312,6 +312,12 @@ public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractS runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @Test @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { @@ -384,6 +390,12 @@ public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractS public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @Nested diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByFqNameForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByFqNameForLibraryTestGenerated.java index fab8349dc75..e4474365e6d 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByFqNameForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByFqNameForLibraryTestGenerated.java @@ -312,6 +312,12 @@ public class SymbolLightClassesEqualityByFqNameForLibraryTestGenerated extends A runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @Test @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { @@ -384,6 +390,12 @@ public class SymbolLightClassesEqualityByFqNameForLibraryTestGenerated extends A public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @Nested diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByFqNameForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByFqNameForLibraryTestGenerated.java index 16f7f68677c..1406d985fd6 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByFqNameForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByFqNameForLibraryTestGenerated.java @@ -312,6 +312,12 @@ public class SymbolLightClassesParentingByFqNameForLibraryTestGenerated extends runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @Test @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { @@ -384,6 +390,12 @@ public class SymbolLightClassesParentingByFqNameForLibraryTestGenerated extends public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @Nested diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java index 3079414e8aa..84753e202a5 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java @@ -312,6 +312,12 @@ public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSy runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @Test @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { @@ -556,6 +562,12 @@ public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSy public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @Nested diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java index 89d671d1938..2330116bc70 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java @@ -312,6 +312,12 @@ public class SymbolLightClassesEqualityByFqNameForSourceTestGenerated extends Ab runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @Test @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { @@ -556,6 +562,12 @@ public class SymbolLightClassesEqualityByFqNameForSourceTestGenerated extends Ab public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @Nested diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java index 36c2b13067c..e0e30feddbb 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java @@ -312,6 +312,12 @@ public class SymbolLightClassesParentingByFqNameForSourceTestGenerated extends A runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @Test @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { @@ -556,6 +562,12 @@ public class SymbolLightClassesParentingByFqNameForSourceTestGenerated extends A public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @Test + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @Nested diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.descriptors.java new file mode 100644 index 00000000000..bfe601ab043 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.descriptors.java @@ -0,0 +1,44 @@ +public final class UTypeDeclarationClass /* one.UTypeDeclarationClass*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String getter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String nothing; + + @org.jetbrains.annotations.NotNull() + private java.lang.String setter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String setterAndGetter; + + @kotlin.jvm.JvmName(name = "_methodWithJvmName") + public final void _methodWithJvmName(@org.jetbrains.annotations.NotNull() java.lang.String);// _methodWithJvmName(java.lang.String) + + @kotlin.jvm.JvmName(name = "get_getter") + @org.jetbrains.annotations.NotNull() + public final java.lang.String get_getter();// get_getter() + + @kotlin.jvm.JvmName(name = "get_setterAndGetter") + @org.jetbrains.annotations.NotNull() + public final java.lang.String get_setterAndGetter();// get_setterAndGetter() + + @kotlin.jvm.JvmName(name = "set_setter") + public final void set_setter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setter(java.lang.String) + + @kotlin.jvm.JvmName(name = "set_setterAndGetter") + public final void set_setterAndGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setterAndGetter(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getNothing();// getNothing() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getSetter();// getSetter() + + public UTypeDeclarationClass();// .ctor() + + public final void methodWithValueClass(@org.jetbrains.annotations.NotNull() java.lang.String);// methodWithValueClass(java.lang.String) + + public final void setGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// setGetter(java.lang.String) + + public final void setNothing(@org.jetbrains.annotations.NotNull() java.lang.String);// setNothing(java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.java new file mode 100644 index 00000000000..4c59bf19c19 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.java @@ -0,0 +1,15 @@ +public final class UTypeDeclarationClass /* one.UTypeDeclarationClass*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String getter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String nothing; + + @org.jetbrains.annotations.NotNull() + private java.lang.String setter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String setterAndGetter; + + public UTypeDeclarationClass();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt new file mode 100644 index 00000000000..e7370d4e53a --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt @@ -0,0 +1,29 @@ +// one.UTypeDeclarationClass +// WITH_STDLIB +package one + +@JvmInline +value class MyValueClass(val str: String) + +class UTypeDeclarationClass { + var setterAndGetter: MyValueClass = MyValueClass("setterAndGetter") + @JvmName("get_setterAndGetter") get() = field + @JvmName("set_setterAndGetter") set(value) { field = value } + + var setter: MyValueClass = MyValueClass("setter") + get() = field + @JvmName("set_setter") set(value) { field = value } + + var getter: MyValueClass = MyValueClass("getter") + @JvmName("get_getter") get() = field + set(value) { field = value } + + var nothing: MyValueClass = MyValueClass("nothing") + get() = field + set(value) { field = value } + + fun methodWithValueClass(p: MyValueClass) {} + + @JvmName("_methodWithJvmName") + fun methodWithJvmName(p: MyValueClass) {} +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.lib.java new file mode 100644 index 00000000000..284a778ecb7 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.lib.java @@ -0,0 +1,44 @@ +public final class UTypeDeclarationClass /* one.UTypeDeclarationClass*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String getter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String nothing; + + @org.jetbrains.annotations.NotNull() + private java.lang.String setter; + + @org.jetbrains.annotations.NotNull() + private java.lang.String setterAndGetter; + + @kotlin.jvm.JvmName(name = "_methodWithJvmName") + public final void _methodWithJvmName(@org.jetbrains.annotations.NotNull() java.lang.String);// _methodWithJvmName(java.lang.String) + + @kotlin.jvm.JvmName(name = "get_getter") + @org.jetbrains.annotations.NotNull() + public final java.lang.String get_getter();// get_getter() + + @kotlin.jvm.JvmName(name = "get_setterAndGetter") + @org.jetbrains.annotations.NotNull() + public final java.lang.String get_setterAndGetter();// get_setterAndGetter() + + @kotlin.jvm.JvmName(name = "set_setter") + public final void set_setter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setter(java.lang.String) + + @kotlin.jvm.JvmName(name = "set_setterAndGetter") + public final void set_setterAndGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setterAndGetter(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getNothing-KOFEOT0();// getNothing-KOFEOT0() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getSetter-KOFEOT0();// getSetter-KOFEOT0() + + public UTypeDeclarationClass();// .ctor() + + public final void methodWithValueClass-rdfNfmQ(@org.jetbrains.annotations.NotNull() java.lang.String);// methodWithValueClass-rdfNfmQ(java.lang.String) + + public final void setGetter-rdfNfmQ(@org.jetbrains.annotations.NotNull() java.lang.String);// setGetter-rdfNfmQ(java.lang.String) + + public final void setNothing-rdfNfmQ(@org.jetbrains.annotations.NotNull() java.lang.String);// setNothing-rdfNfmQ(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.descriptors.java new file mode 100644 index 00000000000..95354f73f3e --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.descriptors.java @@ -0,0 +1,42 @@ +public final class ValueClassInParametersWithJvmNameKt /* one.ValueClassInParametersWithJvmNameKt*/ { + @org.jetbrains.annotations.NotNull() + private static java.lang.String getter; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String nothing; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String setter; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String setterAndGetter; + + @kotlin.jvm.JvmName(name = "_methodWithJvmName") + public static final void _methodWithJvmName(@org.jetbrains.annotations.NotNull() java.lang.String);// _methodWithJvmName(java.lang.String) + + @kotlin.jvm.JvmName(name = "get_getter") + @org.jetbrains.annotations.NotNull() + public static final java.lang.String get_getter();// get_getter() + + @kotlin.jvm.JvmName(name = "get_setterAndGetter") + @org.jetbrains.annotations.NotNull() + public static final java.lang.String get_setterAndGetter();// get_setterAndGetter() + + @kotlin.jvm.JvmName(name = "set_setter") + public static final void set_setter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setter(java.lang.String) + + @kotlin.jvm.JvmName(name = "set_setterAndGetter") + public static final void set_setterAndGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setterAndGetter(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getNothing();// getNothing() + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getSetter();// getSetter() + + public static final void methodWithValueClass(@org.jetbrains.annotations.NotNull() java.lang.String);// methodWithValueClass(java.lang.String) + + public static final void setGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// setGetter(java.lang.String) + + public static final void setNothing(@org.jetbrains.annotations.NotNull() java.lang.String);// setNothing(java.lang.String) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.java new file mode 100644 index 00000000000..971972a096c --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.java @@ -0,0 +1,27 @@ +public final class ValueClassInParametersWithJvmNameKt /* one.ValueClassInParametersWithJvmNameKt*/ { + @org.jetbrains.annotations.NotNull() + private static java.lang.String getter; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String nothing; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String setter; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String setterAndGetter; + + @kotlin.jvm.JvmName(name = "get_getter") + @org.jetbrains.annotations.NotNull() + public static final java.lang.String get_getter();// get_getter() + + @kotlin.jvm.JvmName(name = "get_setterAndGetter") + @org.jetbrains.annotations.NotNull() + public static final java.lang.String get_setterAndGetter();// get_setterAndGetter() + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getNothing();// getNothing() + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getSetter();// getSetter() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt new file mode 100644 index 00000000000..28a4609e458 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt @@ -0,0 +1,27 @@ +// one.ValueClassInParametersWithJvmNameKt +// WITH_STDLIB +package one + +@JvmInline +value class MyValueClass(val str: String) + +var setterAndGetter: MyValueClass = MyValueClass("setterAndGetter") + @JvmName("get_setterAndGetter") get() = field + @JvmName("set_setterAndGetter") set(value) { field = value } + +var setter: MyValueClass = MyValueClass("setter") + get() = field + @JvmName("set_setter") set(value) { field = value } + +var getter: MyValueClass = MyValueClass("getter") + @JvmName("get_getter") get() = field + set(value) { field = value } + +var nothing: MyValueClass = MyValueClass("nothing") + get() = field + set(value) { field = value } + +fun methodWithValueClass(p: MyValueClass) {} + +@JvmName("_methodWithJvmName") +fun methodWithJvmName(p: MyValueClass) {} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.lib.java new file mode 100644 index 00000000000..771572d7e47 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.lib.java @@ -0,0 +1,42 @@ +public final class ValueClassInParametersWithJvmNameKt /* one.ValueClassInParametersWithJvmNameKt*/ { + @org.jetbrains.annotations.NotNull() + private static java.lang.String getter; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String nothing; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String setter; + + @org.jetbrains.annotations.NotNull() + private static java.lang.String setterAndGetter; + + @kotlin.jvm.JvmName(name = "_methodWithJvmName") + public static final void _methodWithJvmName(@org.jetbrains.annotations.NotNull() java.lang.String);// _methodWithJvmName(java.lang.String) + + @kotlin.jvm.JvmName(name = "get_getter") + @org.jetbrains.annotations.NotNull() + public static final java.lang.String get_getter();// get_getter() + + @kotlin.jvm.JvmName(name = "get_setterAndGetter") + @org.jetbrains.annotations.NotNull() + public static final java.lang.String get_setterAndGetter();// get_setterAndGetter() + + @kotlin.jvm.JvmName(name = "set_setter") + public static final void set_setter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setter(java.lang.String) + + @kotlin.jvm.JvmName(name = "set_setterAndGetter") + public static final void set_setterAndGetter(@org.jetbrains.annotations.NotNull() java.lang.String);// set_setterAndGetter(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getNothing();// getNothing() + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getSetter();// getSetter() + + public static final void methodWithValueClass-rdfNfmQ(@org.jetbrains.annotations.NotNull() java.lang.String);// methodWithValueClass-rdfNfmQ(java.lang.String) + + public static final void setGetter-rdfNfmQ(@org.jetbrains.annotations.NotNull() java.lang.String);// setGetter-rdfNfmQ(java.lang.String) + + public static final void setNothing-rdfNfmQ(@org.jetbrains.annotations.NotNull() java.lang.String);// setNothing-rdfNfmQ(java.lang.String) +} diff --git a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java index 353dd53a612..3fc6c9ca613 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java @@ -269,6 +269,11 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt"); } + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/ValueClassInParametersWithJvmName.kt"); + } + @TestMetadata("VarArgs.kt") public void testVarArgs() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.kt"); @@ -486,6 +491,11 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT public void testSingleJvmClassName() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt"); } + + @TestMetadata("ValueClassInParametersWithJvmName.kt") + public void testValueClassInParametersWithJvmName() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/facades/ValueClassInParametersWithJvmName.kt"); + } } @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations")