From 6e1b6427abff8ffb747ba2ef514147a555516d59 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 21 Feb 2024 14:18:08 +0100 Subject: [PATCH] K1/K2: add a test confirming current behavior of KT-57014 case --- ...nosticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...DiagnosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...ightTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../samConversionToGenericWrongNullability.fir.kt | 13 +++++++++++++ .../samConversionToGenericWrongNullability.kt | 13 +++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 56 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.fir.kt create mode 100644 compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.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 87ba5effa70..2c6bc42c71b 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 @@ -33598,6 +33598,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.kt"); } + @Test + @TestMetadata("samConversionToGenericWrongNullability.kt") + public void testSamConversionToGenericWrongNullability() { + runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt"); + } + @Test @TestMetadata("samConversionWithCondition.kt") public void testSamConversionWithCondition() { 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 c27fdd1dff2..dda9c9135e9 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 @@ -33598,6 +33598,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.kt"); } + @Test + @TestMetadata("samConversionToGenericWrongNullability.kt") + public void testSamConversionToGenericWrongNullability() { + runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt"); + } + @Test @TestMetadata("samConversionWithCondition.kt") public void testSamConversionWithCondition() { 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 1d7667f27c0..81ff14587bf 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 @@ -31296,6 +31296,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.kt"); } + @Test + @TestMetadata("samConversionToGenericWrongNullability.kt") + public void testSamConversionToGenericWrongNullability() { + runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt"); + } + @Test @TestMetadata("samConversionWithCondition.kt") public void testSamConversionWithCondition() { 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 ca1d8f6baf6..1b5a645f55f 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 @@ -31308,6 +31308,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.kt"); } + @Test + @TestMetadata("samConversionToGenericWrongNullability.kt") + public void testSamConversionToGenericWrongNullability() { + runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt"); + } + @Test @TestMetadata("samConversionWithCondition.kt") public void testSamConversionWithCondition() { diff --git a/compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.fir.kt b/compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.fir.kt new file mode 100644 index 00000000000..93712887d0b --- /dev/null +++ b/compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.fir.kt @@ -0,0 +1,13 @@ +// ISSUE: KT-57014 +// FULL_JDK +// JVM_TARGET: 1.8 + +import java.util.function.Supplier + +fun main() { + val sam = Supplier { + foo() + } +} + +fun foo(): String? = null diff --git a/compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt b/compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt new file mode 100644 index 00000000000..57d5c5980a6 --- /dev/null +++ b/compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt @@ -0,0 +1,13 @@ +// ISSUE: KT-57014 +// FULL_JDK +// JVM_TARGET: 1.8 + +import java.util.function.Supplier + +fun main() { + val sam = Supplier { + foo() + } +} + +fun foo(): String? = null 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 26c4eb8b6b5..0a5e41f05f5 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 @@ -33598,6 +33598,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.kt"); } + @Test + @TestMetadata("samConversionToGenericWrongNullability.kt") + public void testSamConversionToGenericWrongNullability() { + runTest("compiler/testData/diagnostics/tests/samConversions/samConversionToGenericWrongNullability.kt"); + } + @Test @TestMetadata("samConversionWithCondition.kt") public void testSamConversionWithCondition() {