From d986e0ee9c0541777906555f0aae3fa641affebb Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 12 Mar 2024 12:25:42 +0100 Subject: [PATCH] Tests: move more diagnostic tests to testsWithJvmBackend In this commit, tests where backend diagnostics were reported correctly are being moved. FirScopeDumpHandler was added to FIR diagnostic tests with JVM backend to support `SCOPE_DUMP` in `overridesBuiltinNoMagic.kt` and `charAtAndOverload.kt`. --- ...CompilerTestFE10TestdataTestGenerated.java | 54 ---------- ...sticCompilerFE10TestDataTestGenerated.java | 54 ---------- ...eeOldFrontendDiagnosticsTestGenerated.java | 54 ---------- ...siOldFrontendDiagnosticsTestGenerated.java | 54 ---------- ...gnosticsTestWithJvmIrBackendGenerated.java | 74 ++++++++++++++ ...gnosticsTestWithJvmIrBackendGenerated.java | 74 ++++++++++++++ .../charAtAndOverload.diag.txt | 1 - .../charAtAndOverload.fir.diag.txt | 2 - .../overridesBuiltinNoMagic.txt | 99 ------------------- ...tingOverloadsIdenticalFunsTPInClass.fir.kt | 4 - ...flictingOverloadsIdenticalFunsTPInClass.kt | 4 - ...lictingOverloadsIdenticalFunsTPInClass.txt | 10 -- .../erasure/differentTypeParameterLists.kt | 6 ++ .../javaInterop/charAtAndOverload.diag.txt | 3 + .../charAtAndOverload.fir.diag.txt | 2 + .../javaInterop}/charAtAndOverload.fir.kt | 2 +- .../charAtAndOverload.fir.overrides.txt | 0 .../javaInterop}/charAtAndOverload.kt | 6 +- .../overridesBuiltinNoMagic.fir.kt | 0 .../overridesBuiltinNoMagic.fir.overrides.txt | 0 .../javaInterop}/overridesBuiltinNoMagic.kt | 4 +- .../jvmOverloads/jvmOverloads.fir.kt} | 14 +-- .../jvmOverloads/jvmOverloads.kt | 10 ++ .../jvmStatic/jjk.fir.kt} | 5 +- .../duplicateJvmSignature/jvmStatic/jjk.kt} | 5 +- .../jvmStatic}/jk.fir.kt | 5 +- .../duplicateJvmSignature/jvmStatic}/jk.kt | 5 +- .../jvmStatic}/jkjk.fir.kt | 9 +- .../duplicateJvmSignature/jvmStatic}/jkjk.kt | 9 +- .../jvmStaticInCompanionObject.fir.kt} | 4 +- .../jvmStatic/jvmStaticInCompanionObject.kt} | 4 +- .../jvmStatic}/jvmStaticInObject.fir.kt | 4 +- .../jvmStatic}/jvmStaticInObject.kt | 4 +- .../duplicateJvmSignature/jvmOverloads.fir.kt | 8 -- .../duplicateJvmSignature/jvmOverloads.txt | 10 -- .../jvmStaticInClassObject.txt | 25 ----- .../jvmStaticInObject.txt | 18 ---- .../duplicateJvmSignature/statics/jjk.txt | 43 -------- .../duplicateJvmSignature/statics/jk.txt | 29 ------ .../duplicateJvmSignature/statics/jkjk.txt | 50 ---------- .../test/runners/DiagnosticTestGenerated.java | 54 ---------- ...gnosticsTestWithJvmIrBackendGenerated.java | 74 ++++++++++++++ .../AbstractDiagnosticsTestWithJvmBackend.kt | 7 +- 43 files changed, 296 insertions(+), 607 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.diag.txt delete mode 100644 compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.diag.txt delete mode 100644 compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt create mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt create mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.diag.txt create mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.diag.txt rename compiler/testData/diagnostics/{tests/j+k/collectionOverrides => testsWithJvmBackend/duplicateJvmSignature/javaInterop}/charAtAndOverload.fir.kt (92%) rename compiler/testData/diagnostics/{tests/j+k/collectionOverrides => testsWithJvmBackend/duplicateJvmSignature/javaInterop}/charAtAndOverload.fir.overrides.txt (100%) rename compiler/testData/diagnostics/{tests/j+k/collectionOverrides => testsWithJvmBackend/duplicateJvmSignature/javaInterop}/charAtAndOverload.kt (67%) rename compiler/testData/diagnostics/{tests/j+k/collectionOverrides => testsWithJvmBackend/duplicateJvmSignature/javaInterop}/overridesBuiltinNoMagic.fir.kt (100%) rename compiler/testData/diagnostics/{tests/j+k/collectionOverrides => testsWithJvmBackend/duplicateJvmSignature/javaInterop}/overridesBuiltinNoMagic.fir.overrides.txt (100%) rename compiler/testData/diagnostics/{tests/j+k/collectionOverrides => testsWithJvmBackend/duplicateJvmSignature/javaInterop}/overridesBuiltinNoMagic.kt (95%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt => testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.fir.kt} (50%) create mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/statics/jjk.kt => testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.fir.kt} (88%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/statics/jjk.fir.kt => testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt} (80%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/statics => testsWithJvmBackend/duplicateJvmSignature/jvmStatic}/jk.fir.kt (78%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/statics => testsWithJvmBackend/duplicateJvmSignature/jvmStatic}/jk.kt (78%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/statics => testsWithJvmBackend/duplicateJvmSignature/jvmStatic}/jkjk.fir.kt (75%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/statics => testsWithJvmBackend/duplicateJvmSignature/jvmStatic}/jkjk.kt (75%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt => testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.fir.kt} (55%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.fir.kt => testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt} (55%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature => testsWithJvmBackend/duplicateJvmSignature/jvmStatic}/jvmStaticInObject.fir.kt (63%) rename compiler/testData/diagnostics/{testsWithStdLib/duplicateJvmSignature => testsWithJvmBackend/duplicateJvmSignature/jvmStatic}/jvmStaticInObject.kt (63%) delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt 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 a0b7e185262..f8cd4e9d7fa 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 @@ -22453,12 +22453,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("charAtAndOverload.kt") - public void testCharAtAndOverload() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt"); - } - @Test @TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt") public void testCharAtAndOverloadWithoutExplicitOverride() { @@ -22567,12 +22561,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/nonDirectHiddenOverride.kt"); } - @Test - @TestMetadata("overridesBuiltinNoMagic.kt") - public void testOverridesBuiltinNoMagic() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); - } - @Test @TestMetadata("removeAt.kt") public void testRemoveAt() { @@ -28258,12 +28246,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); } - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt") - public void testConflictingOverloadsIdenticalFunsTPInClass() { - runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); - } - @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() { @@ -44890,24 +44872,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt"); } - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); - } - - @Test - @TestMetadata("jvmStaticInClassObject.kt") - public void testJvmStaticInClassObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt"); - } - - @Test - @TestMetadata("jvmStaticInObject.kt") - public void testJvmStaticInObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt"); - } - @Nested @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @@ -44917,24 +44881,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("jjk.kt") - public void testJjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); - } - - @Test - @TestMetadata("jk.kt") - public void testJk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); - } - @Test @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() { 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 71dace03012..4d0e91520b4 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 @@ -22453,12 +22453,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("charAtAndOverload.kt") - public void testCharAtAndOverload() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt"); - } - @Test @TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt") public void testCharAtAndOverloadWithoutExplicitOverride() { @@ -22567,12 +22561,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/nonDirectHiddenOverride.kt"); } - @Test - @TestMetadata("overridesBuiltinNoMagic.kt") - public void testOverridesBuiltinNoMagic() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); - } - @Test @TestMetadata("removeAt.kt") public void testRemoveAt() { @@ -28258,12 +28246,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); } - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt") - public void testConflictingOverloadsIdenticalFunsTPInClass() { - runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); - } - @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() { @@ -44890,24 +44872,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt"); } - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); - } - - @Test - @TestMetadata("jvmStaticInClassObject.kt") - public void testJvmStaticInClassObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt"); - } - - @Test - @TestMetadata("jvmStaticInObject.kt") - public void testJvmStaticInObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt"); - } - @Nested @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @@ -44917,24 +44881,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("jjk.kt") - public void testJjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); - } - - @Test - @TestMetadata("jk.kt") - public void testJk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); - } - @Test @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() { 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 dda1a0411f0..2f0a35b7033 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 @@ -22447,12 +22447,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); } - @Test - @TestMetadata("charAtAndOverload.kt") - public void testCharAtAndOverload() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt"); - } - @Test @TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt") public void testCharAtAndOverloadWithoutExplicitOverride() { @@ -22561,12 +22555,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/nonDirectHiddenOverride.kt"); } - @Test - @TestMetadata("overridesBuiltinNoMagic.kt") - public void testOverridesBuiltinNoMagic() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); - } - @Test @TestMetadata("removeAt.kt") public void testRemoveAt() { @@ -25956,12 +25944,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); } - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt") - public void testConflictingOverloadsIdenticalFunsTPInClass() { - runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); - } - @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() { @@ -42456,24 +42438,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt"); } - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); - } - - @Test - @TestMetadata("jvmStaticInClassObject.kt") - public void testJvmStaticInClassObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt"); - } - - @Test - @TestMetadata("jvmStaticInObject.kt") - public void testJvmStaticInObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt"); - } - @Nested @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @@ -42483,24 +42447,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("jjk.kt") - public void testJjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); - } - - @Test - @TestMetadata("jk.kt") - public void testJk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); - } - @Test @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() { 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 abc16ff3759..ac61f077b7d 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 @@ -22453,12 +22453,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); } - @Test - @TestMetadata("charAtAndOverload.kt") - public void testCharAtAndOverload() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt"); - } - @Test @TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt") public void testCharAtAndOverloadWithoutExplicitOverride() { @@ -22567,12 +22561,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/nonDirectHiddenOverride.kt"); } - @Test - @TestMetadata("overridesBuiltinNoMagic.kt") - public void testOverridesBuiltinNoMagic() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); - } - @Test @TestMetadata("removeAt.kt") public void testRemoveAt() { @@ -25962,12 +25950,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); } - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt") - public void testConflictingOverloadsIdenticalFunsTPInClass() { - runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); - } - @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() { @@ -42594,24 +42576,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt"); } - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); - } - - @Test - @TestMetadata("jvmStaticInClassObject.kt") - public void testJvmStaticInClassObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt"); - } - - @Test - @TestMetadata("jvmStaticInObject.kt") - public void testJvmStaticInObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt"); - } - @Nested @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @@ -42621,24 +42585,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("jjk.kt") - public void testJjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); - } - - @Test - @TestMetadata("jk.kt") - public void testJk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); - } - @Test @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java index 0ea9ddebb45..c762d87a59a 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java @@ -288,6 +288,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); } + @Test + @TestMetadata("differentTypeParameterLists.kt") + public void testDifferentTypeParameterLists() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt"); + } + @Test @TestMetadata("extensionProperties.kt") public void testExtensionProperties() { @@ -538,6 +544,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } + @Test + @TestMetadata("charAtAndOverload.kt") + public void testCharAtAndOverload() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt"); + } + @Test @TestMetadata("inheritFromJavaCollectionSubclassWithContainsOverload.kt") public void testInheritFromJavaCollectionSubclassWithContainsOverload() { @@ -550,6 +562,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt"); } + @Test + @TestMetadata("overridesBuiltinNoMagic.kt") + public void testOverridesBuiltinNoMagic() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt"); + } + @Test @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() { @@ -573,6 +591,62 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra } } + @Nested + @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads") + @TestDataPath("$PROJECT_ROOT") + public class JvmOverloads { + @Test + public void testAllFilesPresentInJvmOverloads() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); + } + + @Test + @TestMetadata("jvmOverloads.kt") + public void testJvmOverloads() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic") + @TestDataPath("$PROJECT_ROOT") + public class JvmStatic { + @Test + public void testAllFilesPresentInJvmStatic() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); + } + + @Test + @TestMetadata("jjk.kt") + public void testJjk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt"); + } + + @Test + @TestMetadata("jk.kt") + public void testJk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt"); + } + + @Test + @TestMetadata("jkjk.kt") + public void testJkjk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt"); + } + + @Test + @TestMetadata("jvmStaticInCompanionObject.kt") + public void testJvmStaticInCompanionObject() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt"); + } + + @Test + @TestMetadata("jvmStaticInObject.kt") + public void testJvmStaticInObject() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java index 626f8c5db79..8ea3f92c14d 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java @@ -288,6 +288,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); } + @Test + @TestMetadata("differentTypeParameterLists.kt") + public void testDifferentTypeParameterLists() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt"); + } + @Test @TestMetadata("extensionProperties.kt") public void testExtensionProperties() { @@ -538,6 +544,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } + @Test + @TestMetadata("charAtAndOverload.kt") + public void testCharAtAndOverload() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt"); + } + @Test @TestMetadata("inheritFromJavaCollectionSubclassWithContainsOverload.kt") public void testInheritFromJavaCollectionSubclassWithContainsOverload() { @@ -550,6 +562,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt"); } + @Test + @TestMetadata("overridesBuiltinNoMagic.kt") + public void testOverridesBuiltinNoMagic() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt"); + } + @Test @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() { @@ -573,6 +591,62 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP } } + @Nested + @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads") + @TestDataPath("$PROJECT_ROOT") + public class JvmOverloads { + @Test + public void testAllFilesPresentInJvmOverloads() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); + } + + @Test + @TestMetadata("jvmOverloads.kt") + public void testJvmOverloads() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic") + @TestDataPath("$PROJECT_ROOT") + public class JvmStatic { + @Test + public void testAllFilesPresentInJvmStatic() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); + } + + @Test + @TestMetadata("jjk.kt") + public void testJjk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt"); + } + + @Test + @TestMetadata("jk.kt") + public void testJk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt"); + } + + @Test + @TestMetadata("jkjk.kt") + public void testJkjk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt"); + } + + @Test + @TestMetadata("jvmStaticInCompanionObject.kt") + public void testJvmStaticInCompanionObject() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt"); + } + + @Test + @TestMetadata("jvmStaticInObject.kt") + public void testJvmStaticInObject() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.diag.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.diag.txt deleted file mode 100644 index 8b137891791..00000000000 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.diag.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.diag.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.diag.txt deleted file mode 100644 index af6beadfe01..00000000000 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.diag.txt +++ /dev/null @@ -1,2 +0,0 @@ -/main.kt:(78,81): error: This function accidentally overrides both 'public open operator fun /A.get(index: kotlin/Int): kotlin/Char' and a renamed function 'public open fun /A.charAt(index: kotlin/Int): kotlin/Char' from JVM point of view because of mixed Java/Kotlin hierarchy. -This situation provokes a JVM clash and thus is forbidden. To fix it, you have to delete either this function or one of overridden functions. diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt deleted file mode 100644 index 3d96d47c10f..00000000000 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt +++ /dev/null @@ -1,99 +0,0 @@ -package - -public fun main(): kotlin.Unit - -public open class X : kotlin.collections.MutableList { - public constructor X() - @get:java.lang.Override public open override /*1*/ val size: kotlin.Int - @java.lang.Override public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit - @java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit - @java.lang.Override public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean - public open operator fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String! - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @java.lang.Override public open override /*1*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int - @java.lang.Override public open override /*1*/ fun isEmpty(): kotlin.Boolean - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator - @java.lang.Override public open override /*1*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun listIterator(): kotlin.collections.MutableListIterator - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - @java.lang.Override public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - public open fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - @java.lang.Override public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList - @org.jetbrains.annotations.NotNull @java.lang.Override public open fun toArray(): kotlin.Array<(out) kotlin.Any!> - @org.jetbrains.annotations.NotNull @java.lang.Override public open fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!> - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Y : X { - public constructor Y() - @get:java.lang.Override public open override /*1*/ /*fake_override*/ val size: kotlin.Int - @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit - @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit - @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String! - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @java.lang.Override public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int - @java.lang.Override public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator - @java.lang.Override public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - @java.lang.Override public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - @java.lang.Override public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!> - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!> - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Y2 : X { - public constructor Y2() - @get:java.lang.Override public open override /*1*/ /*fake_override*/ val size: kotlin.Int - @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit - @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit - @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String! - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @java.lang.Override public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int - @java.lang.Override public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator - @java.lang.Override public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - @java.lang.Override public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String - @java.lang.Override public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - @java.lang.Override public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - @java.lang.Override public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!> - @org.jetbrains.annotations.NotNull @java.lang.Override public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!> - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.fir.kt b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.fir.kt deleted file mode 100644 index 48213d13dd6..00000000000 --- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -class Aaa() { - fun f() = 1 - fun

f() = 1 -} diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt deleted file mode 100644 index c2ab4d46377..00000000000 --- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt +++ /dev/null @@ -1,4 +0,0 @@ -class Aaa() { - fun f() = 1 - fun

f() = 1 -} diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt deleted file mode 100644 index d6fa8b777f5..00000000000 --- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class Aaa { - public constructor Aaa() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun f(): kotlin.Int - public final fun f(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt new file mode 100644 index 00000000000..2aee5c52fea --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt @@ -0,0 +1,6 @@ +// FIR_IDENTICAL + +class Aaa() { + fun f() = 1 + fun

f() = 1 +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.diag.txt new file mode 100644 index 00000000000..4f9e47aaf3b --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.diag.txt @@ -0,0 +1,3 @@ +/main.kt:21:14: error: Accidental override: The following declarations have the same JVM signature (get(I)C): + fun get(index: Int): Char defined in KA + fun get(index: Int): Char defined in KA diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.diag.txt new file mode 100644 index 00000000000..401fc003db3 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.diag.txt @@ -0,0 +1,2 @@ +/main.kt:21:18: error: This function accidentally overrides both 'public open operator fun /A.get(index: kotlin/Int): kotlin/Char' and a renamed function 'public open fun /A.charAt(index: kotlin/Int): kotlin/Char' from JVM point of view because of mixed Java/Kotlin hierarchy. +This situation provokes a JVM clash and thus is forbidden. To fix it, you have to delete either this function or one of overridden functions. diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.kt similarity index 92% rename from compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.kt index 50c2555ebae..9700faff926 100644 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.kt @@ -1,5 +1,5 @@ // SCOPE_DUMP: KA:get -// RENDER_DIAGNOSTICS_FULL_TEXT +// RENDER_ALL_DIAGNOSTICS_FULL_TEXT // FILE: A.java abstract public class A implements CharSequence { diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.overrides.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.overrides.txt similarity index 100% rename from compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.fir.overrides.txt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.fir.overrides.txt diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt similarity index 67% rename from compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt index 52f80874c88..8de35c5a773 100644 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt @@ -1,5 +1,5 @@ // SCOPE_DUMP: KA:get -// RENDER_DIAGNOSTICS_FULL_TEXT +// RENDER_ALL_DIAGNOSTICS_FULL_TEXT // FILE: A.java abstract public class A implements CharSequence { @@ -17,8 +17,8 @@ abstract public class A implements CharSequence { } // FILE: main.kt -abstract class KA : A() { - override fun get(index: Int) = 'O' +abstract class KA : A() { + override fun get(index: Int) = 'O' } fun foo(a: A, ka: KA) { diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.fir.kt diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.overrides.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.fir.overrides.txt similarity index 100% rename from compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.overrides.txt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.fir.overrides.txt diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt similarity index 95% rename from compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt index 28f432c7c5e..ae59ee771dd 100644 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt @@ -145,8 +145,8 @@ public class X implements java.util.List { // FILE: main.kt class Y : X() -class Y2 : X() { - override fun removeAt(index: Int) = "" +class Y2 : X() { + override fun removeAt(index: Int) = "" } fun main() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.fir.kt similarity index 50% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.fir.kt index d24851c5996..db0bf57dc44 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.fir.kt @@ -1,8 +1,10 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER -class A { - @kotlin.jvm.JvmOverloads fun foo(s: String = "") { - } - fun foo() { - } -} \ No newline at end of file +class A { + @kotlin.jvm.JvmOverloads fun foo(s: String = "") { + } + + fun foo() { + } +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt new file mode 100644 index 00000000000..e09691bb4af --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt @@ -0,0 +1,10 @@ +// WITH_STDLIB +// !DIAGNOSTICS: -UNUSED_PARAMETER + +class A { + @kotlin.jvm.JvmOverloads fun foo(s: String = "") { + } + + fun foo() { + } +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.fir.kt similarity index 88% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.fir.kt index 26bbe9513e8..08cee2cdb71 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.fir.kt @@ -1,3 +1,4 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: A.java @@ -18,11 +19,11 @@ public class B extends A { open class K : B() { companion object { @JvmStatic - fun foo() {} + fun foo() {} @JvmStatic fun foo(a: Any) {} @JvmStatic - fun bar(i: Int) {} + fun bar(i: Int) {} @JvmStatic fun bar(i: String) {} @JvmStatic diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt similarity index 80% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt index 15daf06a85c..3e29b9c8a81 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt @@ -1,3 +1,4 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: A.java @@ -18,11 +19,11 @@ public class B extends A { open class K : B() { companion object { @JvmStatic - fun foo() {} + fun foo() {} @JvmStatic fun foo(a: Any) {} @JvmStatic - fun bar(i: Int) {} + fun bar(i: Int) {} @JvmStatic fun bar(i: String) {} @JvmStatic diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.fir.kt similarity index 78% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.fir.kt index afa092473d0..ef103507621 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.fir.kt @@ -1,3 +1,4 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: A.java @@ -11,8 +12,8 @@ public class A { open class K : A() { companion object { - @JvmStatic - fun foo() {} + @JvmStatic + fun foo() {} @JvmStatic fun foo(i: Int) {} @JvmStatic diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt similarity index 78% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt index 338db91ec7c..160cf91c89b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt @@ -1,3 +1,4 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: A.java @@ -11,8 +12,8 @@ public class A { open class K : A() { companion object { - @JvmStatic - fun foo() {} + @JvmStatic + fun foo() {} @JvmStatic fun foo(i: Int) {} @JvmStatic diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.fir.kt similarity index 75% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.fir.kt index 4cbfbe6900e..6255f7c26ef 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.fir.kt @@ -1,3 +1,4 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: A.java @@ -22,12 +23,12 @@ public class C extends B { open class K : C() { companion object { - @JvmStatic - fun foo() {} + @JvmStatic + fun foo() {} @JvmStatic fun foo(a: Any) {} - @JvmStatic - fun bar(i: Int) {} + @JvmStatic + fun bar(i: Int) {} @JvmStatic fun bar(i: String) {} @JvmStatic diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt similarity index 75% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt index 4ef4b531373..86ac3a9b991 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt @@ -1,3 +1,4 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER // FILE: A.java @@ -22,12 +23,12 @@ public class C extends B { open class K : C() { companion object { - @JvmStatic - fun foo() {} + @JvmStatic + fun foo() {} @JvmStatic fun foo(a: Any) {} - @JvmStatic - fun bar(i: Int) {} + @JvmStatic + fun bar(i: Int) {} @JvmStatic fun bar(i: String) {} @JvmStatic diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.fir.kt similarity index 55% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.fir.kt index 09f55e384e8..82fd14407e5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.fir.kt @@ -1,9 +1,11 @@ +// WITH_STDLIB + open class Base { fun foo() {} } class Derived : Base() { companion object { - @JvmStatic fun foo() {} + @JvmStatic fun foo() {} } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt similarity index 55% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt index 75dbf07a49b..b099c749080 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt @@ -1,9 +1,11 @@ +// WITH_STDLIB + open class Base { fun foo() {} } class Derived : Base() { companion object { - @JvmStatic fun foo() {} + @JvmStatic fun foo() {} } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.fir.kt similarity index 63% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.fir.kt index 4d62b986a12..8474ba20c40 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.fir.kt @@ -1,8 +1,10 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER + open class Base { fun `foo$default`(i: Int, mask: Int, mh: Any) {} } object Derived : Base() { - @JvmStatic fun foo(i: Int = 0) {} + @JvmStatic fun foo(i: Int = 0) {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt similarity index 63% rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt index 1515072eccc..84a47ea4ca0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt @@ -1,8 +1,10 @@ +// WITH_STDLIB // !DIAGNOSTICS: -UNUSED_PARAMETER + open class Base { fun `foo$default`(i: Int, mask: Int, mh: Any) {} } object Derived : Base() { - @JvmStatic fun foo(i: Int = 0) {} + @JvmStatic fun foo(i: Int = 0) {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.fir.kt deleted file mode 100644 index a394011a653..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -class A { - @kotlin.jvm.JvmOverloads fun foo(s: String = "") { - } - - fun foo() { - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt deleted file mode 100644 index ee2b98e34eb..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - @kotlin.jvm.JvmOverloads public final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt deleted file mode 100644 index 7d99c62ae93..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt +++ /dev/null @@ -1,25 +0,0 @@ -package - -public open class Base { - public constructor Base() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final class Derived : Base { - public constructor Derived() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt deleted file mode 100644 index b605d018c1d..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt +++ /dev/null @@ -1,18 +0,0 @@ -package - -public open class Base { - public constructor Base() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public object Derived : Base { - private constructor Derived() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt deleted file mode 100644 index fbbef6047b0..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.txt +++ /dev/null @@ -1,43 +0,0 @@ -package - -public open class A { - public constructor A() - 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 - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class B : A { - public constructor B() - 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 - public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit -} - -public open class K : B { - public constructor K() - 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 - - public companion object Companion { - private constructor Companion() - @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt deleted file mode 100644 index b447dc9fc7f..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.txt +++ /dev/null @@ -1,29 +0,0 @@ -package - -public open class A { - public constructor A() - 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 - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class K : A { - public constructor K() - 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 - - public companion object Companion { - private constructor Companion() - @kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun foo(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt deleted file mode 100644 index 64ae44d81c8..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.txt +++ /dev/null @@ -1,50 +0,0 @@ -package - -public open class A { - public constructor A() - 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 - public open fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open fun foo(): kotlin.Unit -} - -public open class B : A { - public constructor B() - 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 -} - -public open class C : B { - public constructor C() - 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 - public open fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun baz(/*0*/ s: kotlin.String!): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit -} - -public open class K : C { - public constructor K() - 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 - - public companion object Companion { - private constructor Companion() - @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.Int): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun bar(/*0*/ i: kotlin.String): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun baz(/*0*/ i: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @kotlin.jvm.JvmStatic public final fun foo(): kotlin.Unit - @kotlin.jvm.JvmStatic public final fun foo(/*0*/ a: kotlin.Any): kotlin.Unit - 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 88b66120ae9..78265916962 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 @@ -22453,12 +22453,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("charAtAndOverload.kt") - public void testCharAtAndOverload() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/charAtAndOverload.kt"); - } - @Test @TestMetadata("charAtAndOverloadWithoutExplicitOverride.kt") public void testCharAtAndOverloadWithoutExplicitOverride() { @@ -22567,12 +22561,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/nonDirectHiddenOverride.kt"); } - @Test - @TestMetadata("overridesBuiltinNoMagic.kt") - public void testOverridesBuiltinNoMagic() { - runTest("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); - } - @Test @TestMetadata("removeAt.kt") public void testRemoveAt() { @@ -28258,12 +28246,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); } - @Test - @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt") - public void testConflictingOverloadsIdenticalFunsTPInClass() { - runTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); - } - @Test @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() { @@ -44890,24 +44872,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt"); } - @Test - @TestMetadata("jvmOverloads.kt") - public void testJvmOverloads() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); - } - - @Test - @TestMetadata("jvmStaticInClassObject.kt") - public void testJvmStaticInClassObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt"); - } - - @Test - @TestMetadata("jvmStaticInObject.kt") - public void testJvmStaticInObject() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt"); - } - @Nested @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @@ -44917,24 +44881,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } - @Test - @TestMetadata("jjk.kt") - public void testJjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); - } - - @Test - @TestMetadata("jk.kt") - public void testJk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); - } - - @Test - @TestMetadata("jkjk.kt") - public void testJkjk() { - runTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); - } - @Test @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java index 8b7abebfe4b..b012657e935 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java @@ -289,6 +289,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); } + @Test + @TestMetadata("differentTypeParameterLists.kt") + public void testDifferentTypeParameterLists() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/differentTypeParameterLists.kt"); + } + @Test @TestMetadata("extensionProperties.kt") public void testExtensionProperties() { @@ -539,6 +545,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true); } + @Test + @TestMetadata("charAtAndOverload.kt") + public void testCharAtAndOverload() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/charAtAndOverload.kt"); + } + @Test @TestMetadata("inheritFromJavaCollectionSubclassWithContainsOverload.kt") public void testInheritFromJavaCollectionSubclassWithContainsOverload() { @@ -551,6 +563,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt"); } + @Test + @TestMetadata("overridesBuiltinNoMagic.kt") + public void testOverridesBuiltinNoMagic() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/overridesBuiltinNoMagic.kt"); + } + @Test @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() { @@ -574,6 +592,62 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic } } + @Nested + @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads") + @TestDataPath("$PROJECT_ROOT") + public class JvmOverloads { + @Test + public void testAllFilesPresentInJvmOverloads() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("jvmOverloads.kt") + public void testJvmOverloads() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmOverloads/jvmOverloads.kt"); + } + } + + @Nested + @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic") + @TestDataPath("$PROJECT_ROOT") + public class JvmStatic { + @Test + public void testAllFilesPresentInJvmStatic() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true); + } + + @Test + @TestMetadata("jjk.kt") + public void testJjk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jjk.kt"); + } + + @Test + @TestMetadata("jk.kt") + public void testJk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jk.kt"); + } + + @Test + @TestMetadata("jkjk.kt") + public void testJkjk() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jkjk.kt"); + } + + @Test + @TestMetadata("jvmStaticInCompanionObject.kt") + public void testJvmStaticInCompanionObject() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInCompanionObject.kt"); + } + + @Test + @TestMetadata("jvmStaticInObject.kt") + public void testJvmStaticInObject() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/jvmStatic/jvmStaticInObject.kt"); + } + } + @Nested @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt index faf963f137f..0d1f6c67db0 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt @@ -22,13 +22,13 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler -import org.jetbrains.kotlin.test.frontend.classic.handlers.DeclarationsDumpHandler import org.jetbrains.kotlin.test.frontend.classic.handlers.FirTestDataConsistencyHandler import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJvmResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler +import org.jetbrains.kotlin.test.frontend.fir.handlers.FirScopeDumpHandler import org.jetbrains.kotlin.test.frontend.fir.handlers.PsiLightTreeMetaInfoProcessor import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator @@ -80,7 +80,10 @@ abstract class AbstractDiagnosticsTestWithJvmBackend