From 8d8fc6e291e76df1e4af8f3a0e34f09559ad03b1 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Tue, 14 Jun 2022 12:10:54 +0200
Subject: [PATCH] [Analysis API] Add type to KtReceiverValue

Maybe in the future we could remove type from the
KtImplicitReceiverValue, because it has ktSymbol, and in theory
that should be enough to create corresponding KtType.
Unfortunately that is not the case for KtClassOrObjectSymbol --
it doesn't have the API for "default" type creation currently.

Regarding code in KtFirCallResolver.kt -- it seems like code there
needs some love in the future. Psi created via custom code there,
because for call x() FIR has receiver x with psi = null
---
 .../components/KtFe10CallResolver.kt          |  7 +++--
 .../api/fir/components/KtFirCallResolver.kt   | 30 ++++++++++---------
 .../base/components/AbstractKtCallResolver.kt |  5 ++--
 .../kotlin/analysis/api/calls/KtCall.kt       | 25 +++++++++++++---
 .../ambiguousImplicitInvoke.descriptors.txt   |  2 ++
 .../resolveCall/ambiguousImplicitInvoke.txt   |  2 ++
 .../builderInference.descriptors.txt          |  1 +
 .../resolveCall/builderInference.txt          |  1 +
 .../resolveCall/comparisonCall.txt            |  1 +
 .../resolveCall/compoundAssignOnVal.txt       |  1 +
 .../resolveCall/compoundAssignOnVar.txt       |  1 +
 ...ompoundAssignWithArrayAccessConvention.txt |  3 ++
 ...ArrayAccessConvention_complexReceivers.txt |  4 +++
 ...undAssignWithArrayAccessConvention_lhs.txt |  1 +
 .../compoundAssignWithArrayGetConvention.txt  |  1 +
 ...mpoundAssignWithArrayGetConvention_lhs.txt |  1 +
 .../consecutiveImplicitInvoke1.txt            |  1 +
 .../consecutiveImplicitInvoke2.txt            |  1 +
 .../consecutiveImplicitInvoke3.txt            |  1 +
 .../resolveCall/eqEqCall_fromAny.txt          |  1 +
 .../resolveCall/eqEqCall_fromSuperType.txt    |  1 +
 .../resolveCall/eqEqCall_overridden.txt       |  1 +
 ...llWithExtensionReceiverAndTypeArgument.txt |  1 +
 ...iableCall_dispatchReceiver.descriptors.txt |  2 ++
 ...ctionTypeVariableCall_dispatchReceiver.txt |  2 ++
 ...ableCall_extensionReceiver.descriptors.txt |  2 ++
 ...tionTypeVariableCall_extensionReceiver.txt |  2 ++
 .../resolveCall/functionWithReceiverCall.txt  |  1 +
 .../functionWithReceiverSafeCall.txt          |  1 +
 .../callResolver/resolveCall/indexedGet.txt   |  1 +
 .../indexedGetWithNotEnoughArgs.txt           |  1 +
 .../indexedGetWithTooManyArgs.descriptors.txt |  1 +
 .../resolveCall/indexedGetWithTooManyArgs.txt |  1 +
 .../callResolver/resolveCall/indexedSet.txt   |  1 +
 .../indexedSetWithNotEnoughArgs.txt           |  1 +
 .../indexedSetWithTooManyArgs.descriptors.txt |  1 +
 .../resolveCall/indexedSetWithTooManyArgs.txt |  1 +
 .../resolveCall/javaFunctionCall.txt          |  1 +
 .../resolveCall/javaPropertyGetter.txt        |  1 +
 .../javaPropertyGetter_unqualified.txt        |  1 +
 .../resolveCall/javaPropertyNestedGetter.txt  |  1 +
 .../resolveCall/javaPropertySetter.txt        |  1 +
 .../javaPropertySetterIncomplete.txt          |  1 +
 .../javaPropertySetter_unqualified.txt        |  1 +
 .../resolveCall/kotlinPropertyGetter.txt      |  1 +
 .../kotlinPropertyGetter_unqualified.txt      |  1 +
 .../kotlinPropertyNestedGetter.txt            |  1 +
 .../resolveCall/kotlinPropertySetter.txt      |  1 +
 .../kotlinPropertySetter_unqualified.txt      |  1 +
 .../memberFunctionCallWithTypeArgument.txt    |  1 +
 .../resolveCall/postfixUnaryOperatorOnVar.txt |  1 +
 ...UnaryOperatorWithArrayAccessConvention.txt |  3 ++
 ...OperatorWithArrayAccessConvention_base.txt |  1 +
 ...rrayAccessConvention_complexDispatcher.txt |  4 +++
 .../resolveCall/prefixUnaryOperatorOnVar.txt  |  1 +
 ...UnaryOperatorWithArrayAccessConvention.txt |  3 ++
 ...OperatorWithArrayAccessConvention_base.txt |  1 +
 ...rrayAccessConvention_complexDispatcher.txt |  4 +++
 .../resolveCall/privateMember.descriptors.txt |  1 +
 .../resolveCall/privateMember.txt             |  1 +
 ...lifiedCalleeExpressionOfImplicitInvoke.txt |  1 +
 .../resolveCallInSuperConstructorParam.txt    |  1 +
 .../smartCastExplicitDispatchReceiver.txt     |  3 +-
 .../smartCastExplicitExtensionReceiver.txt    |  3 +-
 .../smartCastImplicitDispatchReceiver.txt     |  3 +-
 .../smartCastImplicitExtensionReceiver.txt    |  3 +-
 .../resolveCall/variableAsFunction.txt        |  1 +
 .../variableAsFunctionLikeCall.txt            |  1 +
 .../variableAsFunctionWithParameterName.txt   |  1 +
 ...eAsFunctionWithParameterNameAnnotation.txt |  1 +
 ...eterNameAnnotationConflict.descriptors.txt |  1 +
 ...ionWithParameterNameAnnotationConflict.txt |  1 +
 ...terNameAnnotationConflict2.descriptors.txt |  1 +
 ...onWithParameterNameAnnotationConflict2.txt |  1 +
 ...ableAsFunctionWithParameterNameGeneric.txt |  1 +
 ...riableAsFunctionWithParameterNameMixed.txt |  1 +
 .../variableWithExtensionInvoke.txt           |  1 +
 ...ithInvokeFunctionCall_dispatchReceiver.txt |  1 +
 ...thInvokeFunctionCall_extensionReceiver.txt |  1 +
 .../resolveCall/variableWithMemberInvoke.txt  |  1 +
 .../customSerlializable.txt                   |  1 +
 .../ambiguousImplicitInvoke.txt               |  2 ++
 .../implicitInvoke.descriptors.txt            |  1 +
 .../multipleCandidates/implicitInvoke.txt     |  1 +
 ...implicitInvokeWithReceiver.descriptors.txt |  2 ++
 .../implicitInvokeWithReceiver.txt            |  2 ++
 .../builderInference.descriptors.txt          |  1 +
 .../singleCandidate/builderInference.txt      |  1 +
 .../singleCandidate/comparisonCall.txt        |  1 +
 ...consecutiveImplicitInvoke1.descriptors.txt |  3 ++
 .../consecutiveImplicitInvoke1.txt            |  3 ++
 ...consecutiveImplicitInvoke2.descriptors.txt |  3 ++
 .../consecutiveImplicitInvoke2.txt            |  3 ++
 ...consecutiveImplicitInvoke3.descriptors.txt |  3 ++
 .../consecutiveImplicitInvoke3.txt            |  3 ++
 .../singleCandidate/eqEqCall_fromAny.txt      |  1 +
 .../eqEqCall_fromSuperType.txt                |  1 +
 .../singleCandidate/eqEqCall_overridden.txt   |  1 +
 ...llWithExtensionReceiverAndTypeArgument.txt |  1 +
 ...iableCall_dispatchReceiver.descriptors.txt |  2 ++
 ...ctionTypeVariableCall_dispatchReceiver.txt |  2 ++
 ...ableCall_extensionReceiver.descriptors.txt |  2 ++
 ...tionTypeVariableCall_extensionReceiver.txt |  2 ++
 .../functionWithReceiverCall.txt              |  1 +
 .../functionWithReceiverSafeCall.txt          |  1 +
 .../singleCandidate/indexedGet.txt            |  1 +
 .../indexedGetWithNotEnoughArgs.txt           |  1 +
 .../indexedGetWithTooManyArgs.descriptors.txt |  1 +
 .../indexedGetWithTooManyArgs.txt             |  1 +
 .../singleCandidate/indexedSet.txt            |  1 +
 .../indexedSetWithNotEnoughArgs.txt           |  1 +
 .../indexedSetWithTooManyArgs.descriptors.txt |  1 +
 .../indexedSetWithTooManyArgs.txt             |  1 +
 .../singleCandidate/javaFunctionCall.txt      |  1 +
 .../memberFunctionCallWithTypeArgument.txt    |  1 +
 .../privateMember.descriptors.txt             |  1 +
 .../singleCandidate/privateMember.txt         |  1 +
 .../resolveCallInSuperConstructorParam.txt    |  1 +
 .../smartCastExplicitExtensionReceiver.txt    |  3 +-
 .../singleCandidate/variableAsFunction.txt    |  1 +
 .../variableAsFunctionLikeCall.txt            |  1 +
 .../variableAsFunctionWithParameterName.txt   |  1 +
 ...eAsFunctionWithParameterNameAnnotation.txt |  1 +
 ...eterNameAnnotationConflict.descriptors.txt |  1 +
 ...ionWithParameterNameAnnotationConflict.txt |  1 +
 ...ableAsFunctionWithParameterNameGeneric.txt |  1 +
 ...riableAsFunctionWithParameterNameMixed.txt |  1 +
 .../variableWithExtensionInvoke.txt           |  1 +
 ...ithInvokeFunctionCall_dispatchReceiver.txt |  1 +
 ...thInvokeFunctionCall_extensionReceiver.txt |  1 +
 .../variableWithMemberInvoke.txt              |  1 +
 131 files changed, 216 insertions(+), 28 deletions(-)

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 1f34b663697..6391cd081d6 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
@@ -475,15 +475,16 @@ internal class KtFe10CallResolver(
         resolvedCall: ResolvedCall<*>,
         smartCastType: KotlinType? = null
     ): KtReceiverValue? {
+        val ktType = type.toKtType(analysisContext)
         val result = when (this) {
-            is ExpressionReceiver -> expression.toExplicitReceiverValue()
+            is ExpressionReceiver -> expression.toExplicitReceiverValue(ktType)
             is ExtensionReceiver -> {
                 val extensionReceiverParameter = this.declarationDescriptor.extensionReceiverParameter ?: return null
-                KtImplicitReceiverValue(KtFe10ReceiverParameterSymbol(extensionReceiverParameter, analysisContext))
+                KtImplicitReceiverValue(KtFe10ReceiverParameterSymbol(extensionReceiverParameter, analysisContext), ktType)
             }
             is ImplicitReceiver -> {
                 val symbol = this.declarationDescriptor.toKtSymbol(analysisContext) ?: return null
-                KtImplicitReceiverValue(symbol)
+                KtImplicitReceiverValue(symbol, ktType)
             }
             else -> null
         }
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 743a6cbc3cf..0c46e1b380b 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
@@ -308,16 +308,16 @@ internal class KtFirCallResolver(
             explicitReceiverKind: ExplicitReceiverKind
         ): KtPartiallyAppliedSymbol<KtCallableSymbol, KtCallableSignature<KtCallableSymbol>> {
             isImplicitInvoke = true
+
+            // For implicit invoke, the explicit receiver is always set in FIR and this receiver is the variable or property that has
+            // the `invoke` member function. In this case, we use the `calleeExpression` in the `KtCallExpression` as the PSI
+            // representation of this receiver. Caller can then use this PSI for further call resolution, which is implemented by the
+            // parameter `resolveCalleeExpressionOfFunctionCall` in `toKtCallInfo`.
             val explicitReceiverPsi = when (psi) {
                 is KtQualifiedExpression -> (psi.selectorExpression as KtCallExpression).calleeExpression
                 is KtCallExpression -> psi.calleeExpression
                 else -> error("unexpected PSI $psi for FirImplicitInvokeCall")
             } ?: error("missing calleeExpression in PSI $psi for FirImplicitInvokeCall")
-            // For implicit invoke, the explicit receiver is always set in FIR and this receiver is the variable or property that has
-            // the `invoke` member function. In this case, we use the `calleeExpression` in the `KtCallExpression` as the PSI
-            // representation of this receiver. Caller can then use this PSI for further call resolution, which is implemented by the
-            // parameter `resolveCalleeExpressionOfFunctionCall` in `toKtCallInfo`.
-            val explicitReceiverValue = KtExplicitReceiverValue(explicitReceiverPsi, false, token)
 
             // Specially handle @ExtensionFunctionType
             if (dispatchReceiver.typeRef.coneTypeSafe<ConeKotlinType>()?.isExtensionFunctionType == true) {
@@ -327,7 +327,7 @@ internal class KtFirCallResolver(
             val dispatchReceiverValue: KtReceiverValue?
             val extensionReceiverValue: KtReceiverValue?
             if (explicitReceiverKind == ExplicitReceiverKind.DISPATCH_RECEIVER) {
-                dispatchReceiverValue = explicitReceiverValue
+                dispatchReceiverValue = KtExplicitReceiverValue(explicitReceiverPsi, dispatchReceiver.typeRef.coneType.asKtType(), false, token)
                 if (firstArgIsExtensionReceiver) {
                     extensionReceiverValue = (fir as FirFunctionCall).arguments.first().toKtReceiverValue()
                 } else {
@@ -335,7 +335,7 @@ internal class KtFirCallResolver(
                 }
             } else {
                 dispatchReceiverValue = dispatchReceiver.toKtReceiverValue()
-                extensionReceiverValue = explicitReceiverValue
+                extensionReceiverValue = KtExplicitReceiverValue(explicitReceiverPsi, extensionReceiver.typeRef.coneType.asKtType(), false, token)
             }
             return KtPartiallyAppliedSymbol(
                 with(analysisSession) { unsubstitutedKtSignature.substitute(substitutor) },
@@ -640,12 +640,12 @@ internal class KtFirCallResolver(
             (calleeReference as? FirResolvedNamedReference)?.resolvedSymbol as? FirNamedFunctionSymbol ?: return null
         val substitutor = createConeSubstitutorFromTypeArguments() ?: return null
         val dispatchReceiverValue = if (explicitReceiverPsiSupplement != null && explicitReceiver == dispatchReceiver) {
-            explicitReceiverPsiSupplement.toExplicitReceiverValue()
+            explicitReceiverPsiSupplement.toExplicitReceiverValue(dispatchReceiver.typeRef.coneType.asKtType())
         } else {
             dispatchReceiver.toKtReceiverValue()
         }
         val extensionReceiverValue = if (explicitReceiverPsiSupplement != null && explicitReceiver == extensionReceiver) {
-            explicitReceiverPsiSupplement.toExplicitReceiverValue()
+            explicitReceiverPsiSupplement.toExplicitReceiverValue(extensionReceiver.typeRef.coneType.asKtType())
         } else {
             extensionReceiver.toKtReceiverValue()
         }
@@ -677,15 +677,15 @@ internal class KtFirCallResolver(
                             ?: return null
                         else -> return null
                     }
-                    KtImplicitReceiverValue(implicitPartiallyAppliedSymbol)
+                    KtImplicitReceiverValue(implicitPartiallyAppliedSymbol, typeRef.coneType.asKtType())
                 } else {
                     if (psi !is KtExpression) return null
-                    psi.toExplicitReceiverValue()
+                    psi.toExplicitReceiverValue(typeRef.coneType.asKtType())
                 }
             }
             else -> {
                 if (psi !is KtExpression) return null
-                psi.toExplicitReceiverValue()
+                psi.toExplicitReceiverValue(typeRef.coneType.asKtType())
             }
         }
     }
@@ -919,14 +919,16 @@ internal class KtFirCallResolver(
                 val equalsSymbolInAny = equalsSymbolInAny
                 val leftOperand = arguments.firstOrNull() ?: return null
                 val session = analysisSession.useSiteSession
-                val classSymbol = leftOperand.typeRef.coneType.fullyExpandedType(session).toSymbol(session) as? FirClassSymbol<*>
+                val leftOperandType = leftOperand.typeRef.coneType
+
+                val classSymbol = leftOperandType.fullyExpandedType(session).toSymbol(session) as? FirClassSymbol<*>
                 val equalsSymbol = classSymbol?.getEqualsSymbol(equalsSymbolInAny) ?: equalsSymbolInAny
                 val ktSignature = equalsSymbol.toKtSignature()
                 KtSuccessCallInfo(
                     KtSimpleFunctionCall(
                         KtPartiallyAppliedSymbol(
                             ktSignature,
-                            KtExplicitReceiverValue(leftPsi, false, token),
+                            KtExplicitReceiverValue(leftPsi, leftOperandType.asKtType(), false, token),
                             null
                         ),
                         LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>>().apply {
diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtCallResolver.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtCallResolver.kt
index b2ea43f2fa1..b54c70e63fd 100644
--- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtCallResolver.kt
+++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtCallResolver.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.analysis.api.calls.KtCompoundAccess
 import org.jetbrains.kotlin.analysis.api.calls.KtExplicitReceiverValue
 import org.jetbrains.kotlin.analysis.api.components.KtCallResolver
 import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType
+import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.lexer.KtSingleValueToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -36,8 +37,8 @@ abstract class AbstractKtCallResolver : KtCallResolver() {
         return incOrDecOperationKind
     }
 
-    protected fun KtExpression.toExplicitReceiverValue(): KtExplicitReceiverValue =
-        KtExplicitReceiverValue(this, isReceiverOfKtSafeQualifiedExpression(), token)
+    protected fun KtExpression.toExplicitReceiverValue(type: KtType): KtExplicitReceiverValue =
+        KtExplicitReceiverValue(this, type, isReceiverOfKtSafeQualifiedExpression(), token)
 
     private fun KtExpression.isReceiverOfKtSafeQualifiedExpression(): Boolean {
         val safeQualifiedExpression = parentOfType<KtSafeQualifiedExpression>() ?: return 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 72968673464..d2b1a5ac675 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
@@ -492,7 +492,16 @@ public sealed class KtCompoundAccess(private val _operationPartiallyAppliedSymbo
 /**
  * A receiver value of a call.
  */
-public sealed class KtReceiverValue : KtLifetimeOwner
+public sealed class KtReceiverValue : KtLifetimeOwner {
+    /**
+     * Returns inferred [KtType] of the receiver.
+     *
+     * In case of smart cast on the receiver returns smart cast type.
+     *
+     * For builder inference in FIR implementation it currently works incorrectly, see KT-50916.
+     */
+    public abstract val type: KtType
+}
 
 /**
  * An explicit expression receiver. For example
@@ -502,8 +511,9 @@ public sealed class KtReceiverValue : KtLifetimeOwner
  */
 public class KtExplicitReceiverValue(
     private val _expression: KtExpression,
+    private val _type: KtType,
     private val _isSafeNavigation: Boolean,
-    override val token: KtLifetimeToken
+    override val token: KtLifetimeToken,
 ) : KtReceiverValue() {
     public val expression: KtExpression get() = withValidityAssertion { _expression }
 
@@ -517,6 +527,8 @@ public class KtExplicitReceiverValue(
      * ```
      */
     public val isSafeNavigation: Boolean get() = withValidityAssertion { _isSafeNavigation }
+
+    override val type: KtType get() = withValidityAssertion { _type }
 }
 
 /**
@@ -534,9 +546,14 @@ public class KtExplicitReceiverValue(
  * }
  * ```
  */
-public class KtImplicitReceiverValue(private val _symbol: KtSymbol) : KtReceiverValue() {
+public class KtImplicitReceiverValue(
+    private val _symbol: KtSymbol,
+    private val _type: KtType
+) : KtReceiverValue() {
     override val token: KtLifetimeToken get() = _symbol.token
     public val symbol: KtSymbol get() = withValidityAssertion { _symbol }
+
+    override val type: KtType get() = withValidityAssertion { _type }
 }
 
 /**
@@ -553,5 +570,5 @@ public class KtSmartCastedReceiverValue(private val _original: KtReceiverValue,
     override val token: KtLifetimeToken
         get() = _original.token
     public val original: KtReceiverValue get() = withValidityAssertion { _original }
-    public val smartCastType: KtType get() = withValidityAssertion { _smartCastType }
+    public override val type: KtType get() = withValidityAssertion { _smartCastType }
 }
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 1d02f3ff487..85f2855b613 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt
@@ -7,6 +7,7 @@ KtErrorCallInfo:
         extensionReceiver = KtExplicitReceiverValue:
           expression = x
           isSafeNavigation = false
+          type = kotlin.Int
         signature = KtFunctionLikeSignature:
           receiverType = kotlin.Int
           returnType = kotlin.Unit
@@ -28,6 +29,7 @@ KtErrorCallInfo:
         extensionReceiver = KtExplicitReceiverValue:
           expression = x
           isSafeNavigation = false
+          type = kotlin.Int
         signature = KtFunctionLikeSignature:
           receiverType = kotlin.Int
           returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.txt
index baa8250a899..61d2aa1af22 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.txt
@@ -7,6 +7,7 @@ KtErrorCallInfo:
         extensionReceiver = KtExplicitReceiverValue:
           expression = x
           isSafeNavigation = false
+          type = kotlin.Int
         signature = KtFunctionLikeSignature:
           receiverType = kotlin.Int
           returnType = kotlin.Unit
@@ -28,6 +29,7 @@ KtErrorCallInfo:
         extensionReceiver = KtExplicitReceiverValue:
           expression = x
           isSafeNavigation = false
+          type = kotlin.Int
         signature = KtFunctionLikeSignature:
           receiverType = kotlin.Int
           returnType = kotlin.Unit
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 342d6b2e1d0..42042f9a8a2 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: test/Target<kotlin/String>
+        type = test.Target<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt
index 0bae720cb25..69e3ad03e54 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: test/Target<kotlin/String>
+        type = test.Target<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt
index 7623632c418..8ee25c0f2e0 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt
index cc4dd4042fa..fb59c643c51 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = l
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt
index 2264e45ff2c..3ad1ed547a4 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = i
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt
index 1990e8e1e60..d99a36246e7 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = m["a"]
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
@@ -25,6 +26,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -46,6 +48,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt
index 45dc6823e1b..ff5c6a1d431 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = m["a"]
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
@@ -25,6 +26,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -63,9 +65,11 @@ KtSuccessCallInfo:
           symbolKind: TOP_LEVEL
           typeParameters: []
           visibility: Public
+        type = Foo
       extensionReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       signature = KtFunctionLikeSignature:
         receiverType = MyMap<kotlin.String, kotlin.Int>
         returnType = kotlin.Unit
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 86ae3e92fc0..fb427ceb403 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt
index a0271f894b2..b7f798764ad 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m["a"]
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 6b77a5da12a..3be502a5910 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, A>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt
index 0bc9964c455..dd87f267a52 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt
index 3d875f262ba..841e38d3841 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt
index fcbc9480079..1b64072847e 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
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 efdaaa347ab..f7414ebc0ae 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = b1
         isSafeNavigation = false
+        type = B
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 22397dcde17..fe9cc2b75ef 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = b1
         isSafeNavigation = false
+        type = B
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 70565554dcb..d61061f9346 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a1
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt
index a97dda7768a..c0e5d26778f 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = "str"
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 3e723c54d4a..ab55af76e9c 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
@@ -5,9 +5,11 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 df26fc85d53..3f452ed8467 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt
@@ -5,9 +5,11 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = @ExtensionFunctionType kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = null
         returnType = kotlin.Unit
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 3e723c54d4a..ab55af76e9c 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
@@ -5,9 +5,11 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 df26fc85d53..3f452ed8467 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt
@@ -5,9 +5,11 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = @ExtensionFunctionType kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = null
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt
index d67d8bf4278..53068eb0c85 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = "str"
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt
index 73bad248885..aeb356c77fc 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = "str"
         isSafeNavigation = true
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt
index 650b5572a25..9c60894c1a0 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt
index 813fa26853f..6c5a881a947 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = c
           isSafeNavigation = false
+          type = C
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
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 8796ed9dc5a..2ed84393d0d 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = c
           isSafeNavigation = false
+          type = C
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt
index 68a94161e86..8aaf4bd765a 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = c
           isSafeNavigation = false
+          type = C
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt
index 026d305b87b..73d3c65307c 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt
index 9c1fdfcd0f6..6267ec32424 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = c
           isSafeNavigation = false
+          type = C
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
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 70f10ab7fb9..bdb8091773d 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = c
           isSafeNavigation = false
+          type = C
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt
index 5438266b7c5..28f2ee2e349 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = c
           isSafeNavigation = false
+          type = C
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt
index 5b9232ae94f..3209d058caa 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = javaClass
         isSafeNavigation = false
+        type = JavaClass
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt
index cbe1a27f6fc..7086b1e8f54 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = javaClass
         isSafeNavigation = false
+        type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
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 43df1a9e204..e7de2018af4 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: JavaClass
+        type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
index 92c795c9956..5a243943432 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = javaClass
         isSafeNavigation = false
+        type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = sub
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt
index dd0a534eea2..ac4f86712e1 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = javaClass
         isSafeNavigation = false
+        type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt
index 0755757d6db..bf1a80c8700 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = javaClass
         isSafeNavigation = false
+        type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
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 70d0ff32b0a..fb314ce3ebd 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: JavaClass
+        type = JavaClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt
index d4c6d5380ce..36d56e5afb9 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = ktClass
         isSafeNavigation = false
+        type = KtClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
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 4c10e7fd21d..220420afff7 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: A
+        type = A
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = i
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt
index 217bad5ba72..3999c1e2286 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = ktClass
         isSafeNavigation = false
+        type = KtClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = instance
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt
index 491849a126a..a6a3b5c2c92 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = ktClass
         isSafeNavigation = false
+        type = KtClass
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = foo
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 ce35d355e13..d88ebf217b8 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: A
+        type = A
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = i
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt
index 47104e430eb..68dac824f2c 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt
index a262f021786..391d34d566a 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = i
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt
index 4b8fd99a5d5..2b4aa912eb3 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = m["a"]
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
@@ -18,6 +19,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -39,6 +41,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 86ae3e92fc0..fb427ceb403 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt
index 5f19323cd52..767549fdc70 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = m["a"]
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
@@ -18,6 +19,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -56,9 +58,11 @@ KtSuccessCallInfo:
           symbolKind: TOP_LEVEL
           typeParameters: []
           visibility: Public
+        type = Foo
       extensionReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       signature = KtFunctionLikeSignature:
         receiverType = MyMap<kotlin.String, kotlin.Int>
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt
index 81c931f2db5..18f9689d1d1 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = i
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt
index 980c1fcd1c7..2d59069e20b 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = m["a"]
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
@@ -18,6 +19,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -39,6 +41,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 86ae3e92fc0..fb427ceb403 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt
index 247d02364ba..483914f113f 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt
@@ -7,6 +7,7 @@ KtSuccessCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = m["a"]
           isSafeNavigation = false
+          type = kotlin.Int
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
@@ -18,6 +19,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -56,9 +58,11 @@ KtSuccessCallInfo:
           symbolKind: TOP_LEVEL
           typeParameters: []
           visibility: Public
+        type = Foo
       extensionReceiver = KtExplicitReceiverValue:
         expression = m
         isSafeNavigation = false
+        type = MyMap<kotlin.String, kotlin.Int>
       signature = KtFunctionLikeSignature:
         receiverType = MyMap<kotlin.String, kotlin.Int>
         returnType = kotlin.Unit
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 7a62a790a81..a39b7f82400 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = a
           isSafeNavigation = false
+          type = A
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt
index 9121bed6059..442f2d79097 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt
@@ -6,6 +6,7 @@ KtErrorCallInfo:
         dispatchReceiver = KtExplicitReceiverValue:
           expression = a
           isSafeNavigation = false
+          type = A
         extensionReceiver = null
         signature = KtFunctionLikeSignature:
           receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt
index d6f2c56201f..17587ac93db 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt
@@ -4,6 +4,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = f
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt
index bdbe882463a..9e729f9b518 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = 1
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Int
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt
index b6d51e8e24d..8b255d5ee87 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt
@@ -5,7 +5,8 @@ KtSuccessCallInfo:
         original = KtExplicitReceiverValue:
           expression = a
           isSafeNavigation = false
-        smartCastType = kotlin.String
+          type = kotlin.Any
+        type = kotlin.String
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = length
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt
index 801e8178978..17ce033e8bc 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt
@@ -7,7 +7,8 @@ KtSuccessCallInfo:
         original = KtExplicitReceiverValue:
           expression = a
           isSafeNavigation = false
-        smartCastType = kotlin.String
+          type = kotlin.Any
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt
index 9d7b341081c..6a683a442c0 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt
@@ -6,7 +6,8 @@ KtSuccessCallInfo:
           symbol = KtReceiverParameterSymbol:
             origin: SOURCE
             type: kotlin/Any
-        smartCastType = kotlin.String
+          type = kotlin.Any
+        type = kotlin.String
       extensionReceiver = null
       signature = KtVariableLikeSignature:
         name = length
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt
index de736112e9e..b595da003cd 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt
@@ -8,7 +8,8 @@ KtSuccessCallInfo:
           symbol = KtReceiverParameterSymbol:
             origin: SOURCE
             type: kotlin/Any
-        smartCastType = kotlin.String
+          type = kotlin.Any
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt
index f17bd247292..5ef35d42d5a 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function1<kotlin.Int, kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt
index 02e2523fd95..015f72b4925 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.String
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt
index 12d90212c71..46a9e832ae5 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt
index 12d90212c71..46a9e832ae5 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 556504e3baf..c824d611cc7 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt
index 12d90212c71..46a9e832ae5 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 70fea2721d8..0caa4ec6868 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function1<@R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second))  kotlin.Int, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt
index 801ae7bedce..eb8aec4905d 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function1<@R|kotlin.ParameterName|(name = String(first))  @R|kotlin.ParameterName|(name = String(second))  kotlin.Int, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt
index bd5ab8d1028..7b1f5054c88 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function1<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt
index 59f83f6fd97..9b4d00f6952 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt
index a0004587fa5..eb58d8b6b7a 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = Foo
       signature = KtFunctionLikeSignature:
         receiverType = Foo
         returnType = kotlin.Unit
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 a4a0fa2091f..32a8dcdac17 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 a4a0fa2091f..32a8dcdac17 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt
@@ -6,6 +6,7 @@ KtSuccessCallInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt
index d96e1b0b2bf..e77b1df3a8b 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = Foo
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 33243237984..727f7dab341 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt
@@ -5,6 +5,7 @@ KtSuccessCallInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = serializer
         isSafeNavigation = false
+        type = test.Serializer
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 6d0d190e94e..8352d7a70a7 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
@@ -32,6 +33,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 67d861f819f..6bbcae60743 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
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 0a0316ab79a..039316e63ed 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 80ee143c1c8..1d9a752df94 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
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -38,6 +39,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 8f24bbf4d80..08998a82e1b 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
@@ -38,6 +39,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 d431ca7642e..1859288d73d 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
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: test/Target<kotlin/String>
+        type = test.Target<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 7ebefbbcdcc..31eaad457d2 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
         symbol = KtReceiverParameterSymbol:
           origin: SOURCE
           type: test/Target<kotlin/String>
+        type = test.Target<Stub (chain inference): TypeVariable(T)>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 3906ed8c858..e72c8a1bab4 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 9612fd46d5f..49106835474 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
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
@@ -24,6 +25,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
@@ -42,6 +44,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
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 aeb6ba602fe..68c81b74e53 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
@@ -24,6 +25,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
@@ -42,6 +44,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
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 a37783d57b7..34aa0686923 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
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
@@ -25,6 +26,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
@@ -42,6 +44,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
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 623c343e86a..29aaebe9db5 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt
@@ -7,6 +7,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
@@ -25,6 +26,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
@@ -42,6 +44,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()
         isSafeNavigation = false
+        type = kotlin.Long
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
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 d4c7026fcc4..cbba8642668 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
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
@@ -24,6 +25,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
@@ -42,6 +44,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
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 da9be11798f..b4e16f9f56d 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Double
         returnType = kotlin.Unit
@@ -24,6 +25,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Long
@@ -42,6 +44,7 @@ KtInapplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = i()()
         isSafeNavigation = false
+        type = kotlin.Double
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Long
         returnType = kotlin.Double
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 6fc714fae6c..c310bf3316e 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
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = b1
         isSafeNavigation = false
+        type = B
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 9448b7bff0f..ca3b8cc6eb0 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
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = b1
         isSafeNavigation = false
+        type = B
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 5da06857ed2..8a519f7a837 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
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a1
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 36df0fb07eb..80f2b818ab1 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = "str"
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 5aa69288f0e..206532571e9 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
@@ -5,9 +5,11 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 0d6e99277e8..463e830b9a4 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
@@ -5,9 +5,11 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = @ExtensionFunctionType kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = null
         returnType = kotlin.Unit
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 5aa69288f0e..206532571e9 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
@@ -5,9 +5,11 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 0d6e99277e8..463e830b9a4 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
@@ -5,9 +5,11 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = @ExtensionFunctionType kotlin.Function1<kotlin.String, kotlin.Unit>
       extensionReceiver = KtExplicitReceiverValue:
         expression = ""
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = null
         returnType = kotlin.Unit
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 e26eb631737..d1e204aa218 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = "str"
         isSafeNavigation = false
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 79c72541bfa..0ec5cda3011 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = "str"
         isSafeNavigation = true
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 5ff38032c97..f0acaaa6e68 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 e1d4e2c09a2..af8ac7ff9a7 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 153d4107092..cb1e0160450 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
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 a2638c19dd5..934feb7b260 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 c05de0f2190..aa0a9ec8bf5 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 af22a0eacb2..6987e4393d1 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 40d186f1378..617fa0d88ae 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
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 b9f064c4f75..ea77e8f8ee7 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = c
         isSafeNavigation = false
+        type = C
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 5628b1c8b64..5d3a8f0cf0c 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = javaClass
         isSafeNavigation = false
+        type = JavaClass
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 5e405071e7e..2346eb8ad39 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A<kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 42c42da93c8..f8f5a3f0e83 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
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 145a6e70f0b..fd571b5d953 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt
@@ -6,6 +6,7 @@ KtInapplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = a
         isSafeNavigation = false
+        type = A
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 1952df0cd6d..ef8eb86c771 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = 1
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Int
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 a154067a41d..5519ba917f8 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt
@@ -7,7 +7,8 @@ KtApplicableCallCandidateInfo:
         original = KtExplicitReceiverValue:
           expression = a
           isSafeNavigation = false
-        smartCastType = kotlin.String
+          type = kotlin.Any
+        type = kotlin.String
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.String
         returnType = kotlin.Unit
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 7a87dff06a1..3accb12b3db 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function1<kotlin.Int, kotlin.String>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 7d8d9b338b0..4995c240a68 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.String
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 a5a7b55ad3b..cf36026f970 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 a5a7b55ad3b..cf36026f970 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 01fc9ae57f5..5c625e2bc71 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
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 a5a7b55ad3b..cf36026f970 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, @R|kotlin.ParameterName|(name = String(b))  kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 e89c9f31007..3f1758de755 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function1<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 ba706a8c66c..a52867c35b9 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = x
         isSafeNavigation = false
+        type = kotlin.Function2<@R|kotlin.ParameterName|(name = String(a))  kotlin.Int, kotlin.String, kotlin.Unit>
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
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 cfffa5ef693..38883d37f03 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = Foo
       signature = KtFunctionLikeSignature:
         receiverType = Foo
         returnType = kotlin.Unit
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 b20e3ceb8ed..115c903edd7 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
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 b20e3ceb8ed..115c903edd7 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
@@ -6,6 +6,7 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = kotlin.Int
       signature = KtFunctionLikeSignature:
         receiverType = kotlin.Int
         returnType = kotlin.Unit
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 7b3778f65fe..72e269af082 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt
@@ -5,6 +5,7 @@ KtApplicableCallCandidateInfo:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = f
         isSafeNavigation = false
+        type = Foo
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null