[Analysis API] Add KtCallableMemberCall#typeArgumentsMapping

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
+import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1
@@ -45,6 +46,7 @@ import org.jetbrains.kotlin.resolve.calls.components.isVararg
 import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext
 import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode
 import org.jetbrains.kotlin.resolve.calls.context.ContextDependency
+import org.jetbrains.kotlin.resolve.calls.inference.model.TypeVariableTypeConstructor
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactoryImpl
@@ -58,7 +60,13 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
+import org.jetbrains.kotlin.types.UnwrappedType
+import org.jetbrains.kotlin.types.asSimpleType
+import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.contains
+import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.isTypeVariable
+import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.typeConstructor
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
+import org.jetbrains.kotlin.types.typeUtil.contains
 import org.jetbrains.kotlin.util.OperatorNameConventions
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
@@ -283,7 +291,11 @@ internal class KtFe10CallResolver(
                 resolvedCalls += resolvedCall
                 val partiallyAppliedSymbol =
                     resolvedCall.toPartiallyAppliedVariableSymbol(context) ?: return null
-                KtSimpleVariableAccessCall(partiallyAppliedSymbol, KtSimpleVariableAccess.Write(right))
+                KtSimpleVariableAccessCall(
+                    partiallyAppliedSymbol,
+                    resolvedCall.toTypeArgumentsMapping(partiallyAppliedSymbol),
+                    KtSimpleVariableAccess.Write(right)
+                )
             }
             in KtTokens.AUGMENTED_ASSIGNMENTS -> {
                 if (right == null) return null
@@ -307,7 +319,11 @@ internal class KtFe10CallResolver(
                     val resolvedCall = left.getResolvedCall(context) ?: return null
                     resolvedCalls += resolvedCall
                     val variableAppliedSymbol = resolvedCall.toPartiallyAppliedVariableSymbol(context) ?: return null
-                    KtCompoundVariableAccessCall(variableAppliedSymbol, compoundAccess)
+                    KtCompoundVariableAccessCall(
+                        variableAppliedSymbol,
+                        resolvedCall.toTypeArgumentsMapping(variableAppliedSymbol),
+                        compoundAccess
+                    )
                 }
             }
             else -> null
@@ -330,8 +346,9 @@ internal class KtFe10CallResolver(
         return if (baseExpression is KtArrayAccessExpression) {
             createCompoundArrayAccessCall(context, baseExpression, compoundAccess, resolvedCalls)
         } else {
-            val variableAppliedSymbol = baseExpression.getResolvedCall(context)?.toPartiallyAppliedVariableSymbol(context) ?: return null
+            val resolvedCall = baseExpression.getResolvedCall(context)
-            KtCompoundVariableAccessCall(variableAppliedSymbol, compoundAccess)
+            val variableAppliedSymbol = resolvedCall?.toPartiallyAppliedVariableSymbol(context) ?: return null
+            KtCompoundVariableAccessCall(variableAppliedSymbol, resolvedCall.toTypeArgumentsMapping(variableAppliedSymbol), compoundAccess)
         }?.let { createCallInfo(context, unaryExpression, it, resolvedCalls) }
     }
 
@@ -411,7 +428,11 @@ internal class KtFe10CallResolver(
 
     private fun ResolvedCall<*>.toPropertyRead(context: BindingContext): KtVariableAccessCall? {
         val partiallyAppliedSymbol = toPartiallyAppliedVariableSymbol(context) ?: return null
-        return KtSimpleVariableAccessCall(partiallyAppliedSymbol, KtSimpleVariableAccess.Read)
+        return KtSimpleVariableAccessCall(
+            partiallyAppliedSymbol,
+            toTypeArgumentsMapping(partiallyAppliedSymbol),
+            KtSimpleVariableAccess.Read
+        )
     }
 
     private fun ResolvedCall<*>.toFunctionKtCall(context: BindingContext): KtFunctionCall<*>? {
@@ -430,7 +451,12 @@ internal class KtFe10CallResolver(
             }
         }
         @Suppress("UNCHECKED_CAST")
-        return KtSimpleFunctionCall(partiallyAppliedSymbol, argumentMapping, call.callType == Call.CallType.INVOKE)
+        return KtSimpleFunctionCall(
+            partiallyAppliedSymbol,
+            argumentMapping,
+            toTypeArgumentsMapping(partiallyAppliedSymbol),
+            call.callType == Call.CallType.INVOKE
+        )
     }
 
     private fun ResolvedCall<*>.toPartiallyAppliedVariableSymbol(context: BindingContext): KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol>? {
@@ -645,4 +671,24 @@ internal class KtFe10CallResolver(
             else -> false
         }
     }
+
+    private fun ResolvedCall<*>.toTypeArgumentsMapping(
+        partiallyAppliedSymbol: KtPartiallyAppliedSymbol<*, *>
+    ): Map<KtTypeParameterSymbol, KtType> {
+        if (typeArguments.isEmpty()) return emptyMap()
+
+        val typeParameters = partiallyAppliedSymbol.symbol.typeParameters
+
+        val result = mutableMapOf<KtTypeParameterSymbol, KtType>()
+        for ((parameter, type) in typeArguments) {
+            val ktParameter = typeParameters.getOrNull(parameter.index) ?: return emptyMap()
+
+            // i.e. we were not able to infer some types
+            if (type.contains { it: UnwrappedType -> it.constructor is TypeVariableTypeConstructor }) return emptyMap()
+
+            result[ktParameter] = type.toKtType(analysisContext)
+        }
+
+        return result
+    }
 }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor
+import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir
 import org.jetbrains.kotlin.analysis.low.level.api.fir.resolver.AllCandidatesResolver
 import org.jetbrains.kotlin.fir.FirElement
@@ -58,6 +59,7 @@ import org.jetbrains.kotlin.psi.KtPsiUtil.deparenthesize
 import org.jetbrains.kotlin.psi.psiUtil.getPossiblyQualifiedCallExpression
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
 import org.jetbrains.kotlin.toKtPsiSourceElement
+import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.OperatorNameConventions
 import org.jetbrains.kotlin.util.OperatorNameConventions.EQUALS
 import org.jetbrains.kotlin.utils.addIfNotNull
@@ -404,6 +406,7 @@ internal class KtFirCallResolver(
                 @Suppress("UNCHECKED_CAST") // safe because of the above check on targetKtSymbol
                 KtSimpleVariableAccessCall(
                     partiallyAppliedSymbol as KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol>,
+                    fir.toTypeArgumentsMapping(partiallyAppliedSymbol),
                     KtSimpleVariableAccess.Write(rhs)
                 )
             }
@@ -412,6 +415,7 @@ internal class KtFirCallResolver(
                 @Suppress("UNCHECKED_CAST") // safe because of the above check on targetKtSymbol
                 KtSimpleVariableAccessCall(
                     partiallyAppliedSymbol as KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol>,
+                    fir.toTypeArgumentsMapping(partiallyAppliedSymbol),
                     KtSimpleVariableAccess.Read
                 )
             }
@@ -434,6 +438,7 @@ internal class KtFirCallResolver(
                     argumentMappingWithoutExtensionReceiver
                         ?.createArgumentMapping(partiallyAppliedSymbol.signature as KtFunctionLikeSignature<*>)
                         ?: LinkedHashMap(),
+                    fir.toTypeArgumentsMapping(partiallyAppliedSymbol),
                     isImplicitInvoke
                 )
             }
@@ -458,7 +463,12 @@ internal class KtFirCallResolver(
                 }
 
                 return if (resolveFragmentOfCall) {
-                    KtSimpleFunctionCall(getPartiallyAppliedSymbol, getAccessArgumentMapping, false)
+                    KtSimpleFunctionCall(
+                        getPartiallyAppliedSymbol,
+                        getAccessArgumentMapping,
+                        fir.toTypeArgumentsMapping(getPartiallyAppliedSymbol),
+                        false
+                    )
                 } else {
                     KtCompoundArrayAccessCall(
                         KtCompoundAccess.CompoundAssign(operationPartiallyAppliedSymbol, compoundAssignKind, rightOperandPsi),
@@ -477,10 +487,15 @@ internal class KtFirCallResolver(
                 val operationPartiallyAppliedSymbol =
                     getOperationPartiallyAppliedSymbolsForCompoundVariableAccess(fir, leftOperandPsi) ?: return null
                 return if (resolveFragmentOfCall) {
-                    KtSimpleVariableAccessCall(variablePartiallyAppliedSymbol, KtSimpleVariableAccess.Read)
+                    KtSimpleVariableAccessCall(
+                        variablePartiallyAppliedSymbol,
+                        fir.toTypeArgumentsMapping(variablePartiallyAppliedSymbol),
+                        KtSimpleVariableAccess.Read
+                    )
                 } else {
                     KtCompoundVariableAccessCall(
                         variablePartiallyAppliedSymbol,
+                        fir.toTypeArgumentsMapping(variablePartiallyAppliedSymbol),
                         KtCompoundAccess.CompoundAssign(operationPartiallyAppliedSymbol, compoundAssignKind, rightOperandPsi),
                     )
                 }
@@ -502,7 +517,12 @@ internal class KtFirCallResolver(
                     putAll(baseExpression.indexExpressions.zip(getPartiallyAppliedSymbol.signature.valueParameters))
                 }
                 return if (resolveFragmentOfCall) {
-                    KtSimpleFunctionCall(getPartiallyAppliedSymbol, getAccessArgumentMapping, false)
+                    KtSimpleFunctionCall(
+                        getPartiallyAppliedSymbol,
+                        getAccessArgumentMapping,
+                        fir.toTypeArgumentsMapping(getPartiallyAppliedSymbol),
+                        false
+                    )
                 } else {
                     KtCompoundArrayAccessCall(
                         KtCompoundAccess.IncOrDecOperation(operationPartiallyAppliedSymbol, incOrDecOperationKind, incDecPrecedence),
@@ -521,10 +541,15 @@ internal class KtFirCallResolver(
                 val operationPartiallyAppliedSymbol =
                     getOperationPartiallyAppliedSymbolsForCompoundVariableAccess(fir, baseExpression) ?: return null
                 return if (resolveFragmentOfCall) {
-                    KtSimpleVariableAccessCall(variablePartiallyAppliedSymbol, KtSimpleVariableAccess.Read)
+                    KtSimpleVariableAccessCall(
+                        variablePartiallyAppliedSymbol,
+                        fir.toTypeArgumentsMapping(variablePartiallyAppliedSymbol),
+                        KtSimpleVariableAccess.Read
+                    )
                 } else {
                     KtCompoundVariableAccessCall(
                         variablePartiallyAppliedSymbol,
+                        fir.toTypeArgumentsMapping(variablePartiallyAppliedSymbol),
                         KtCompoundAccess.IncOrDecOperation(operationPartiallyAppliedSymbol, incOrDecOperationKind, incDecPrecedence),
                     )
                 }
@@ -705,6 +730,33 @@ internal class KtFirCallResolver(
     private fun FirVariableSymbol<*>.toKtSignature(): KtVariableLikeSignature<KtVariableLikeSymbol> =
         firSymbolBuilder.variableLikeBuilder.buildVariableLikeSignature(this)
 
+    private fun FirQualifiedAccess.toTypeArgumentsMapping(
+        partiallyAppliedSymbol: KtPartiallyAppliedSymbol<*, *>
+    ): Map<KtTypeParameterSymbol, KtType> {
+        val typeParameters = partiallyAppliedSymbol.symbol.typeParameters
+        if (typeParameters.isEmpty()) return emptyMap()
+        if (typeParameters.size != typeArguments.size) return emptyMap()
+
+        val result = mutableMapOf<KtTypeParameterSymbol, KtType>()
+
+        for ((index, argument) in typeArguments.withIndex()) {
+            // After resolution all type arguments should be usual types (not FirPlaceholderProjection)
+            if (argument !is FirTypeProjectionWithVariance || argument.variance != Variance.INVARIANT) return emptyMap()
+            val argumentKtType = argument.typeRef.coneType.asKtType()
+            result[typeParameters[index]] = argumentKtType
+        }
+
+        return result
+    }
+
+    private fun FirArrayOfCall.toTypeArgumentsMapping(
+        partiallyAppliedSymbol: KtPartiallyAppliedSymbol<*, *>
+    ): Map<KtTypeParameterSymbol, KtType> {
+        val elementType = typeRef.coneTypeSafe<ConeClassLikeType>()?.arrayElementType()?.asKtType() ?: return emptyMap()
+        val typeParameter = partiallyAppliedSymbol.symbol.typeParameters.singleOrNull() ?: return emptyMap()
+        return mapOf(typeParameter to elementType)
+    }
+
     override fun collectCallCandidates(psi: KtElement): List<KtCallCandidateInfo> {
         return getCallInfo(psi) { psiToResolve, resolveCalleeExpressionOfFunctionCall, resolveFragmentOfCall ->
             collectCallCandidates(
@@ -867,15 +919,17 @@ internal class KtFirCallResolver(
                 ?: return run {
                     val defaultArrayOfSymbol = arrayOfSymbol(arrayOf) ?: return null
                     val substitutor = createSubstitutorFromTypeArguments(defaultArrayOfSymbol)
+                    val partiallyAppliedSymbol = KtPartiallyAppliedSymbol(
+                        with(analysisSession) { defaultArrayOfSymbol.substitute(substitutor) },
+                        null,
+                        null,
+                    )
                     KtErrorCallInfo(
                         listOf(
                             KtSimpleFunctionCall(
-                                KtPartiallyAppliedSymbol(
+                                partiallyAppliedSymbol,
-                                    with(analysisSession) { defaultArrayOfSymbol.substitute(substitutor) },
-                                    null,
-                                    null,
-                                ),
                                 createArgumentMapping(defaultArrayOfSymbol, substitutor),
+                                this@toKtCallInfo.toTypeArgumentsMapping(partiallyAppliedSymbol),
                                 false,
                             )
                         ),
@@ -887,14 +941,16 @@ internal class KtFirCallResolver(
             arrayOfSymbol(call)
         } ?: return null
         val substitutor = createSubstitutorFromTypeArguments(arrayOfSymbol)
+        val partiallyAppliedSymbol = KtPartiallyAppliedSymbol(
+            with(analysisSession) { arrayOfSymbol.substitute(substitutor) },
+            null,
+            null,
+        )
         return KtSuccessCallInfo(
             KtSimpleFunctionCall(
-                KtPartiallyAppliedSymbol(
+                partiallyAppliedSymbol,
-                    with(analysisSession) { arrayOfSymbol.substitute(substitutor) },
-                    null,
-                    null,
-                ),
                 createArgumentMapping(arrayOfSymbol, substitutor),
+                this@toKtCallInfo.toTypeArgumentsMapping(partiallyAppliedSymbol),
                 false
             )
         )
@@ -934,6 +990,7 @@ internal class KtFirCallResolver(
                         LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>>().apply {
                             put(rightPsi, ktSignature.valueParameters.first())
                         },
+                        emptyMap(),
                         false
                     )
                 )

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt

@@ -196,6 +196,13 @@ public class KtCheckNotNullCall(
  */
 public sealed class KtCallableMemberCall<S : KtCallableSymbol, C : KtCallableSignature<S>> : KtCall() {
     public abstract val partiallyAppliedSymbol: KtPartiallyAppliedSymbol<S, C>
+
+    /**
+     * This map returns inferred type arguments. If the type placeholders was used, actual inferred type will be used as a value.
+     * Keys for this map is from the set [partiallyAppliedSymbol].signature.typeParameters.
+     * In case of resolution or inference error could return empty map.
+     */
+    public abstract val typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType>
 }
 
 public val <S : KtCallableSymbol, C : KtCallableSignature<S>> KtCallableMemberCall<S, C>.symbol: S get() = partiallyAppliedSymbol.symbol
@@ -219,6 +226,7 @@ public typealias KtPartiallyAppliedFunctionSymbol<S> = KtPartiallyAppliedSymbol<
 public class KtSimpleFunctionCall(
     private val _partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol<KtFunctionLikeSymbol>,
     argumentMapping: LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>>,
+    private val _typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType>,
     private val _isImplicitInvoke: Boolean,
 ) : KtFunctionCall<KtFunctionLikeSymbol>(argumentMapping) {
     override val token: KtLifetimeToken get() = _partiallyAppliedSymbol.token
@@ -228,6 +236,8 @@ public class KtSimpleFunctionCall(
      */
     override val partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol<KtFunctionLikeSymbol> get() = withValidityAssertion { _partiallyAppliedSymbol }
 
+    override val typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType> get() = withValidityAssertion { _typeArgumentsMapping }
+
     /**
      * Whether this function call is an implicit invoke call on a value that has an `invoke` member function. See
      * https://kotlinlang.org/docs/operator-overloading.html#invoke-operator for more details.
@@ -252,6 +262,8 @@ public class KtAnnotationCall(
      * The function and receivers for this call.
      */
     override val partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol<KtConstructorSymbol> get() = withValidityAssertion { _partiallyAppliedSymbol }
+
+    override val typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType> get() = withValidityAssertion { emptyMap() }
 }
 
 /**
@@ -277,6 +289,15 @@ public class KtDelegatedConstructorCall(
      */
     override val partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol<KtConstructorSymbol> get() = withValidityAssertion { _partiallyAppliedSymbol }
 
+    override val typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType>
+        get() = withValidityAssertion {
+            check(partiallyAppliedSymbol.symbol.typeParameters.isEmpty()) {
+                "Type arguments for delegation constructor to java constructor with type parameters not supported. " +
+                        "Symbol: ${partiallyAppliedSymbol.symbol}"
+            }
+            emptyMap()
+        }
+
     public val kind: Kind get() = withValidityAssertion { _kind }
 
     public enum class Kind { SUPER_CALL, THIS_CALL }
@@ -294,6 +315,7 @@ public typealias KtPartiallyAppliedVariableSymbol<S> = KtPartiallyAppliedSymbol<
  */
 public class KtSimpleVariableAccessCall(
     private val _partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol>,
+    private val _typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType>,
     private val _simpleAccess: KtSimpleVariableAccess
 ) : KtVariableAccessCall() {
 
@@ -301,6 +323,8 @@ public class KtSimpleVariableAccessCall(
 
     override val partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol> get() = withValidityAssertion { _partiallyAppliedSymbol }
 
+    override val typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType> get() = withValidityAssertion { _typeArgumentsMapping }
+
     /**
      * The type of access to this property.
      */
@@ -366,11 +390,13 @@ public interface KtCompoundAccessCall {
  */
 public class KtCompoundVariableAccessCall(
     private val _partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol>,
+    private val _typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType>,
     private val _compoundAccess: KtCompoundAccess
 ) : KtVariableAccessCall(), KtCompoundAccessCall {
     override val token: KtLifetimeToken
         get() = _partiallyAppliedSymbol.token
     override val partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol<KtVariableLikeSymbol> get() = withValidityAssertion { _partiallyAppliedSymbol }
+    override val typeArgumentsMapping: Map<KtTypeParameterSymbol, KtType> get() = withValidityAssertion { _typeArgumentsMapping }
     override val compoundAccess: KtCompoundAccess get() = withValidityAssertion { _compoundAccess }
 }
 

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt

@@ -18,6 +18,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
@@ -44,6 +45,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = b
@@ -70,6 +72,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = c

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.txt

@@ -18,6 +18,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
@@ -44,6 +45,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = b
@@ -70,6 +72,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = c

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt

@@ -21,6 +21,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {},
     KtSimpleFunctionCall:
       isImplicitInvoke = true
@@ -43,6 +44,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {}
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions can be called with the arguments supplied:

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.txt

@@ -21,6 +21,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {},
     KtSimpleFunctionCall:
       isImplicitInvoke = true
@@ -43,6 +44,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {}
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [local final operator fun R|kotlin/Int|.invoke(a: R|kotlin/String|): R|kotlin/Unit|, local final operator fun R|kotlin/Int|.invoke(b: R|kotlin/Boolean|): R|kotlin/Unit|]>

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt

@@ -24,6 +24,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
@@ -56,6 +57,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
@@ -88,6 +90,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.txt

@@ -24,6 +24,9 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {
+        T -> (kotlin.Int)
+      }
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
@@ -56,6 +59,9 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {
+        U -> (kotlin.Int)
+      }
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
@@ -88,6 +94,9 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {
+        V -> (kotlin.Int)
+      }
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt

@@ -24,6 +24,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
@@ -56,6 +57,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
@@ -88,6 +90,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v

analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.txt

@@ -24,6 +24,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
@@ -56,6 +57,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
@@ -88,6 +90,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /function
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       Annotation("v1", "v2") -> (KtVariableLikeSignature:
         name = value

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       arrayOf("v1", "v2") -> (KtVariableLikeSignature:
         name = strings

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       ["v1", "v2"] -> (KtVariableLikeSignature:
         name = strings

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt

@@ -17,6 +17,9 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/arrayOf
+    typeArgumentsMapping = {
+      T -> (Annotation)
+    }
     argumentMapping = {
       Annotation("v1", "v2") -> (KtVariableLikeSignature:
         name = elements

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       [Annotation("v1", "v2"), Annotation(["v3", "v4"])] -> (KtVariableLikeSignature:
         name = annos

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt

@@ -17,4 +17,5 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       "v1" -> (KtVariableLikeSignature:
         name = strings

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt

@@ -16,4 +16,5 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       "UNCHECKED_CAST" -> (KtVariableLikeSignature:
         name = names

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       "UNCHECKED_CAST" -> (KtVariableLikeSignature:
         name = names

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt

@@ -16,4 +16,5 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       "DEPRECATION" -> (KtVariableLikeSignature:
         name = names

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       "Foo" -> (KtVariableLikeSignature:
         name = name

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       "s" -> (KtVariableLikeSignature:
         name = names

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt

@@ -9,4 +9,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): Anno
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt

@@ -17,6 +17,9 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/arrayOf
+    typeArgumentsMapping = {
+      T -> (kotlin.Int)
+    }
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = elements

analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt

@@ -10,4 +10,7 @@ KtSuccessCallInfo:
         symbol = kotlin/collections/mutableListOf(): kotlin.collections.MutableList<T>
         valueParameters = []
         callableIdIfNonLocal = kotlin/collections/mutableListOf
+    typeArgumentsMapping = {
+      T -> (kotlin.String)
+    }
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt

@@ -21,6 +21,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = test/Target.add
+    typeArgumentsMapping = {}
     argumentMapping = {
       s -> (KtVariableLikeSignature:
         name = t

analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt

@@ -21,6 +21,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = test/Target.add
+    typeArgumentsMapping = {}
     argumentMapping = {
       s -> (KtVariableLikeSignature:
         name = t

analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt

@@ -10,3 +10,5 @@ KtSuccessCallInfo:
         symbol = f: kotlin.Function0<kotlin.Unit>
         callableIdIfNonLocal = null
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/Int.compareTo
+    typeArgumentsMapping = {}
     argumentMapping = {
       j -> (KtVariableLikeSignature:
         name = other

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /A.plusAssign
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = i

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt

@@ -10,3 +10,5 @@ KtSuccessCallInfo:
         symbol = l: A
         callableIdIfNonLocal = null
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt

@@ -31,3 +31,4 @@ KtSuccessCallInfo:
         returnType = kotlin.Int
         symbol = var i: kotlin.Int
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt

@@ -10,3 +10,5 @@ KtSuccessCallInfo:
         symbol = var i: kotlin.Int
         callableIdIfNonLocal = null
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /MyMap.get
+    typeArgumentsMapping = {}
     argumentMapping = {
       "a" -> (KtVariableLikeSignature:
         name = k

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /A.plusAssign
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = i

analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /MyMap.get
+    typeArgumentsMapping = {}
     argumentMapping = {
       "a" -> (KtVariableLikeSignature:
         name = k

analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt

@@ -13,4 +13,5 @@ KtSuccessCallInfo:
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
         callableIdIfNonLocal = /invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt

@@ -13,4 +13,5 @@ KtSuccessCallInfo:
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
         callableIdIfNonLocal = /invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt

@@ -13,4 +13,5 @@ KtSuccessCallInfo:
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
         callableIdIfNonLocal = /invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt

@@ -10,3 +10,5 @@ KtSuccessCallInfo:
         symbol = i: kotlin.Int
         callableIdIfNonLocal = null
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       i + j -> (KtVariableLikeSignature:
         name = p1

analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt

@@ -18,6 +18,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {
         s -> (KtVariableLikeSignature:
           name = p1

analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt

@@ -18,6 +18,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {
         s -> (KtVariableLikeSignature:
           name = p1

analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       s.length -> (KtVariableLikeSignature:
         name = p1

analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt

@@ -24,6 +24,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {
         i -> (KtVariableLikeSignature:
           name = i
@@ -56,6 +57,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {
         i -> (KtVariableLikeSignature:
           name = p

analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt

@@ -24,6 +24,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {},
     KtDelegatedConstructorCall:
       kind = THIS_CALL
@@ -43,6 +44,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {}
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [public constructor(p: R|kotlin/Int|): R|Sub|, public constructor(i: R|kotlin/Int|, j: R|kotlin/Int|): R|Sub|]>

analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt

@@ -16,6 +16,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       Color.R -> (KtVariableLikeSignature:
         name = color

analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/Any.equals
+    typeArgumentsMapping = {}
     argumentMapping = {
       b2 -> (KtVariableLikeSignature:
         name = other

analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /A.equals
+    typeArgumentsMapping = {}
     argumentMapping = {
       b2 -> (KtVariableLikeSignature:
         name = other

analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /A.equals
+    typeArgumentsMapping = {}
     argumentMapping = {
       a2 -> (KtVariableLikeSignature:
         name = other

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt

@@ -20,6 +20,10 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {
+      A -> (kotlin.String),
+      B -> (kotlin.Int)
+    }
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt

@@ -23,6 +23,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt

@@ -23,6 +23,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       "foo" -> (KtVariableLikeSignature:
         name = b

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt

@@ -23,6 +23,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       args -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt

@@ -23,6 +23,10 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {
+      A -> (kotlin.Int),
+      B -> (kotlin.String)
+    }
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt

@@ -16,4 +16,5 @@ KtSuccessCallInfo:
         symbol = kotlin/Function1.invoke(<extension receiver>: P1<dispatch receiver>: kotlin.Function1<P1, R>): R
         valueParameters = []
         callableIdIfNonLocal = kotlin/Function1.invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt

@@ -23,4 +23,5 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/Function1.invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt

@@ -16,4 +16,5 @@ KtSuccessCallInfo:
         symbol = kotlin/Function1.invoke(<extension receiver>: P1<dispatch receiver>: kotlin.Function1<P1, R>): R
         valueParameters = []
         callableIdIfNonLocal = kotlin/Function1.invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt

@@ -23,4 +23,5 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/Function1.invoke
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt

@@ -20,6 +20,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /function
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt

@@ -11,6 +11,7 @@ KtErrorCallInfo:
           symbol = <constructor>(): Obj
           valueParameters = []
           callableIdIfNonLocal = null
+      typeArgumentsMapping = {}
       argumentMapping = {}
   ]
   diagnostic = ERROR<INVISIBLE_REFERENCE: Symbol private constructor(): R|Obj| is invisible>

analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {
       42 -> (KtVariableLikeSignature:
         name = i

analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt

@@ -10,4 +10,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): A
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt

@@ -10,4 +10,5 @@ KtSuccessCallInfo:
         symbol = <constructor>(): A
         valueParameters = []
         callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt

@@ -26,6 +26,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /C.get
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt

@@ -27,6 +27,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /C.get
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt

@@ -27,6 +27,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /C.get
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt

@@ -27,6 +27,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /C.get
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt

@@ -32,6 +32,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /C.set
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt

@@ -33,6 +33,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /C.set
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt

@@ -33,6 +33,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /C.set
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt

@@ -33,6 +33,7 @@ KtErrorCallInfo:
               callableIdIfNonLocal = null
           ]
           callableIdIfNonLocal = /C.set
+      typeArgumentsMapping = {}
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a

analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt

@@ -17,6 +17,7 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = kotlin/intArrayOf
+    typeArgumentsMapping = {}
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = elements

analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt

@@ -13,4 +13,5 @@ KtSuccessCallInfo:
         symbol = /JavaClass.javaMethod(<dispatch receiver>: JavaClass): kotlin.Unit
         valueParameters = []
         callableIdIfNonLocal = /JavaClass.javaMethod
+    typeArgumentsMapping = {}
     argumentMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt

@@ -13,3 +13,5 @@ KtSuccessCallInfo:
         symbol = val foo: kotlin.Int
         callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt

@@ -14,3 +14,5 @@ KtSuccessCallInfo:
         symbol = val foo: kotlin.Int
         callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt

@@ -13,3 +13,5 @@ KtSuccessCallInfo:
         symbol = val sub: ft<JavaSubClass, JavaSubClass?>
         callableIdIfNonLocal = /JavaClass.sub
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt

@@ -13,4 +13,5 @@ KtSuccessCallInfo:
         symbol = var foo: kotlin.Int
         callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Write:
-      value = 42
+      value = 42
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt

@@ -13,4 +13,5 @@ KtSuccessCallInfo:
         symbol = var foo: kotlin.Int
         callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Write:
-      value = null
+      value = null
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt

@@ -14,4 +14,5 @@ KtSuccessCallInfo:
         symbol = var foo: kotlin.Int
         callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Write:
-      value = 42
+      value = 42
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt

@@ -13,3 +13,5 @@ KtSuccessCallInfo:
         symbol = val foo: kotlin.Int
         callableIdIfNonLocal = /KtClass.foo
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt

@@ -14,3 +14,5 @@ KtSuccessCallInfo:
         symbol = val i: kotlin.Int
         callableIdIfNonLocal = /A.i
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt

@@ -13,3 +13,5 @@ KtSuccessCallInfo:
         symbol = val instance: KtSubClass
         callableIdIfNonLocal = /KtClass.instance
     simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt

@@ -14,3 +14,4 @@ KtSuccessCallInfo:
         callableIdIfNonLocal = /KtClass.foo
     simpleAccess = Write:
       value = 42
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt

@@ -15,3 +15,4 @@ KtSuccessCallInfo:
         callableIdIfNonLocal = /A.i
     simpleAccess = Write:
       value = 1
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt

@@ -20,6 +20,9 @@ KtSuccessCallInfo:
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = /A.foo
+    typeArgumentsMapping = {
+      R -> (kotlin.Int)
+    }
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = r