diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java index 75793bb164f..32864ce6244 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java @@ -804,6 +804,11 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/mainInObject.kt"); } + @TestMetadata("privateCompanionObject.kt") + public void testPrivateCompanionObject() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt"); + } + @TestMetadata("property.kt") public void testProperty() throws Exception { runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt"); diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt new file mode 100644 index 00000000000..7a809f942eb --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt @@ -0,0 +1,30 @@ +// Issue: KT-25114 +// FIR_IDENTICAL +// !DIAGNOSTICS: -UNUSED_PARAMETER + +class WithPrivateCompanion { + private companion object { + @JvmStatic + val staticVal1: Int = 42 + + val staticVal2: Int + @JvmStatic get() = 42 + + @get:JvmStatic + val staticVal3: Int = 42 + + @JvmStatic + var staticVar1: Int = 42 + + var staticVar2: Int + @JvmStatic get() = 42 + @JvmStatic set(value) {} + + @get: JvmStatic + @set: JvmStatic + var staticVar3: Int = 42 + + @JvmStatic + fun staticFunction() {} + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt new file mode 100644 index 00000000000..f6ceea5ca4d --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt @@ -0,0 +1,22 @@ +package + +public final class WithPrivateCompanion { + public constructor WithPrivateCompanion() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + + private companion object Companion { + private constructor Companion() + @kotlin.jvm.JvmStatic public final val staticVal1: kotlin.Int = 42 + @get:kotlin.jvm.JvmStatic public final val staticVal2: kotlin.Int + @get:kotlin.jvm.JvmStatic public final val staticVal3: kotlin.Int = 42 + @kotlin.jvm.JvmStatic public final var staticVar1: kotlin.Int + @get:kotlin.jvm.JvmStatic @set:kotlin.jvm.JvmStatic public final var staticVar2: kotlin.Int + @get:kotlin.jvm.JvmStatic @set:kotlin.jvm.JvmStatic public final var staticVar3: kotlin.Int + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + @kotlin.jvm.JvmStatic public final fun staticFunction(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + } +} diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index c303f7d0e02..0eb221f47b6 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -804,6 +804,11 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/mainInObject.kt"); } + @TestMetadata("privateCompanionObject.kt") + public void testPrivateCompanionObject() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt"); + } + @TestMetadata("property.kt") public void testProperty() throws Exception { runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java index 14948d93328..ee81362429a 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java @@ -804,6 +804,11 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/mainInObject.kt"); } + @TestMetadata("privateCompanionObject.kt") + public void testPrivateCompanionObject() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt"); + } + @TestMetadata("property.kt") public void testProperty() throws Exception { runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt");