From 16e8e0e58b82c3939ff8e784721b599a6813cf17 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Thu, 21 Oct 2021 17:49:41 +0300 Subject: [PATCH] FIR: Add test on raw type scope ^KT-49351 Related --- ...isCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ .../FirOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...ndDiagnosticsWithLightTreeTestGenerated.java | 6 ++++++ .../diagnostics/tests/j+k/rawTypeScope.fir.kt | 17 +++++++++++++++++ .../diagnostics/tests/j+k/rawTypeScope.kt | 17 +++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 6 files changed, 58 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/j+k/rawTypeScope.fir.kt create mode 100644 compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index bee157b3d33..b45a58c4e57 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -17233,6 +17233,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/j+k/rawOverride.kt"); } + @Test + @TestMetadata("rawTypeScope.kt") + public void testRawTypeScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt"); + } + @Test @TestMetadata("rawUpperBounds.kt") public void testRawUpperBounds() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index 4e1d421248a..4c1daa2a57f 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -17233,6 +17233,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/j+k/rawOverride.kt"); } + @Test + @TestMetadata("rawTypeScope.kt") + public void testRawTypeScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt"); + } + @Test @TestMetadata("rawUpperBounds.kt") public void testRawUpperBounds() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java index b58e911ed4e..2d1434b1786 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java @@ -17233,6 +17233,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/j+k/rawOverride.kt"); } + @Test + @TestMetadata("rawTypeScope.kt") + public void testRawTypeScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt"); + } + @Test @TestMetadata("rawUpperBounds.kt") public void testRawUpperBounds() throws Exception { diff --git a/compiler/testData/diagnostics/tests/j+k/rawTypeScope.fir.kt b/compiler/testData/diagnostics/tests/j+k/rawTypeScope.fir.kt new file mode 100644 index 00000000000..f57283f71d7 --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/rawTypeScope.fir.kt @@ -0,0 +1,17 @@ +// SKIP_TXT +// FILE: A.java + +public class A { + public static B getB() { return null; } +} + +// FILE: B.java + +public class B { + public void foo(java.util.Map x) {} +} + +// FILE: main.kt +fun main(x: Map) { + A.getB().foo(x) // OK in FE1.0 ( but probably shouldn't), ARGUMENT_TYPE_MISMATCH at FIR +} diff --git a/compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt b/compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt new file mode 100644 index 00000000000..1abd33f8b6a --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt @@ -0,0 +1,17 @@ +// SKIP_TXT +// FILE: A.java + +public class A { + public static B getB() { return null; } +} + +// FILE: B.java + +public class B { + public void foo(java.util.Map x) {} +} + +// FILE: main.kt +fun main(x: Map) { + A.getB().foo(x) // OK in FE1.0 ( but probably shouldn't), ARGUMENT_TYPE_MISMATCH at FIR +} 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 66d84b090fc..476239b5da0 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 @@ -17239,6 +17239,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/j+k/rawOverride.kt"); } + @Test + @TestMetadata("rawTypeScope.kt") + public void testRawTypeScope() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/rawTypeScope.kt"); + } + @Test @TestMetadata("rawUpperBounds.kt") public void testRawUpperBounds() throws Exception {