diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index 3def3ef1e90..733cedd5402 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -33938,6 +33938,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/visibility/overrideOfMemberInPackagePrivateClass.kt"); } + @Test + @TestMetadata("packagePrivateStatic.kt") + public void testPackagePrivateStatic() throws Exception { + runTest("compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt"); + } + @Test @TestMetadata("privateCompanionInSuperClass.kt") public void testPrivateCompanionInSuperClass() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index 42c5ec4b013..431e2546fca 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -33938,6 +33938,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/visibility/overrideOfMemberInPackagePrivateClass.kt"); } + @Test + @TestMetadata("packagePrivateStatic.kt") + public void testPackagePrivateStatic() throws Exception { + runTest("compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt"); + } + @Test @TestMetadata("privateCompanionInSuperClass.kt") public void testPrivateCompanionInSuperClass() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java index 0697929632d..56d7c665c33 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java @@ -33938,6 +33938,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/visibility/overrideOfMemberInPackagePrivateClass.kt"); } + @Test + @TestMetadata("packagePrivateStatic.kt") + public void testPackagePrivateStatic() throws Exception { + runTest("compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt"); + } + @Test @TestMetadata("privateCompanionInSuperClass.kt") public void testPrivateCompanionInSuperClass() throws Exception { diff --git a/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.fir.kt b/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.fir.kt new file mode 100644 index 00000000000..d3320679357 --- /dev/null +++ b/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.fir.kt @@ -0,0 +1,23 @@ +// ISSUE: KT-54125 +// FILE: foo/Base.java +package foo; + +class Base { + protected static void foo() {} +} + +// FILE: foo/Derived.java +package foo; + +public class Derived extends Base {} + +// FILE: main.kt +package bar + +import foo.Derived + +class Impl : Derived() { + fun test() { + foo() + } +} diff --git a/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt b/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt new file mode 100644 index 00000000000..4944a195f84 --- /dev/null +++ b/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt @@ -0,0 +1,23 @@ +// ISSUE: KT-54125 +// FILE: foo/Base.java +package foo; + +class Base { + protected static void foo() {} +} + +// FILE: foo/Derived.java +package foo; + +public class Derived extends Base {} + +// FILE: main.kt +package bar + +import foo.Derived + +class Impl : Derived() { + fun test() { + foo() + } +} diff --git a/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.txt b/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.txt new file mode 100644 index 00000000000..8d980f055de --- /dev/null +++ b/compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.txt @@ -0,0 +1,35 @@ +package + +package bar { + + public final class Impl : foo.Derived { + public constructor Impl() + 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 final fun test(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + } +} + +package foo { + + public/*package*/ open class Base { + public/*package*/ constructor Base() + 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 + + // Static members + protected/*protected static*/ open fun foo(): kotlin.Unit + } + + public open class Derived : foo.Base { + public constructor Derived() + 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 + + // Static members + protected/*protected static*/ open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit + } +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 5ba4e58774b..e05a412db83 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -34028,6 +34028,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/visibility/overrideOfMemberInPackagePrivateClass.kt"); } + @Test + @TestMetadata("packagePrivateStatic.kt") + public void testPackagePrivateStatic() throws Exception { + runTest("compiler/testData/diagnostics/tests/visibility/packagePrivateStatic.kt"); + } + @Test @TestMetadata("privateCompanionInSuperClass.kt") public void testPrivateCompanionInSuperClass() throws Exception {