New J2K: reuse already calculated type arguments in inference post-processing

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/inference/common/ContextCollector.kt

@@ -15,7 +15,9 @@ import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getType
+import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 abstract class ContextCollector(private val resolutionFacade: ResolutionFacade) {
@@ -26,9 +28,6 @@ abstract class ContextCollector(private val resolutionFacade: ResolutionFacade)
             else -> null
         }
 
-    private fun KtTypeReference.classReference(): ClassReference? =
-        analyze(resolutionFacade)[BindingContext.TYPE, this]?.classReference()
-
     private fun KtTypeElement.toData(): TypeElementData? {
         val typeReference = parent as? KtTypeReference ?: return null
         val type = analyze(resolutionFacade)[BindingContext.TYPE, typeReference] ?: return null
@@ -43,19 +42,26 @@ abstract class ContextCollector(private val resolutionFacade: ResolutionFacade)
         val typeElementToTypeVariable = mutableMapOf<KtTypeElement, TypeVariable>()
         val typeBasedTypeVariables = mutableListOf<TypeBasedTypeVariable>()
 
-        fun KtTypeReference.toBoundType(owner: TypeVariableOwner, defaultState: State? = null): BoundType? {
+        fun KtTypeReference.toBoundType(
+            owner: TypeVariableOwner,
+            alreadyCalculatedType: KotlinType? = null,
+            defaultState: State? = null
+        ): BoundType? {
             val typeElement = typeElement ?: return null
-            val classReference = classReference() ?: NoClassReference
+            val type = alreadyCalculatedType ?: analyze(resolutionFacade, BodyResolveMode.PARTIAL)[BindingContext.TYPE, this]
-
+            val classReference = type?.classReference() ?: NoClassReference
             val state = defaultState ?: classReference.getState(typeElement)
+
             val typeArguments =
                 if (classReference is DescriptorClassReference) {
-                    typeElement.typeArgumentsAsTypes.zip(
+                    val typeParameters = classReference.descriptor.declaredTypeParameters
-                        classReference.descriptor.declaredTypeParameters
+                    typeElement.typeArgumentsAsTypes.mapIndexed { index, typeArgument ->
-                    ) { typeArgument, typeParameter ->
                         TypeParameter(
-                            typeArgument?.toBoundType(owner) ?: BoundType.STAR_PROJECTION,
+                            typeArgument?.toBoundType(
-                            typeParameter.variance
+                                owner,
+                                alreadyCalculatedType = type?.arguments?.getOrNull(index)?.type
+                            ) ?: BoundType.STAR_PROJECTION,
+                            typeParameters.getOrNull(index)?.variance ?: Variance.INVARIANT
                         )
                     }
                 } else emptyList()

nj2k/testData/copyPastePlainText/ImportResolve.expected.kt

@@ -9,7 +9,7 @@ import java.util.HashMap
 class Target {
     var listOfPlatformType: List<String> = ArrayList()
 
-    var unresolved: UnresolvedInterface<UnresolvedGeneric?> = UnresolvedImplementation() // Should not add import
+    var unresolved: UnresolvedInterface<UnresolvedGeneric> = UnresolvedImplementation() // Should not add import
 
 
     var hashMapOfNotImported: Map<ToBeImportedJava, ToBeImportedKotlin> = HashMap()
@@ -22,7 +22,7 @@ class Target {
 
     var ambiguous: IAmbiguous = Ambiguous() // Should not add import in case of ambiguous declarations in Kotlin and in Java
 
-    var ambiguousJava: IAmbiguousJava = AmbiguousJava()  // Should not add import in case of 2 declarations in Java
+    var ambiguousJava: IAmbiguousJava = AmbiguousJava() // Should not add import in case of 2 declarations in Java
 
 
     internal fun workWithStatics() {