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 09e0a53e172..7a5a5731f9b 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 @@ -627,6 +627,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") + public void testIntersectionWithMultipleDefaultsInJava() { + runTest("compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt"); + } + @Test @TestMetadata("invalidTargetCrashesCompiler.kt") public void testInvalidTargetCrashesCompiler() { 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 5ae0538ed5a..67443c6c626 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 @@ -627,6 +627,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") + public void testIntersectionWithMultipleDefaultsInJava() { + runTest("compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt"); + } + @Test @TestMetadata("invalidTargetCrashesCompiler.kt") public void testInvalidTargetCrashesCompiler() { 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 83b0fe3d2a6..a1474d19fbb 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 @@ -627,6 +627,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") + public void testIntersectionWithMultipleDefaultsInJava() { + runTest("compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt"); + } + @Test @TestMetadata("invalidTargetCrashesCompiler.kt") public void testInvalidTargetCrashesCompiler() { 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 991bfbaa360..606325add90 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 @@ -627,6 +627,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") + public void testIntersectionWithMultipleDefaultsInJava() { + runTest("compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt"); + } + @Test @TestMetadata("invalidTargetCrashesCompiler.kt") public void testInvalidTargetCrashesCompiler() { diff --git a/compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt b/compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt new file mode 100644 index 00000000000..17048d1fce7 --- /dev/null +++ b/compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt @@ -0,0 +1,35 @@ +// FIR_IDENTICAL +// TARGET_BACKEND: JVM + +// FILE: IntCollection.java +interface IntCollection { + public boolean add(int key); +} + +// FILE: IntSet.java +interface IntSet extends IntCollection { + public default boolean add(Integer it) { return true; } + + // from the supertype + // public boolean add(int key); +} + +// FILE: AbstractCollection.java +abstract class AbstractCollection { + public boolean add(E it) { return true; } +} + +// FILE: AbstractIntCollection.java +abstract class AbstractIntCollection extends AbstractCollection { + public boolean add(int it) { return true; } + + // from the supertype + // public default boolen add(Integer it) { return true; } +} + +// FILE: AbstractIntSet.java +public abstract class AbstractIntSet extends AbstractIntCollection implements IntSet {} + +// FILE: Main.kt + +class KotlinClass : AbstractIntSet() 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 d3192ad6716..fd75617074f 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 @@ -627,6 +627,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") + public void testIntersectionWithMultipleDefaultsInJava() { + runTest("compiler/testData/diagnostics/tests/intersectionWithMultipleDefaultsInJava.kt"); + } + @Test @TestMetadata("invalidTargetCrashesCompiler.kt") public void testInvalidTargetCrashesCompiler() {