From 63a1e7c6ff5fba5427213406c7ec9a02bccfba35 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 6 Mar 2020 17:18:21 +0300 Subject: [PATCH] [FIR] Add test for #KT-37321 --- .../resolve/problems/javaArrayInGeneric.kt | 15 +++++++++++++++ .../resolve/problems/javaArrayInGeneric.txt | 4 ++++ .../kotlin/fir/FirDiagnosticsTestGenerated.java | 5 +++++ .../FirDiagnosticsWithLightTreeTestGenerated.java | 5 +++++ 4 files changed, 29 insertions(+) create mode 100644 compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.kt create mode 100644 compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.txt diff --git a/compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.kt b/compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.kt new file mode 100644 index 00000000000..c298df891a8 --- /dev/null +++ b/compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.kt @@ -0,0 +1,15 @@ +// FILE: Inv.java + +public class Inv {} + +// FILE: A.java + +public class A { + public static Inv KEY = new Inv<>(); +} + +// FILE: main.kt + +fun test() { + val key = A.KEY +} \ No newline at end of file diff --git a/compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.txt b/compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.txt new file mode 100644 index 00000000000..d480c229ce8 --- /dev/null +++ b/compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.txt @@ -0,0 +1,4 @@ +FILE: main.kt + public final fun test(): R|kotlin/Unit| { + lval key: R|ft>, Inv<>?>!| = Q|A|.R|/A.KEY| + } diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java index d8b81d4b500..a97df7ab7b8 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java @@ -1411,6 +1411,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest { public void testJavaAccessorConversion() throws Exception { runTest("compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.kt"); } + + @TestMetadata("javaArrayInGeneric.kt") + public void testJavaArrayInGeneric() throws Exception { + runTest("compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.kt"); + } } @TestMetadata("compiler/fir/resolve/testData/resolve/references") diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java index 506a416bd07..c9106726fb0 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java @@ -1411,6 +1411,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos public void testJavaAccessorConversion() throws Exception { runTest("compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.kt"); } + + @TestMetadata("javaArrayInGeneric.kt") + public void testJavaArrayInGeneric() throws Exception { + runTest("compiler/fir/resolve/testData/resolve/problems/javaArrayInGeneric.kt"); + } } @TestMetadata("compiler/fir/resolve/testData/resolve/references")