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 491f662972a..8723651c70a 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 @@ -24684,6 +24684,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); } + @Test + @TestMetadata("MultipleDefaultsAndSubstitutionOverrides.kt") + public void testMultipleDefaultsAndSubstitutionOverrides() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt"); + } + @Test @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt") public void testMultipleDefaultsInSupertypesNoExplicitOverride() 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 00910487b52..fe436dc57fa 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 @@ -24684,6 +24684,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); } + @Test + @TestMetadata("MultipleDefaultsAndSubstitutionOverrides.kt") + public void testMultipleDefaultsAndSubstitutionOverrides() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt"); + } + @Test @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt") public void testMultipleDefaultsInSupertypesNoExplicitOverride() 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 ae4dbd3293d..d78c6f08315 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 @@ -24684,6 +24684,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); } + @Test + @TestMetadata("MultipleDefaultsAndSubstitutionOverrides.kt") + public void testMultipleDefaultsAndSubstitutionOverrides() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt"); + } + @Test @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt") public void testMultipleDefaultsInSupertypesNoExplicitOverride() 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 aeeae06fbf6..06d9dcd69be 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 @@ -24690,6 +24690,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); } + @Test + @TestMetadata("MultipleDefaultsAndSubstitutionOverrides.kt") + public void testMultipleDefaultsAndSubstitutionOverrides() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt"); + } + @Test @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt") public void testMultipleDefaultsInSupertypesNoExplicitOverride() throws Exception { diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.fir.kt b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.fir.kt new file mode 100644 index 00000000000..69171a53300 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.fir.kt @@ -0,0 +1,15 @@ +interface A { + fun foo(x: Int = 42): Int +} + +open class B { + fun foo(x: Int = 239) = x +} + +interface C { + fun foo(x: Int): Int +} + +open class Z : A, B(), C + +class N : Z() diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt new file mode 100644 index 00000000000..4dd2340c5ce --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt @@ -0,0 +1,15 @@ +interface A { + fun foo(x: Int = 42): Int +} + +open class B { + fun foo(x: Int = 239) = x +} + +interface C { + fun foo(x: Int): Int +} + +open class Z : A, B(), C + +class N : Z() 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 89202ee5bf8..75a6a025ec1 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 @@ -26472,6 +26472,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); } + @Test + @TestMetadata("MultipleDefaultsAndSubstitutionOverrides.kt") + public void testMultipleDefaultsAndSubstitutionOverrides() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndSubstitutionOverrides.kt"); + } + @Test @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt") public void testMultipleDefaultsInSupertypesNoExplicitOverride() throws Exception {