diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt index 6391cd081d6..92fc13d0e6a 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt +++ b/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 - KtCompoundVariableAccessCall(variableAppliedSymbol, compoundAccess) + val resolvedCall = baseExpression.getResolvedCall(context) + 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? { @@ -645,4 +671,24 @@ internal class KtFe10CallResolver( else -> false } } + + private fun ResolvedCall<*>.toTypeArgumentsMapping( + partiallyAppliedSymbol: KtPartiallyAppliedSymbol<*, *> + ): Map { + if (typeArguments.isEmpty()) return emptyMap() + + val typeParameters = partiallyAppliedSymbol.symbol.typeParameters + + val result = mutableMapOf() + 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 + } } \ No newline at end of file diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt index 0c46e1b380b..4b9596fcef0 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt +++ b/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, + 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, + 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 = firSymbolBuilder.variableLikeBuilder.buildVariableLikeSignature(this) + private fun FirQualifiedAccess.toTypeArgumentsMapping( + partiallyAppliedSymbol: KtPartiallyAppliedSymbol<*, *> + ): Map { + val typeParameters = partiallyAppliedSymbol.symbol.typeParameters + if (typeParameters.isEmpty()) return emptyMap() + if (typeParameters.size != typeArguments.size) return emptyMap() + + val result = mutableMapOf() + + 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 { + val elementType = typeRef.coneTypeSafe()?.arrayElementType()?.asKtType() ?: return emptyMap() + val typeParameter = partiallyAppliedSymbol.symbol.typeParameters.singleOrNull() ?: return emptyMap() + return mapOf(typeParameter to elementType) + } + override fun collectCallCandidates(psi: KtElement): List { 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( - with(analysisSession) { defaultArrayOfSymbol.substitute(substitutor) }, - null, - null, - ), + partiallyAppliedSymbol, 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( - with(analysisSession) { arrayOfSymbol.substitute(substitutor) }, - null, - null, - ), + partiallyAppliedSymbol, createArgumentMapping(arrayOfSymbol, substitutor), + this@toKtCallInfo.toTypeArgumentsMapping(partiallyAppliedSymbol), false ) ) @@ -934,6 +990,7 @@ internal class KtFirCallResolver( LinkedHashMap>().apply { put(rightPsi, ktSignature.valueParameters.first()) }, + emptyMap(), false ) ) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt index d2b1a5ac675..134d884864e 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/calls/KtCall.kt @@ -196,6 +196,13 @@ public class KtCheckNotNullCall( */ public sealed class KtCallableMemberCall> : KtCall() { public abstract val partiallyAppliedSymbol: KtPartiallyAppliedSymbol + + /** + * 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 } public val > KtCallableMemberCall.symbol: S get() = partiallyAppliedSymbol.symbol @@ -219,6 +226,7 @@ public typealias KtPartiallyAppliedFunctionSymbol = KtPartiallyAppliedSymbol< public class KtSimpleFunctionCall( private val _partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol, argumentMapping: LinkedHashMap>, + private val _typeArgumentsMapping: Map, private val _isImplicitInvoke: Boolean, ) : KtFunctionCall(argumentMapping) { override val token: KtLifetimeToken get() = _partiallyAppliedSymbol.token @@ -228,6 +236,8 @@ public class KtSimpleFunctionCall( */ override val partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol get() = withValidityAssertion { _partiallyAppliedSymbol } + override val typeArgumentsMapping: Map 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 get() = withValidityAssertion { _partiallyAppliedSymbol } + + override val typeArgumentsMapping: Map get() = withValidityAssertion { emptyMap() } } /** @@ -277,6 +289,15 @@ public class KtDelegatedConstructorCall( */ override val partiallyAppliedSymbol: KtPartiallyAppliedFunctionSymbol get() = withValidityAssertion { _partiallyAppliedSymbol } + override val typeArgumentsMapping: Map + 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 = KtPartiallyAppliedSymbol< */ public class KtSimpleVariableAccessCall( private val _partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol, + private val _typeArgumentsMapping: Map, private val _simpleAccess: KtSimpleVariableAccess ) : KtVariableAccessCall() { @@ -301,6 +323,8 @@ public class KtSimpleVariableAccessCall( override val partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol get() = withValidityAssertion { _partiallyAppliedSymbol } + override val typeArgumentsMapping: Map get() = withValidityAssertion { _typeArgumentsMapping } + /** * The type of access to this property. */ @@ -366,11 +390,13 @@ public interface KtCompoundAccessCall { */ public class KtCompoundVariableAccessCall( private val _partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol, + private val _typeArgumentsMapping: Map, private val _compoundAccess: KtCompoundAccess ) : KtVariableAccessCall(), KtCompoundAccessCall { override val token: KtLifetimeToken get() = _partiallyAppliedSymbol.token override val partiallyAppliedSymbol: KtPartiallyAppliedVariableSymbol get() = withValidityAssertion { _partiallyAppliedSymbol } + override val typeArgumentsMapping: Map get() = withValidityAssertion { _typeArgumentsMapping } override val compoundAccess: KtCompoundAccess get() = withValidityAssertion { _compoundAccess } } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt index 7279427efeb..b23871dd04f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.txt index d621afd153a..6ac299f93f5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt index 85f2855b613..89b00b40201 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt index 6fd6e3d7518..180004eb888 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.txt index 85cb065c581..8b50a3a8481 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt index 8f339f3539a..4aa22ba22cd 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.txt index cffed268757..dd3ba02e580 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt index 50f7b5fc8fa..69f435af345 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt index 1a45af99974..7e7285bed88 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt index 343605d0f80..b91886da3ce 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt index a1f99e7b333..f013685dffa 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt index f1e7760174a..4a36ab715f8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt index 757c10041bb..5639846b8a7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt @@ -17,4 +17,5 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt index 454722c1337..65d879a13bf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt index 8bb9388ce5a..76137c94fc5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt @@ -16,4 +16,5 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt index e45c462a41d..3ec0fa49b43 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt index e45c462a41d..3ec0fa49b43 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt index 8bb9388ce5a..76137c94fc5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt @@ -16,4 +16,5 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt index 5cdc8c865d9..0d73a71d5e8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt index 735d3317ab4..8a84ce6a67c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt @@ -16,6 +16,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = { "Foo" -> (KtVariableLikeSignature: name = name diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt index adb4bab38ee..f868e57c176 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt index 253f6bb4a0a..ec400fcafb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: symbol = (): Anno valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt index c315b6acc7c..26cda8994a3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt index 5ea00ef4e5f..fc7b9b36142 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt @@ -10,4 +10,7 @@ KtSuccessCallInfo: symbol = kotlin/collections/mutableListOf(): kotlin.collections.MutableList valueParameters = [] callableIdIfNonLocal = kotlin/collections/mutableListOf + typeArgumentsMapping = { + T -> (kotlin.String) + } argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt index 42042f9a8a2..49a00e0a375 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt index 69e3ad03e54..061e5d7522e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt index a45e64ed150..f3f6ef7320b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt @@ -10,3 +10,5 @@ KtSuccessCallInfo: symbol = f: kotlin.Function0 callableIdIfNonLocal = null simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt index 8ee25c0f2e0..331f8195305 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt index fb59c643c51..32b3f3a3544 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt index d6581acfb0d..23487dd1e8c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt @@ -10,3 +10,5 @@ KtSuccessCallInfo: symbol = l: A callableIdIfNonLocal = null simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt index 3ad1ed547a4..3742aaeb148 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt index a7230ffca9b..76f7c651add 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt index fb427ceb403..2ed45a390cf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt index b7f798764ad..4da536b9bca 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt index 3be502a5910..674a65a5366 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt index dd87f267a52..d0bedcb0859 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt index 841e38d3841..73c858635b9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt index 1b64072847e..059bbe0b503 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt index 1445c7ffbaa..20b0bb4ca4e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt @@ -10,3 +10,5 @@ KtSuccessCallInfo: symbol = i: kotlin.Int callableIdIfNonLocal = null simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt index 039fe4ed043..43076979412 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt index af5f48bafee..09e020a9fd6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt index de17970f09e..588b6bb8ee3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt index 569501c0bec..7e2174dae66 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt index 7a3fc8e3e18..6acb5877395 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt index 5808f8ff74a..923fc767126 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt index 667163b5f3e..27356e19aae 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt index f7414ebc0ae..02c7092c8f8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt index fe9cc2b75ef..2519ee244e2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt index d61061f9346..84c414e00eb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt index be593ecf69b..b1b392e1b85 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt index c0e5d26778f..347bd7dad67 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt index 389fbb907da..690515d57fe 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt @@ -23,6 +23,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt index ec6964a0ab9..cb755b18306 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt @@ -23,6 +23,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { "foo" -> (KtVariableLikeSignature: name = b diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt index 389fbb907da..690515d57fe 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt +++ 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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt index 2fc99cdb33c..5d89a33e5fe 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { args -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt index 1d74401395e..3f814f0ec0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt index 531789b69c6..a6df1044d88 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt index ab55af76e9c..08fd6f2cf91 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt @@ -16,4 +16,5 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt index 3f452ed8467..9fb75f46f0e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt @@ -23,4 +23,5 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt index ab55af76e9c..08fd6f2cf91 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt @@ -16,4 +16,5 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt index 3f452ed8467..9fb75f46f0e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt @@ -23,4 +23,5 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt index 53068eb0c85..c87f4784d79 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt index aeb356c77fc..caa66383c6f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt index 30ddcbc878a..7fcd213acf0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt @@ -11,6 +11,7 @@ KtErrorCallInfo: symbol = (): Obj valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} ] diagnostic = ERROR diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt index 5db025f5020..a12d24da38f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = { 42 -> (KtVariableLikeSignature: name = i diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt index 51253e7ae7a..cceef5961ce 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt @@ -10,4 +10,5 @@ KtSuccessCallInfo: symbol = (): A valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt index 51253e7ae7a..cceef5961ce 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt @@ -10,4 +10,5 @@ KtSuccessCallInfo: symbol = (): A valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt index 9c60894c1a0..a8600f4429e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt index 6c5a881a947..c7be1f5098b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt index 2ed84393d0d..ffc7cf332d8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt index 8aaf4bd765a..fee13d7d3a9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt index 73d3c65307c..48e95446a0c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt index 6267ec32424..270453e5ab3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt index bdb8091773d..57b1a7ac425 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt index 28f2ee2e349..074c7aa3e71 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt index 4b3e7c515c4..de1da856cff 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt index 3209d058caa..85fc07f9ece 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /JavaClass.javaMethod(: JavaClass): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /JavaClass.javaMethod + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt index 7086b1e8f54..b73811e74c3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt index e7de2018af4..a1127a54bd6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt index 5a243943432..b50574db039 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt @@ -13,3 +13,5 @@ KtSuccessCallInfo: symbol = val sub: ft callableIdIfNonLocal = /JavaClass.sub simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt index ac4f86712e1..662eb06271c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt +++ b/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 \ No newline at end of file + value = 42 + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt index bf1a80c8700..e0d98371cab 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt +++ b/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 \ No newline at end of file + value = null + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt index fb314ce3ebd..7b43be752f9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt +++ b/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 \ No newline at end of file + value = 42 + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt index 36d56e5afb9..e62eb29db12 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt index 220420afff7..dcc73afa08d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt index 3999c1e2286..f399e66164f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt @@ -13,3 +13,5 @@ KtSuccessCallInfo: symbol = val instance: KtSubClass callableIdIfNonLocal = /KtClass.instance simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt index a6a3b5c2c92..6b2006a4a92 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt @@ -14,3 +14,4 @@ KtSuccessCallInfo: callableIdIfNonLocal = /KtClass.foo simpleAccess = Write: value = 42 + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt index d88ebf217b8..34dea21cc00 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt @@ -15,3 +15,4 @@ KtSuccessCallInfo: callableIdIfNonLocal = /A.i simpleAccess = Write: value = 1 + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt index 68dac824f2c..c91853c5511 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt index 391d34d566a..9105895741e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt @@ -24,3 +24,4 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = var i: kotlin.Int callableIdIfNonLocal = null + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt index a7230ffca9b..76f7c651add 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt @@ -10,3 +10,5 @@ KtSuccessCallInfo: symbol = var i: kotlin.Int callableIdIfNonLocal = null simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt index fb427ceb403..2ed45a390cf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /MyMap.get + typeArgumentsMapping = {} argumentMapping = { "a" -> (KtVariableLikeSignature: name = k diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt index 18f9689d1d1..6ca55db53c8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt @@ -24,3 +24,4 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = var i: kotlin.Int callableIdIfNonLocal = null + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt index a7230ffca9b..76f7c651add 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt @@ -10,3 +10,5 @@ KtSuccessCallInfo: symbol = var i: kotlin.Int callableIdIfNonLocal = null simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt index fb427ceb403..2ed45a390cf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /MyMap.get + typeArgumentsMapping = {} argumentMapping = { "a" -> (KtVariableLikeSignature: name = k diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt index a39b7f82400..f8f5c2f13a3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt @@ -14,6 +14,7 @@ KtErrorCallInfo: symbol = /A.foo(: A): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /A.foo + typeArgumentsMapping = {} argumentMapping = {} ] diagnostic = ERROR \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt index 442f2d79097..df3d175053a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt @@ -14,6 +14,7 @@ KtErrorCallInfo: symbol = /A.foo(: A): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /A.foo + typeArgumentsMapping = {} argumentMapping = {} ] diagnostic = ERROR diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt index 17587ac93db..fcdca59ab89 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt @@ -13,3 +13,5 @@ KtSuccessCallInfo: symbol = val f: kotlin.Function0 callableIdIfNonLocal = /A.f simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt index 9e729f9b518..dfef5e67566 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt @@ -20,6 +20,10 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /to + typeArgumentsMapping = { + A -> (kotlin.Int), + B -> (kotlin.Int) + } argumentMapping = { 2 -> (KtVariableLikeSignature: name = other diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt index bd1988d9ba0..1034f1c0929 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt @@ -17,6 +17,9 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = java/util/Comparator + typeArgumentsMapping = { + T -> (ft) + } argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: name = function diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt index ec0987c4448..81b40b3c7a5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt @@ -17,6 +17,9 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = java/util/Comparator + typeArgumentsMapping = { + T -> (ft) + } argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: name = function diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt index 658063d25ab..bbba7b9ad84 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt @@ -11,6 +11,7 @@ KtErrorCallInfo: symbol = /foo(): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} ] diagnostic = ERROR \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt index d8ea8a1dbdc..0160dfef930 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt @@ -11,6 +11,7 @@ KtErrorCallInfo: symbol = /foo(): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} ] diagnostic = ERROR diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt index 8b255d5ee87..aaa12996dcb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt @@ -15,3 +15,5 @@ KtSuccessCallInfo: symbol = val length: kotlin.Int callableIdIfNonLocal = kotlin/String.length simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt index 17ce033e8bc..3606204ad11 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt @@ -15,4 +15,5 @@ KtSuccessCallInfo: symbol = /foo(: kotlin.String): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt index 6a683a442c0..66aa6fc9a86 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt @@ -16,3 +16,5 @@ KtSuccessCallInfo: symbol = val length: kotlin.Int callableIdIfNonLocal = kotlin/String.length simpleAccess = Read: + + typeArgumentsMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt index b595da003cd..81460ce0f70 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt @@ -16,4 +16,5 @@ KtSuccessCallInfo: symbol = /foo(: kotlin.String): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt index 5ef35d42d5a..80c80c3e91f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = p1 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt index 015f72b4925..6bd1e4304c3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /invoke(: kotlin.Int): kotlin.String valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt index 46a9e832ae5..df95df77071 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt @@ -26,6 +26,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt index 46a9e832ae5..df95df77071 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt @@ -26,6 +26,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt index c824d611cc7..74e9c74c5fc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt @@ -26,6 +26,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt index 46a9e832ae5..df95df77071 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt @@ -26,6 +26,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt index 0caa4ec6868..eead58cefa4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = first diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt index eb8aec4905d..01b1bc86a45 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = first diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt index 7b1f5054c88..6feadcecba9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt index afd0d55f4e8..62c61e048a9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt @@ -23,6 +23,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /call + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt index 9b4d00f6952..ace26bdcb66 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt @@ -26,6 +26,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt index eb58d8b6b7a..ecc66242544 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt @@ -20,6 +20,9 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /invoke + typeArgumentsMapping = { + T -> (kotlin.String) + } argumentMapping = { "" -> (KtVariableLikeSignature: name = t diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt index 32a8dcdac17..6cd9a1ce3dd 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt index 32a8dcdac17..6cd9a1ce3dd 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt index e77b1df3a8b..da1193c2d8b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt @@ -20,6 +20,9 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /Foo.invoke + typeArgumentsMapping = { + T -> (kotlin.String) + } argumentMapping = { "" -> (KtVariableLikeSignature: name = t diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt index 727f7dab341..998b5b20ac4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt @@ -20,6 +20,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = test/Serializer.serializeFirstTarget + typeArgumentsMapping = {} argumentMapping = { target -> (KtVariableLikeSignature: name = x diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt index b32698eae21..752ffb6e5b7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = test/dummyTest + typeArgumentsMapping = {} argumentMapping = { Test() -> (KtVariableLikeSignature: name = value diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt index 66c5b04acb6..847749a26e0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt @@ -18,6 +18,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a @@ -48,6 +49,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = b @@ -78,6 +80,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = c diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt index 14f2f90b704..f0169ca6f1c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt @@ -18,6 +18,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a @@ -48,6 +49,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = b @@ -78,6 +80,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = c diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt index 8352d7a70a7..ff0945587f6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt @@ -21,6 +21,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true @@ -47,6 +48,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true @@ -70,5 +72,6 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /x + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt index 608c805faf3..241fdf485dd 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt @@ -24,6 +24,9 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + T -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = t @@ -60,6 +63,9 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + U -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = u @@ -96,6 +102,9 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + V -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = v diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt index c3758ff4f68..88e8d5b3d0f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt @@ -24,6 +24,9 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + T -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = t @@ -60,6 +63,9 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + U -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = u @@ -96,6 +102,9 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + V -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = v diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt index 458b6e2760d..479e4d4cf69 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt @@ -24,6 +24,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = t @@ -60,6 +61,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = u @@ -96,6 +98,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = v diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt index 6bbcae60743..3cdd8a16870 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt @@ -21,6 +21,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = { true -> (KtVariableLikeSignature: name = i @@ -51,6 +52,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /x + typeArgumentsMapping = {} argumentMapping = { true -> (KtVariableLikeSignature: name = c @@ -80,6 +82,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = { true -> (KtVariableLikeSignature: name = b diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt index 039316e63ed..6ace5d44471 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt @@ -21,6 +21,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = { true -> (KtVariableLikeSignature: name = i @@ -51,6 +52,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /x + typeArgumentsMapping = {} argumentMapping = { true -> (KtVariableLikeSignature: name = c @@ -80,6 +82,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = { true -> (KtVariableLikeSignature: name = b diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt index 1d9a752df94..8e5da3ec384 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt @@ -21,6 +21,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /A.x + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = b @@ -53,6 +54,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = i diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt index 08998a82e1b..5c8050d9c6a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt @@ -21,6 +21,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /A.x + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = b @@ -53,6 +54,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = i diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt index bf84fd7e1f6..4079dfe9bd7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt @@ -17,6 +17,9 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/arrayOf + typeArgumentsMapping = { + T -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = elements diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt index 1859288d73d..4d30c2f47dc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt @@ -21,6 +21,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = test/Target.add + typeArgumentsMapping = {} argumentMapping = { s -> (KtVariableLikeSignature: name = t diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt index 31eaad457d2..536432c8673 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt @@ -21,6 +21,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = test/Target.add + typeArgumentsMapping = {} argumentMapping = { s -> (KtVariableLikeSignature: name = t diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt index e72c8a1bab4..4c773f08c05 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Int.compareTo + typeArgumentsMapping = {} argumentMapping = { j -> (KtVariableLikeSignature: name = other diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt index 49106835474..4f4369fbc92 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt @@ -14,6 +14,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -32,6 +33,7 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true @@ -51,5 +53,6 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt index 68c81b74e53..3354e364f77 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt @@ -14,6 +14,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -32,6 +33,7 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true @@ -51,5 +53,6 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt index 34aa0686923..09e99422fb8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt @@ -14,6 +14,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -33,6 +34,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -51,5 +53,6 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt index 29aaebe9db5..281a20404c8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt @@ -14,6 +14,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -33,6 +34,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -51,5 +53,6 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt index cbba8642668..75e242feb03 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt @@ -13,6 +13,7 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true @@ -32,6 +33,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -51,5 +53,6 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt index b4e16f9f56d..8e1f638d428 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt @@ -13,6 +13,7 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true @@ -32,6 +33,7 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false @@ -51,5 +53,6 @@ KtInapplicableCallCandidateInfo: symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = false diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt index c310bf3316e..dc3c2c66d4f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Any.equals + typeArgumentsMapping = {} argumentMapping = { b2 -> (KtVariableLikeSignature: name = other diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt index ca3b8cc6eb0..6d833399bef 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /A.equals + typeArgumentsMapping = {} argumentMapping = { b2 -> (KtVariableLikeSignature: name = other diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt index 8a519f7a837..fa81a41a510 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /A.equals + typeArgumentsMapping = {} argumentMapping = { a2 -> (KtVariableLikeSignature: name = other diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt index 206c70a711d..1b6b8e6279c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt @@ -17,6 +17,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt index 80f2b818ab1..17680e94048 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt @@ -20,6 +20,10 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + A -> (kotlin.String), + B -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt index da97c1e1453..60e19d5df3b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt @@ -23,6 +23,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt index b64d7e94176..325c51246bd 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt @@ -23,6 +23,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { "foo" -> (KtVariableLikeSignature: name = b diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt index da97c1e1453..60e19d5df3b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt @@ -23,6 +23,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt index e0e1077d351..e1a31d7f62c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt @@ -17,6 +17,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { args -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt index 71079d465a0..3fc2c958a15 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt @@ -23,6 +23,10 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = { + A -> (kotlin.Int), + B -> (kotlin.String) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt index f0d30c3dfec..0da21a8ea47 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt @@ -17,6 +17,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt index 206532571e9..57810fbfc1b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt @@ -16,5 +16,6 @@ KtApplicableCallCandidateInfo: symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt index 463e830b9a4..20f1bf676ec 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt @@ -23,5 +23,6 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt index 206532571e9..57810fbfc1b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt @@ -16,5 +16,6 @@ KtApplicableCallCandidateInfo: symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt index 463e830b9a4..20f1bf676ec 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt @@ -23,5 +23,6 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt index d1e204aa218..8159ca4e33b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt index 0ec5cda3011..f4f583c8dd0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /function + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt index 4cafd51c42a..d0a734220f9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt @@ -11,5 +11,6 @@ KtInapplicableCallCandidateInfo: symbol = (): Obj valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt index ae5a4e18230..abbb1a26618 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt @@ -17,6 +17,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = { 42 -> (KtVariableLikeSignature: name = i diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt index bcc08311da1..e7388c4affc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt @@ -10,5 +10,6 @@ KtApplicableCallCandidateInfo: symbol = (): A valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt index bcc08311da1..e7388c4affc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt @@ -10,5 +10,6 @@ KtApplicableCallCandidateInfo: symbol = (): A valueParameters = [] callableIdIfNonLocal = null + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt index f0acaaa6e68..f79d95cd048 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt @@ -26,6 +26,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.get + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt index af8ac7ff9a7..dd511d2bd06 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt @@ -27,6 +27,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.get + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt index cb1e0160450..71f003357a8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt @@ -27,6 +27,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.get + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a @@ -41,4 +42,4 @@ KtInapplicableCallCandidateInfo: symbol = b: kotlin.String callableIdIfNonLocal = null) } - isInBestCandidates = true \ No newline at end of file + isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt index 934feb7b260..feae8d5b53e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt @@ -27,6 +27,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.get + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt index aa0a9ec8bf5..ecb7b38faf8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt @@ -32,6 +32,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.set + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt index 6987e4393d1..63f7862a4b7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt @@ -33,6 +33,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.set + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt index 617fa0d88ae..7f4575aed0b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt @@ -33,6 +33,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.set + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt index ea77e8f8ee7..2aa7dd0a5e0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt @@ -33,6 +33,7 @@ KtInapplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /C.set + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt index a65c8e772ff..688275ec7c2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt @@ -17,6 +17,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/intArrayOf + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = elements diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt index 5d3a8f0cf0c..6cd26241f7d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: symbol = /JavaClass.javaMethod(: JavaClass): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /JavaClass.javaMethod + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt index 2346eb8ad39..8b9b6e42285 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt @@ -20,6 +20,9 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /A.foo + typeArgumentsMapping = { + R -> (kotlin.Int) + } argumentMapping = { 1 -> (KtVariableLikeSignature: name = r diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt index f8f5a3f0e83..2d5168175e0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt @@ -14,5 +14,6 @@ KtInapplicableCallCandidateInfo: symbol = /A.foo(: A): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /A.foo + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt index fd571b5d953..5290f8a5e39 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt @@ -14,5 +14,6 @@ KtInapplicableCallCandidateInfo: symbol = /A.foo(: A): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /A.foo + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt index ef8eb86c771..c7244e71081 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt @@ -20,6 +20,10 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /to + typeArgumentsMapping = { + A -> (kotlin.Int), + B -> (kotlin.Int) + } argumentMapping = { 2 -> (KtVariableLikeSignature: name = other diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt index cb91aaade4b..f29be233655 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt @@ -17,6 +17,9 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = java/util/Comparator + typeArgumentsMapping = { + T -> (ft) + } argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: name = function diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt index 7592fc90ec1..09c47540e1d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt @@ -17,6 +17,9 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = java/util/Comparator + typeArgumentsMapping = { + T -> (ft) + } argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: name = function diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt index fdbc3945619..1c31bd5fd37 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt @@ -11,5 +11,6 @@ KtInapplicableCallCandidateInfo: symbol = /foo(): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt index 1fe8e870085..a278a4df27e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt @@ -11,5 +11,6 @@ KtInapplicableCallCandidateInfo: symbol = /foo(): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt index 5519ba917f8..86073dd8aaf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt @@ -15,5 +15,6 @@ KtApplicableCallCandidateInfo: symbol = /foo(: kotlin.String): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /foo + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt index 3accb12b3db..d51f9ce9586 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = p1 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt index 4995c240a68..6bdb45504f3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.String valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt index cf36026f970..8337d6998ac 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt @@ -26,6 +26,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt index cf36026f970..8337d6998ac 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt @@ -26,6 +26,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt index 5c625e2bc71..a6220c44e4d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt @@ -26,6 +26,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt index cf36026f970..8337d6998ac 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt @@ -26,6 +26,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt index 3f1758de755..4fe54ad6e7e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt @@ -20,6 +20,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function1.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt index 6909cdbefa0..06c39e8cae6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt @@ -23,6 +23,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /call + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt index a52867c35b9..642d87501c2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt @@ -26,6 +26,7 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = kotlin/Function2.invoke + typeArgumentsMapping = {} argumentMapping = { 1 -> (KtVariableLikeSignature: name = a diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt index 38883d37f03..c8a92309c7c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt @@ -20,6 +20,9 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /invoke + typeArgumentsMapping = { + T -> (kotlin.String) + } argumentMapping = { "" -> (KtVariableLikeSignature: name = t diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt index 115c903edd7..0f5c96f03d5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt index 115c903edd7..0f5c96f03d5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] callableIdIfNonLocal = /invoke + typeArgumentsMapping = {} argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt index 72e269af082..fa70393e475 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt @@ -20,6 +20,9 @@ KtApplicableCallCandidateInfo: callableIdIfNonLocal = null ] callableIdIfNonLocal = /Foo.invoke + typeArgumentsMapping = { + T -> (kotlin.String) + } argumentMapping = { "" -> (KtVariableLikeSignature: name = t