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 6fa6041d23e..81de9f323d0 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 @@ -23022,6 +23022,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/override/Generics.kt"); } + @Test + @TestMetadata("InternalPotentialOverride.kt") + public void testInternalPotentialOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt"); + } + @Test @TestMetadata("InvisiblePotentialOverride.kt") public void testInvisiblePotentialOverride() 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 e8188080598..a67c621b4da 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 @@ -23022,6 +23022,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/override/Generics.kt"); } + @Test + @TestMetadata("InternalPotentialOverride.kt") + public void testInternalPotentialOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt"); + } + @Test @TestMetadata("InvisiblePotentialOverride.kt") public void testInvisiblePotentialOverride() 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 10a71bd29b9..fbfcd2fd69d 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 @@ -23022,6 +23022,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/override/Generics.kt"); } + @Test + @TestMetadata("InternalPotentialOverride.kt") + public void testInternalPotentialOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt"); + } + @Test @TestMetadata("InvisiblePotentialOverride.kt") public void testInvisiblePotentialOverride() throws Exception { diff --git a/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.fir.kt b/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.fir.kt new file mode 100644 index 00000000000..8d18c9b2790 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.fir.kt @@ -0,0 +1,21 @@ +// MODULE: m1 +// FILE: A.kt + +open class A { + internal open fun foo() : Int = 1 +} + +open class AG { + internal open fun bar(arg: T) = arg +} + +// MODULE: m2(m1) +// FILE: B.kt + +class B : A() { + fun foo() : String = "" +} + +class BG : AG() { + fun bar(arg: Int) = arg +} diff --git a/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt b/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt new file mode 100644 index 00000000000..9375cee0704 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt @@ -0,0 +1,21 @@ +// MODULE: m1 +// FILE: A.kt + +open class A { + internal open fun foo() : Int = 1 +} + +open class AG { + internal open fun bar(arg: T) = arg +} + +// MODULE: m2(m1) +// FILE: B.kt + +class B : A() { + fun foo() : String = "" +} + +class BG : AG() { + fun bar(arg: Int) = arg +} diff --git a/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.txt b/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.txt new file mode 100644 index 00000000000..d37a914a80e --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/InternalPotentialOverride.txt @@ -0,0 +1,39 @@ +// -- Module: -- +package + +public open class A { + public constructor A() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + internal open fun foo(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public open class AG { + public constructor AG() + internal open fun bar(/*0*/ arg: T): T + 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 +} + +// -- Module: -- +package + +public final class B : A { + public constructor B() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public final fun foo(): kotlin.String + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public final class BG : AG { + public constructor BG() + public final fun bar(/*0*/ arg: kotlin.Int): kotlin.Int + invisible_fake open override /*1*/ /*fake_override*/ fun bar(/*0*/ arg: kotlin.String): kotlin.String + 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 +} + 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 049f6a05eac..20d94ce08db 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 @@ -23028,6 +23028,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/override/Generics.kt"); } + @Test + @TestMetadata("InternalPotentialOverride.kt") + public void testInternalPotentialOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/InternalPotentialOverride.kt"); + } + @Test @TestMetadata("InvisiblePotentialOverride.kt") public void testInvisiblePotentialOverride() throws Exception {