diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index fbd95874318..42568a2aa66 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -28894,6 +28894,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/override/intersectionOfSubstitutedProperties.kt"); } + @Test + @TestMetadata("intersectionOverrideWithProtectedAbstract.kt") + public void testIntersectionOverrideWithProtectedAbstract() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt"); + } + @Test @TestMetadata("intersectionOverrideWithSubsumedDifferentType.kt") public void testIntersectionOverrideWithSubsumedDifferentType() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index 45d6f4de525..20441d54c00 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -28894,6 +28894,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/override/intersectionOfSubstitutedProperties.kt"); } + @Test + @TestMetadata("intersectionOverrideWithProtectedAbstract.kt") + public void testIntersectionOverrideWithProtectedAbstract() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt"); + } + @Test @TestMetadata("intersectionOverrideWithSubsumedDifferentType.kt") public void testIntersectionOverrideWithSubsumedDifferentType() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 2c228f43df0..17da8715e7b 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -26640,6 +26640,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/override/intersectionOfSubstitutedProperties.kt"); } + @Test + @TestMetadata("intersectionOverrideWithProtectedAbstract.kt") + public void testIntersectionOverrideWithProtectedAbstract() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt"); + } + @Test @TestMetadata("intersectionOverrideWithSubsumedDifferentType.kt") public void testIntersectionOverrideWithSubsumedDifferentType() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 2065ea96187..a3c56f7230c 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -26646,6 +26646,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/override/intersectionOfSubstitutedProperties.kt"); } + @Test + @TestMetadata("intersectionOverrideWithProtectedAbstract.kt") + public void testIntersectionOverrideWithProtectedAbstract() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt"); + } + @Test @TestMetadata("intersectionOverrideWithSubsumedDifferentType.kt") public void testIntersectionOverrideWithSubsumedDifferentType() throws Exception { diff --git a/compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt b/compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt new file mode 100644 index 00000000000..e819653e85a --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt @@ -0,0 +1,10 @@ +// FIR_IDENTICAL +public abstract class A { + protected abstract fun bar(): String +} + +public interface B { + public fun bar(): String +} + +public abstract class C: A(), B 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 af57fd4c74d..8792f2bfce3 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 @@ -28894,6 +28894,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/override/intersectionOfSubstitutedProperties.kt"); } + @Test + @TestMetadata("intersectionOverrideWithProtectedAbstract.kt") + public void testIntersectionOverrideWithProtectedAbstract() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/intersectionOverrideWithProtectedAbstract.kt"); + } + @Test @TestMetadata("intersectionOverrideWithSubsumedDifferentType.kt") public void testIntersectionOverrideWithSubsumedDifferentType() throws Exception {