From 86e175bbf1d0ba27d5db853110138e7417a63524 Mon Sep 17 00:00:00 2001
From: "Anastasia.Nekrasova" <anastasia.nekrasova@jetbrains.com>
Date: Thu, 26 Oct 2023 11:31:08 +0300
Subject: [PATCH] [K2] Disappeared
 KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE

^KT-59992
---
 ...rKClassWithIncorrectTypeArgumentChecker.kt | 19 ++++++++++++++-----
 .../kClassInSignature.fir.kt                  |  5 ++++-
 .../declarationChecks/kClassInSignature.kt    |  3 +++
 .../declarationChecks/kClassInSignature.txt   |  2 ++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt
index a441c4147d3..6c9b92a2414 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt
@@ -29,12 +29,21 @@ object FirKClassWithIncorrectTypeArgumentChecker : FirCallableDeclarationChecker
         val source = declaration.source ?: return
         if (source.kind is KtFakeSourceElementKind) return
 
-        val returnType = declaration.returnTypeRef.coneType
-        if (!returnType.isKClassTypeWithErrorOrNullableArgument(context.session.typeContext)) return
+        val typeArgumentsWithWrongType = mutableListOf<ConeKotlinType>()
 
-        val typeArgument = (returnType.typeArguments[0] as ConeKotlinTypeProjection).type
-        typeArgument.typeParameterFromError?.let {
-            reporter.reportOn(source, FirErrors.KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE, it, context)
+        val returnType = declaration.returnTypeRef.coneType
+        if (returnType.isKClassTypeWithErrorOrNullableArgument(context.session.typeContext)) typeArgumentsWithWrongType.add(returnType)
+
+        returnType.typeArguments.forEach {
+            val type = it.type ?: return@forEach
+            if (type.isKClassTypeWithErrorOrNullableArgument(context.session.typeContext))
+                typeArgumentsWithWrongType.add(type)
+        }
+
+        if (typeArgumentsWithWrongType.isEmpty()) return
+        typeArgumentsWithWrongType.forEach {
+            val typeParameterFromError = (it.typeArguments[0] as? ConeKotlinTypeProjection)?.type?.typeParameterFromError ?: return@forEach
+            reporter.reportOn(source, FirErrors.KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE, typeParameterFromError, context)
         }
     }
 
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.fir.kt
index 25916061f1b..18704a0ad3b 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.fir.kt
@@ -6,7 +6,7 @@ fun <T : Any> test2() = T::class
 val <T> <!KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE!>test3<!> = T::class
 val <T> <!KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE!>test4<!> get() = T::class
 
-fun <T> test5() = listOf(T::class)
+fun <T> <!KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE!>test5<!>() = listOf(T::class)
 
 fun <T> test6(): kotlin.reflect.KClass<<!UPPER_BOUND_VIOLATED!>T<!>> = T::class
 fun <T> test7(): kotlin.reflect.KClass<*> = T::class
@@ -14,6 +14,9 @@ fun test8() = <!NULLABLE_TYPE_IN_CLASS_LITERAL_LHS!>String?::class<!>
 
 fun <T> test9() where T : Any?, T : Comparable<T> = T::class
 
+fun <T, K> mapOf(e: T, b: K): Map<T, K> = null!!
+fun <T, K> <!KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE, KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE!>test10<!>() = mapOf(T::class, K::class)
+
 fun <T> listOf(e: T): List<T> = null!!
 
 fun <L> locals() {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.kt b/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.kt
index 20c1a573561..accb0425361 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.kt
@@ -14,6 +14,9 @@ fun test8() = <!NULLABLE_TYPE_IN_CLASS_LITERAL_LHS!>String?::class<!>
 
 fun <T> test9() where T : Any?, T : Comparable<T> = T::class
 
+fun <T, K> mapOf(e: T, b: K): Map<T, K> = null!!
+fun <T, K> <!KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE!>test10<!>() = mapOf(T::class, K::class)
+
 fun <T> listOf(e: T): List<T> = null!!
 
 fun <L> locals() {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.txt b/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.txt
index ccefa98daaa..1bedc7bce43 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kClassInSignature.txt
@@ -4,7 +4,9 @@ public val </*0*/ T> test3: kotlin.reflect.KClass<T>
 public val </*0*/ T> test4: kotlin.reflect.KClass<T>
 public fun </*0*/ T> listOf(/*0*/ e: T): kotlin.collections.List<T>
 public fun </*0*/ L> locals(): kotlin.Unit
+public fun </*0*/ T, /*1*/ K> mapOf(/*0*/ e: T, /*1*/ b: K): kotlin.collections.Map<T, K>
 public fun </*0*/ T> test1(): kotlin.reflect.KClass<T>
+public fun </*0*/ T, /*1*/ K> test10(): kotlin.collections.Map<kotlin.reflect.KClass<T>, kotlin.reflect.KClass<K>>
 public fun </*0*/ T : kotlin.Any> test2(): kotlin.reflect.KClass<T>
 public fun </*0*/ T> test5(): kotlin.collections.List<kotlin.reflect.KClass<T>>
 public fun </*0*/ T> test6(): kotlin.reflect.KClass<T>