From bd7e5fd324880df7248b56c76043132ffcf85ede Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 6 Feb 2023 13:41:37 +0100 Subject: [PATCH] [LC] update testData for objects ^KTIJ-24119 --- ...htClassesByPsiForLibraryTestGenerated.java | 6 + ...ghtClassesByPsiForSourceTestGenerated.java | 6 + .../lightClassByPsi/companionDuplication.java | 23 +++ .../lightClassByPsi/companionDuplication.kt | 9 ++ .../lightClassByPsi/objects.fir.java | 9 -- .../lightClasses/lightClassByPsi/objects.java | 6 - .../lightClasses/lightClassByPsi/objects.kt | 3 - .../lightClassByPsi/objects.lib.java | 150 ++++++++++++++++++ 8 files changed, 194 insertions(+), 18 deletions(-) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.kt create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java index 1ab4abf081b..16cea2b574f 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java @@ -54,6 +54,12 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.kt"); } + @Test + @TestMetadata("companionDuplication.kt") + public void testCompanionDuplication() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.kt"); + } + @Test @TestMetadata("constructors.kt") public void testConstructors() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java index fdc1934b66a..3ad46bfb136 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java @@ -54,6 +54,12 @@ public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbo runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.kt"); } + @Test + @TestMetadata("companionDuplication.kt") + public void testCompanionDuplication() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.kt"); + } + @Test @TestMetadata("constructors.kt") public void testConstructors() throws Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.java new file mode 100644 index 00000000000..78d89183445 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.java @@ -0,0 +1,23 @@ +public final class C /* C*/ { + @org.jetbrains.annotations.NotNull() + public static final C.Companion Companion; + + @org.jetbrains.annotations.NotNull() + public static final C.Factory Factory; + + public C();// .ctor() + + class Companion ... + + class Factory ... +} + +public static final class Companion /* C.Companion*/ { + private Companion();// .ctor() + + public final void bar();// bar() +} + +public static final class Factory /* C.Factory*/ { + private Factory();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.kt new file mode 100644 index 00000000000..8f9803adfd7 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/companionDuplication.kt @@ -0,0 +1,9 @@ +class C { + companion object { + fun bar() {} + } + + companion object Factory {} +} + +// COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java index c6cbdb8817a..76b77a54998 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java @@ -12,9 +12,6 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public static final C.Companion Companion; - @org.jetbrains.annotations.NotNull() - public static final C.Factory Factory; - @kotlin.jvm.JvmStatic() @org.jetbrains.annotations.NotNull() public static final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);// getC(I) @@ -36,8 +33,6 @@ public final class C /* C*/ { public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) class Companion ... - - class Factory ... } public final class C1 /* C1*/ { @@ -134,10 +129,6 @@ public final class ConstContainer /* ConstContainer*/ { private ConstContainer();// .ctor() } -public static final class Factory /* C.Factory*/ { - private Factory();// .ctor() -} - public abstract interface I /* I*/ { @org.jetbrains.annotations.NotNull() public static final I.Companion Companion; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java index 8203bfdb6d6..a6a9ae5b28f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java @@ -26,8 +26,6 @@ public final class C /* C*/ { public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) class Companion ... - - class Factory ... } public final class C1 /* C1*/ { @@ -124,10 +122,6 @@ public final class ConstContainer /* ConstContainer*/ { private ConstContainer();// .ctor() } -public static final class Factory /* C.Factory*/ { - private Factory();// .ctor() -} - public abstract interface I /* I*/ { @org.jetbrains.annotations.NotNull() public static final I.Companion Companion; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.kt index 44124c791ff..7d5ffa1f3d7 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.kt @@ -13,7 +13,6 @@ class C { get() = "OK" @JvmStatic set(t: String) {} } - companion object Factory {} } class C1 { @@ -51,5 +50,3 @@ class ClassWithConstContainer { const val complexFloat = 2.7182818284f + 2.4 // Float } } - -// COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java new file mode 100644 index 00000000000..22fb509c32f --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java @@ -0,0 +1,150 @@ +public final class C /* C*/ { + @org.jetbrains.annotations.NotNull() + private static java.lang.String x; + + @org.jetbrains.annotations.NotNull() + public static final C.Companion Companion; + + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);// getC(I) + + @kotlin.jvm.JvmStatic() + public static final void foo();// foo() + + @kotlin.jvm.JvmStatic() + public static final void setC(@org.jetbrains.annotations.NotNull() I, @org.jetbrains.annotations.NotNull() java.lang.String);// setC(I, java.lang.String) + + @kotlin.jvm.JvmStatic() + public static final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);// setC1(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getX();// getX() + + public C();// .ctor() + + public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) + + class Companion ... +} + +public final class C1 /* C1*/ { + @org.jetbrains.annotations.NotNull() + private static final C1.Companion Companion; + + public C1();// .ctor() + + class Companion ... +} + +public final class ClassWithConstContainer /* ClassWithConstContainer*/ { + @org.jetbrains.annotations.NotNull() + public static final ClassWithConstContainer.Companion Companion; + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */; + + public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */; + + public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */; + + public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */; + + public static final int one = 1 /* initializer type: int */ /* constant value 1 */; + + public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */; + + public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */; + + public ClassWithConstContainer();// .ctor() + + class Companion ... +} + +private static final class Companion /* C1.Companion*/ { + private Companion();// .ctor() +} + +public static final class Companion /* I.Companion*/ { + private Companion();// .ctor() +} + +public static final class Companion /* ClassWithConstContainer.Companion*/ { + private Companion();// .ctor() +} + +public static final class Companion /* C.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);// getC(I) + + @kotlin.jvm.JvmStatic() + public final void foo();// foo() + + @kotlin.jvm.JvmStatic() + public final void setC(@org.jetbrains.annotations.NotNull() I, @org.jetbrains.annotations.NotNull() java.lang.String);// setC(I, java.lang.String) + + @kotlin.jvm.JvmStatic() + public final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);// setC1(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getC1();// getC1() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getX();// getX() + + private Companion();// .ctor() + + public final void bar();// bar() + + public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) +} + +public final class ConstContainer /* ConstContainer*/ { + @org.jetbrains.annotations.NotNull() + public static final ConstContainer INSTANCE; + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */; + + public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */; + + public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */; + + public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */; + + public static final int one = 1 /* initializer type: int */ /* constant value 1 */; + + public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */; + + public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */; + + private ConstContainer();// .ctor() +} + +public abstract interface I /* I*/ { + @org.jetbrains.annotations.NotNull() + public static final I.Companion Companion; + + class Companion ... +} + +public final class Obj /* Obj*/ implements java.lang.Runnable { + @org.jetbrains.annotations.NotNull() + private static java.lang.String x; + + @org.jetbrains.annotations.NotNull() + public static final Obj INSTANCE; + + @kotlin.jvm.JvmStatic() + public static final int zoo();// zoo() + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getX();// getX() + + private Obj();// .ctor() + + public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) + + public void run();// run() +}