From db173b8ac537a1d2c292b027d8be0ea24d0e813d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 22 Feb 2024 12:06:36 +0100 Subject: [PATCH] K1/K2: add test for Comparator.comparing situation from intellij --- ...iagnosticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...sedDiagnosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...irLightTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../platformTypes/comparingWithWrongNullability.kt | 10 ++++++++++ .../kotlin/test/runners/DiagnosticTestGenerated.java | 6 ++++++ 6 files changed, 40 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt 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 f2a672e1c6b..8158d8caf1e 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 @@ -29752,6 +29752,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } + @Test + @TestMetadata("comparingWithWrongNullability.kt") + public void testComparingWithWrongNullability() { + runTest("compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt"); + } + @Test @TestMetadata("delegateByComplexInheritance.kt") public void testDelegateByComplexInheritance() { 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 1f0574488e8..7b3882e5ba8 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 @@ -29752,6 +29752,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.+)\\.(kt|kts)$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } + @Test + @TestMetadata("comparingWithWrongNullability.kt") + public void testComparingWithWrongNullability() { + runTest("compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt"); + } + @Test @TestMetadata("delegateByComplexInheritance.kt") public void testDelegateByComplexInheritance() { 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 0df6a78ec51..c1b7d7befcf 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 @@ -27456,6 +27456,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); } + @Test + @TestMetadata("comparingWithWrongNullability.kt") + public void testComparingWithWrongNullability() { + runTest("compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt"); + } + @Test @TestMetadata("delegateByComplexInheritance.kt") public void testDelegateByComplexInheritance() { 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 0f9101c25fc..5d5adfb3d95 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 @@ -27462,6 +27462,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform"); } + @Test + @TestMetadata("comparingWithWrongNullability.kt") + public void testComparingWithWrongNullability() { + runTest("compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt"); + } + @Test @TestMetadata("delegateByComplexInheritance.kt") public void testDelegateByComplexInheritance() { diff --git a/compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt b/compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt new file mode 100644 index 00000000000..a7e760e4fc5 --- /dev/null +++ b/compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt @@ -0,0 +1,10 @@ +// FIR_IDENTICAL +// FULL_JDK + +import java.util.Comparator; + +fun foo() { + Comparator.comparing { + it != "" + } +} 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 dbe5cf5da96..2255b9e01fd 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 @@ -29752,6 +29752,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } + @Test + @TestMetadata("comparingWithWrongNullability.kt") + public void testComparingWithWrongNullability() { + runTest("compiler/testData/diagnostics/tests/platformTypes/comparingWithWrongNullability.kt"); + } + @Test @TestMetadata("delegateByComplexInheritance.kt") public void testDelegateByComplexInheritance() {