From 8a6467e524777dd5dc78e1aa076593d005d3bb75 Mon Sep 17 00:00:00 2001
From: "vladislav.grechko" <vladislav.grechko@jetbrains.com>
Date: Fri, 9 Feb 2024 17:16:52 +0100
Subject: [PATCH] [FIR] Add tests for KT-65184 to confirm its proper work

#KT-65184 Fixed
---
 ...CompilerTestFE10TestdataTestGenerated.java | 12 +++++++
 ...sticCompilerFE10TestDataTestGenerated.java | 12 +++++++
 ...eeOldFrontendDiagnosticsTestGenerated.java | 12 +++++++
 ...siOldFrontendDiagnosticsTestGenerated.java | 12 +++++++
 .../tests/dnnAsSuperTypeTypeArgument.kt       | 11 ++++++
 .../testData/diagnostics/tests/kt65184.fir.kt | 36 +++++++++++++++++++
 .../testData/diagnostics/tests/kt65184.kt     | 36 +++++++++++++++++++
 .../test/runners/DiagnosticTestGenerated.java | 12 +++++++
 8 files changed, 143 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt
 create mode 100644 compiler/testData/diagnostics/tests/kt65184.fir.kt
 create mode 100644 compiler/testData/diagnostics/tests/kt65184.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 8158d8caf1e..0c0e59a0de1 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
@@ -351,6 +351,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
       runTest("compiler/testData/diagnostics/tests/differentNumericTypesFromSmartCast.kt");
     }
 
+    @Test
+    @TestMetadata("dnnAsSuperTypeTypeArgument.kt")
+    public void testDnnAsSuperTypeTypeArgument() {
+      runTest("compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt");
+    }
+
     @Test
     @TestMetadata("Dollar.kt")
     public void testDollar() {
@@ -855,6 +861,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
       runTest("compiler/testData/diagnostics/tests/kt60638.kt");
     }
 
+    @Test
+    @TestMetadata("kt65184.kt")
+    public void testKt65184() {
+      runTest("compiler/testData/diagnostics/tests/kt65184.kt");
+    }
+
     @Test
     @TestMetadata("LValueAssignment.kt")
     public void testLValueAssignment() {
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 7b3882e5ba8..ac0a980b134 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
@@ -351,6 +351,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
       runTest("compiler/testData/diagnostics/tests/differentNumericTypesFromSmartCast.kt");
     }
 
+    @Test
+    @TestMetadata("dnnAsSuperTypeTypeArgument.kt")
+    public void testDnnAsSuperTypeTypeArgument() {
+      runTest("compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt");
+    }
+
     @Test
     @TestMetadata("Dollar.kt")
     public void testDollar() {
@@ -855,6 +861,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
       runTest("compiler/testData/diagnostics/tests/kt60638.kt");
     }
 
+    @Test
+    @TestMetadata("kt65184.kt")
+    public void testKt65184() {
+      runTest("compiler/testData/diagnostics/tests/kt65184.kt");
+    }
+
     @Test
     @TestMetadata("LValueAssignment.kt")
     public void testLValueAssignment() {
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 c1b7d7befcf..07fa6779a17 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
@@ -351,6 +351,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
       runTest("compiler/testData/diagnostics/tests/differentNumericTypesFromSmartCast.kt");
     }
 
+    @Test
+    @TestMetadata("dnnAsSuperTypeTypeArgument.kt")
+    public void testDnnAsSuperTypeTypeArgument() {
+      runTest("compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt");
+    }
+
     @Test
     @TestMetadata("Dollar.kt")
     public void testDollar() {
@@ -855,6 +861,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
       runTest("compiler/testData/diagnostics/tests/kt60638.kt");
     }
 
+    @Test
+    @TestMetadata("kt65184.kt")
+    public void testKt65184() {
+      runTest("compiler/testData/diagnostics/tests/kt65184.kt");
+    }
+
     @Test
     @TestMetadata("LValueAssignment.kt")
     public void testLValueAssignment() {
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 5d5adfb3d95..4850b4e2f73 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
@@ -351,6 +351,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
       runTest("compiler/testData/diagnostics/tests/differentNumericTypesFromSmartCast.kt");
     }
 
+    @Test
+    @TestMetadata("dnnAsSuperTypeTypeArgument.kt")
+    public void testDnnAsSuperTypeTypeArgument() {
+      runTest("compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt");
+    }
+
     @Test
     @TestMetadata("Dollar.kt")
     public void testDollar() {
@@ -855,6 +861,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
       runTest("compiler/testData/diagnostics/tests/kt60638.kt");
     }
 
+    @Test
+    @TestMetadata("kt65184.kt")
+    public void testKt65184() {
+      runTest("compiler/testData/diagnostics/tests/kt65184.kt");
+    }
+
     @Test
     @TestMetadata("LValueAssignment.kt")
     public void testLValueAssignment() {
diff --git a/compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt b/compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt
new file mode 100644
index 00000000000..923824def9a
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt
@@ -0,0 +1,11 @@
+// FIR_IDENTICAL
+open class A<TA>
+
+class B<TB> : A<TB & Any>()
+
+fun accept(a: A<String>) {}
+
+fun test() {
+    val b = B<String?>()
+    accept(b)
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/kt65184.fir.kt b/compiler/testData/diagnostics/tests/kt65184.fir.kt
new file mode 100644
index 00000000000..4ff4ddb01d2
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/kt65184.fir.kt
@@ -0,0 +1,36 @@
+// FULL_JDK
+
+// FILE: A.java
+
+public class A<T> {
+
+}
+
+// FILE: B.java
+
+public class B<T> extends A<T> {
+
+}
+
+// FILE: box.kt
+
+import java.util.LinkedList
+import java.util.Queue
+
+fun bar(b: A<String>) {}
+
+fun func(p: A<B<String>>) {
+}
+
+class X {
+    fun bar(b: Queue<String>) {}
+}
+
+fun test(x : X) {
+    x.bar(<!ARGUMENT_TYPE_MISMATCH!>LinkedList<String?>()<!>)
+    bar(<!ARGUMENT_TYPE_MISMATCH!>B<String?>()<!>)
+    func(A<B<String>>())
+    func(<!ARGUMENT_TYPE_MISMATCH!>A<B<String?>>()<!>)
+    func(<!ARGUMENT_TYPE_MISMATCH!>A<B<String?>?>()<!>)
+    func(<!ARGUMENT_TYPE_MISMATCH!>A<B<String>?>()<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/kt65184.kt b/compiler/testData/diagnostics/tests/kt65184.kt
new file mode 100644
index 00000000000..a7830bb865b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/kt65184.kt
@@ -0,0 +1,36 @@
+// FULL_JDK
+
+// FILE: A.java
+
+public class A<T> {
+
+}
+
+// FILE: B.java
+
+public class B<T> extends A<T> {
+
+}
+
+// FILE: box.kt
+
+import java.util.LinkedList
+import java.util.Queue
+
+fun bar(b: A<String>) {}
+
+fun func(p: A<B<String>>) {
+}
+
+class X {
+    fun bar(b: Queue<String>) {}
+}
+
+fun test(x : X) {
+    x.bar(<!TYPE_MISMATCH!>LinkedList<String?>()<!>)
+    bar(<!TYPE_MISMATCH!>B<String?>()<!>)
+    func(A<B<String>>())
+    func(<!TYPE_MISMATCH!>A<B<String?>>()<!>)
+    func(<!TYPE_MISMATCH!>A<B<String?>?>()<!>)
+    func(<!TYPE_MISMATCH!>A<B<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 2255b9e01fd..115d99d68a4 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
@@ -351,6 +351,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
       runTest("compiler/testData/diagnostics/tests/differentNumericTypesFromSmartCast.kt");
     }
 
+    @Test
+    @TestMetadata("dnnAsSuperTypeTypeArgument.kt")
+    public void testDnnAsSuperTypeTypeArgument() {
+      runTest("compiler/testData/diagnostics/tests/dnnAsSuperTypeTypeArgument.kt");
+    }
+
     @Test
     @TestMetadata("Dollar.kt")
     public void testDollar() {
@@ -855,6 +861,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
       runTest("compiler/testData/diagnostics/tests/kt60638.kt");
     }
 
+    @Test
+    @TestMetadata("kt65184.kt")
+    public void testKt65184() {
+      runTest("compiler/testData/diagnostics/tests/kt65184.kt");
+    }
+
     @Test
     @TestMetadata("LValueAssignment.kt")
     public void testLValueAssignment() {