[Analysis API] actualize testdata

analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtSubstitutor.kt

@@ -42,6 +42,6 @@ public interface KtSubstitutor : KtLifetimeOwner {
     public class Empty(override val token: KtLifetimeToken) : KtSubstitutor {
         override fun substituteOrNull(type: KtType): KtType? = withValidityAssertion { null }
 
-        override fun substituteOrSelf(type: KtType): KtType = withValidityAssertion { type }
+        override fun substitute(type: KtType): KtType = withValidityAssertion { type }
     }
 }

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

@@ -15,13 +15,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Char
               symbol = a: kotlin.Char
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Char
-          symbol = a: kotlin.Char)
+          symbol = a: kotlin.Char
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -38,13 +41,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = b
           receiverType = null
           returnType = kotlin.Boolean
-          symbol = b: kotlin.Boolean)
+          symbol = b: kotlin.Boolean
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -61,13 +67,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.String
               symbol = c: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = c
           receiverType = null
           returnType = kotlin.String
-          symbol = c: kotlin.String)
+          symbol = c: kotlin.String
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions can be called with the arguments supplied: 

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

@@ -15,13 +15,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Char
               symbol = a: kotlin.Char
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Char
-          symbol = a: kotlin.Char)
+          symbol = a: kotlin.Char
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -38,13 +41,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = b
           receiverType = null
           returnType = kotlin.Boolean
-          symbol = b: kotlin.Boolean)
+          symbol = b: kotlin.Boolean
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -61,13 +67,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.String
               symbol = c: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = c
           receiverType = null
           returnType = kotlin.String
-          symbol = c: kotlin.String)
+          symbol = c: kotlin.String
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [public final fun function(a: R|kotlin/Char|): R|kotlin/Unit|, public final fun function(b: R|kotlin/Boolean|): R|kotlin/Unit|, public final fun function(c: R|kotlin/String|): R|kotlin/Unit|]>

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

@@ -17,7 +17,9 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.String
               symbol = a: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {},
     KtSimpleFunctionCall:
       isImplicitInvoke = true
@@ -36,7 +38,9 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {}
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions can be called with the arguments supplied:

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

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

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

@@ -14,19 +14,23 @@ KtErrorCallInfo:
               name = t
               receiverType = null
               returnType = TypeVariable(T)
-              symbol = t: T,
+              symbol = t: T
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = a
               receiverType = null
               returnType = kotlin.Char
               symbol = a: kotlin.Char
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
           receiverType = null
           returnType = TypeVariable(T)
-          symbol = t: T)
+          symbol = t: T
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -42,19 +46,23 @@ KtErrorCallInfo:
               name = u
               receiverType = null
               returnType = TypeVariable(U)
-              symbol = u: U,
+              symbol = u: U
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
           receiverType = null
           returnType = TypeVariable(U)
-          symbol = u: U)
+          symbol = u: U
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -70,19 +78,23 @@ KtErrorCallInfo:
               name = v
               receiverType = null
               returnType = TypeVariable(V)
-              symbol = v: V,
+              symbol = v: V
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = c
               receiverType = null
               returnType = kotlin.String
               symbol = c: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v
           receiverType = null
           returnType = TypeVariable(V)
-          symbol = v: V)
+          symbol = v: V
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions can be called with the arguments supplied: 

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

@@ -14,19 +14,23 @@ KtErrorCallInfo:
               name = t
               receiverType = null
               returnType = kotlin.Int
-              symbol = t: T,
+              symbol = t: T
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = a
               receiverType = null
               returnType = kotlin.Char
               symbol = a: kotlin.Char
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
           receiverType = null
           returnType = kotlin.Int
-          symbol = t: T)
+          symbol = t: T
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -42,19 +46,23 @@ KtErrorCallInfo:
               name = u
               receiverType = null
               returnType = kotlin.Int
-              symbol = u: U,
+              symbol = u: U
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
           receiverType = null
           returnType = kotlin.Int
-          symbol = u: U)
+          symbol = u: U
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -70,19 +78,23 @@ KtErrorCallInfo:
               name = v
               receiverType = null
               returnType = kotlin.Int
-              symbol = v: V,
+              symbol = v: V
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = c
               receiverType = null
               returnType = kotlin.String
               symbol = c: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v
           receiverType = null
           returnType = kotlin.Int
-          symbol = v: V)
+          symbol = v: V
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [public final fun <T> function(t: R|T|, a: R|kotlin/Char|): R|kotlin/Unit|, public final fun <U> function(u: R|U|, b: R|kotlin/Boolean|): R|kotlin/Unit|, public final fun <V> function(v: R|V|, c: R|kotlin/String|): R|kotlin/Unit|]>

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

@@ -14,19 +14,23 @@ KtErrorCallInfo:
               name = t
               receiverType = null
               returnType = TypeVariable(T)
-              symbol = t: T,
+              symbol = t: T
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = a
               receiverType = null
               returnType = kotlin.Char
               symbol = a: kotlin.Char
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
           receiverType = null
           returnType = TypeVariable(T)
-          symbol = t: T)
+          symbol = t: T
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -42,19 +46,23 @@ KtErrorCallInfo:
               name = u
               receiverType = null
               returnType = TypeVariable(U)
-              symbol = u: U,
+              symbol = u: U
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
           receiverType = null
           returnType = TypeVariable(U)
-          symbol = u: U)
+          symbol = u: U
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -70,19 +78,23 @@ KtErrorCallInfo:
               name = v
               receiverType = null
               returnType = TypeVariable(V)
-              symbol = v: V,
+              symbol = v: V
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = c
               receiverType = null
               returnType = kotlin.String
               symbol = c: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v
           receiverType = null
           returnType = TypeVariable(V)
-          symbol = v: V)
+          symbol = v: V
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions can be called with the arguments supplied:

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

@@ -14,19 +14,23 @@ KtErrorCallInfo:
               name = t
               receiverType = null
               returnType = T
-              symbol = t: T,
+              symbol = t: T
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = a
               receiverType = null
               returnType = kotlin.Char
               symbol = a: kotlin.Char
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = t
           receiverType = null
           returnType = T
-          symbol = t: T)
+          symbol = t: T
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -42,19 +46,23 @@ KtErrorCallInfo:
               name = u
               receiverType = null
               returnType = U
-              symbol = u: U,
+              symbol = u: U
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.Boolean
               symbol = b: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = u
           receiverType = null
           returnType = U
-          symbol = u: U)
+          symbol = u: U
+          callableIdIfNonLocal = null)
       },
     KtSimpleFunctionCall:
       isImplicitInvoke = false
@@ -70,19 +78,23 @@ KtErrorCallInfo:
               name = v
               receiverType = null
               returnType = V
-              symbol = v: V,
+              symbol = v: V
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = c
               receiverType = null
               returnType = kotlin.String
               symbol = c: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /function
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = v
           receiverType = null
           returnType = V
-          symbol = v: V)
+          symbol = v: V
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [public final fun <T> function(t: R|T|, a: R|kotlin/Char|): R|kotlin/Unit|, public final fun <U> function(u: R|U|, b: R|kotlin/Boolean|): R|kotlin/Unit|, public final fun <V> function(v: R|V|, c: R|kotlin/String|): R|kotlin/Unit|]>

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = Annotation
             symbol = value: Annotation
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       Annotation("v1", "v2") -> (KtVariableLikeSignature:
         name = value
         receiverType = null
         returnType = Annotation
-        symbol = value: Annotation)
+        symbol = value: Annotation
+        callableIdIfNonLocal = null)
     }

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg strings: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       arrayOf("v1", "v2") -> (KtVariableLikeSignature:
         name = strings
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg strings: kotlin.String)
+        symbol = vararg strings: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg strings: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       ["v1", "v2"] -> (KtVariableLikeSignature:
         name = strings
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg strings: kotlin.String)
+        symbol = vararg strings: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -14,16 +14,20 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = Annotation
             symbol = vararg elements: T
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/arrayOf
     argumentMapping = {
       Annotation("v1", "v2") -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = Annotation
-        symbol = vararg elements: T),
+        symbol = vararg elements: T
+        callableIdIfNonLocal = null),
       Annotation(strings = arrayOf("v3", "v4")) -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = Annotation
-        symbol = vararg elements: T)
+        symbol = vararg elements: T
+        callableIdIfNonLocal = null)
     }

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = Annotation
             symbol = vararg annos: Annotation
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       [Annotation("v1", "v2"), Annotation(["v3", "v4"])] -> (KtVariableLikeSignature:
         name = annos
         receiverType = null
         returnType = Annotation
-        symbol = vararg annos: Annotation)
+        symbol = vararg annos: Annotation
+        callableIdIfNonLocal = null)
     }

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

@@ -14,5 +14,7 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg strings: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {}

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

@@ -14,16 +14,20 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg strings: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       "v1" -> (KtVariableLikeSignature:
         name = strings
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg strings: kotlin.String),
+        symbol = vararg strings: kotlin.String
+        callableIdIfNonLocal = null),
       "v2" -> (KtVariableLikeSignature:
         name = strings
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg strings: kotlin.String)
+        symbol = vararg strings: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -13,5 +13,7 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg names: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {}

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg names: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       "UNCHECKED_CAST" -> (KtVariableLikeSignature:
         name = names
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg names: kotlin.String)
+        symbol = vararg names: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg names: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       "UNCHECKED_CAST" -> (KtVariableLikeSignature:
         name = names
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg names: kotlin.String)
+        symbol = vararg names: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -13,5 +13,7 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg names: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {}

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg names: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       "DEPRECATION" -> (KtVariableLikeSignature:
         name = names
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg names: kotlin.String)
+        symbol = vararg names: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = name: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       "Foo" -> (KtVariableLikeSignature:
         name = name
         receiverType = null
         returnType = kotlin.String
-        symbol = name: kotlin.String)
+        symbol = name: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

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

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

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

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = vararg names: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       "s" -> (KtVariableLikeSignature:
         name = names
         receiverType = null
         returnType = kotlin.String
-        symbol = vararg names: kotlin.String)
+        symbol = vararg names: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,21 +14,26 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = vararg elements: T
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/arrayOf
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg elements: T),
+        symbol = vararg elements: T
+        callableIdIfNonLocal = null),
       2 -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg elements: T),
+        symbol = vararg elements: T
+        callableIdIfNonLocal = null),
       3 -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg elements: T)
+        symbol = vararg elements: T
+        callableIdIfNonLocal = null)
     }

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

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

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

@@ -17,11 +17,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = t: T
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = test/Target.add
     argumentMapping = {
       s -> (KtVariableLikeSignature:
         name = t
         receiverType = null
         returnType = kotlin.String
-        symbol = t: T)
+        symbol = t: T
+        callableIdIfNonLocal = null)
     }

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

@@ -17,11 +17,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = T
             symbol = t: T
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = test/Target.add
     argumentMapping = {
       s -> (KtVariableLikeSignature:
         name = t
         receiverType = null
         returnType = T
-        symbol = t: T)
+        symbol = t: T
+        callableIdIfNonLocal = null)
     }

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

@@ -8,4 +8,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Function0<kotlin.Unit>
         symbol = f: kotlin.Function0<kotlin.Unit>
+        callableIdIfNonLocal = null
     simpleAccess = Read:

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = other: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Int.compareTo
     argumentMapping = {
       j -> (KtVariableLikeSignature:
         name = other
         receiverType = null
         returnType = kotlin.Int
-        symbol = other: kotlin.Int)
+        symbol = other: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = i: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /A.plusAssign
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = i
         receiverType = null
         returnType = kotlin.Int
-        symbol = i: kotlin.Int)
+        symbol = i: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -8,4 +8,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = A
         symbol = l: A
+        callableIdIfNonLocal = null
     simpleAccess = Read:

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

@@ -18,7 +18,9 @@ KtSuccessCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = other: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = kotlin/Int.plus
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
       dispatchReceiver = null
       extensionReceiver = null
@@ -27,3 +29,4 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var i: kotlin.Int
+        callableIdIfNonLocal = null

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

@@ -8,4 +8,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var i: kotlin.Int
+        callableIdIfNonLocal = null
     simpleAccess = Read:

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

@@ -18,7 +18,9 @@ KtSuccessCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = other: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = kotlin/Int.plus
     getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
@@ -34,7 +36,9 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = k: K
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /MyMap.get
     indexArguments = [
       "a"
     ]
@@ -52,10 +56,13 @@ KtSuccessCallInfo:
             name = k
             receiverType = null
             returnType = kotlin.String
-            symbol = k: K,
+            symbol = k: K
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = v
             receiverType = null
             returnType = kotlin.Int
             symbol = v: V
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /MyMap.set

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

@@ -18,7 +18,9 @@ KtSuccessCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = other: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = kotlin/Int.plus
     getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol:
       dispatchReceiver = KtExplicitReceiverValue:
         expression = m
@@ -34,7 +36,9 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = k: K1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /MyMap.get
     indexArguments = [
       "a"
     ]
@@ -71,10 +75,13 @@ KtSuccessCallInfo:
             name = k
             receiverType = null
             returnType = kotlin.String
-            symbol = k: K2,
+            symbol = k: K2
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = v
             receiverType = null
             returnType = kotlin.Int
             symbol = v: V2
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /Foo.set

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = k: K
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /MyMap.get
     argumentMapping = {
       "a" -> (KtVariableLikeSignature:
         name = k
         receiverType = null
         returnType = kotlin.String
-        symbol = k: K)
+        symbol = k: K
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = i: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /A.plusAssign
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = i
         receiverType = null
         returnType = kotlin.Int
-        symbol = i: kotlin.Int)
+        symbol = i: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = k: K
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /MyMap.get
     argumentMapping = {
       "a" -> (KtVariableLikeSignature:
         name = k
         receiverType = null
         returnType = kotlin.String
-        symbol = k: K)
+        symbol = k: K
+        callableIdIfNonLocal = null)
     }

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

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

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

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

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

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

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

@@ -8,4 +8,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = i: kotlin.Int
+        callableIdIfNonLocal = null
     simpleAccess = Read:

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = p1: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       i + j -> (KtVariableLikeSignature:
         name = p1
         receiverType = null
         returnType = kotlin.Int
-        symbol = p1: kotlin.Int)
+        symbol = p1: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -15,13 +15,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = p1: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {
         s -> (KtVariableLikeSignature:
           name = p1
           receiverType = null
           returnType = kotlin.Int
-          symbol = p1: kotlin.Int)
+          symbol = p1: kotlin.Int
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<TYPE_MISMATCH: Type mismatch: inferred type is String but Int was expected>

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

@@ -15,13 +15,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = p1: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {
         s -> (KtVariableLikeSignature:
           name = p1
           receiverType = null
           returnType = kotlin.Int
-          symbol = p1: kotlin.Int)
+          symbol = p1: kotlin.Int
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is kotlin/String but kotlin/Int was expected>

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = p1: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       s.length -> (KtVariableLikeSignature:
         name = p1
         receiverType = null
         returnType = kotlin.Int
-        symbol = p1: kotlin.Int)
+        symbol = p1: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -14,24 +14,29 @@ KtErrorCallInfo:
               name = i
               receiverType = null
               returnType = kotlin.Int
-              symbol = i: kotlin.Int,
+              symbol = i: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = j
               receiverType = null
               returnType = kotlin.Int
               symbol = j: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {
         i -> (KtVariableLikeSignature:
           name = i
           receiverType = null
           returnType = kotlin.Int
-          symbol = i: kotlin.Int),
+          symbol = i: kotlin.Int
+          callableIdIfNonLocal = null),
         j -> (KtVariableLikeSignature:
           name = j
           receiverType = null
           returnType = kotlin.Int
-          symbol = j: kotlin.Int)
+          symbol = j: kotlin.Int
+          callableIdIfNonLocal = null)
       },
     KtDelegatedConstructorCall:
       kind = THIS_CALL
@@ -48,13 +53,16 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = p: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {
         i -> (KtVariableLikeSignature:
           name = p
           receiverType = null
           returnType = kotlin.Int
-          symbol = p: kotlin.Int)
+          symbol = p: kotlin.Int
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions can be called with the arguments supplied: 

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

@@ -14,13 +14,16 @@ KtErrorCallInfo:
               name = i
               receiverType = null
               returnType = kotlin.Int
-              symbol = i: kotlin.Int,
+              symbol = i: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = j
               receiverType = null
               returnType = kotlin.Int
               symbol = j: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {},
     KtDelegatedConstructorCall:
       kind = THIS_CALL
@@ -37,7 +40,9 @@ KtErrorCallInfo:
               receiverType = null
               returnType = kotlin.Int
               symbol = p: kotlin.Int
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = null
       argumentMapping = {}
   ]
   diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [public constructor(p: R|kotlin/Int|): R|Sub|, public constructor(i: R|kotlin/Int|, j: R|kotlin/Int|): R|Sub|]>

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

@@ -13,11 +13,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = Color
             symbol = color: Color
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       Color.R -> (KtVariableLikeSignature:
         name = color
         receiverType = null
         returnType = Color
-        symbol = color: Color)
+        symbol = color: Color
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Any?
             symbol = other: kotlin.Any?
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Any.equals
     argumentMapping = {
       b2 -> (KtVariableLikeSignature:
         name = other
         receiverType = null
         returnType = kotlin.Any?
-        symbol = other: kotlin.Any?)
+        symbol = other: kotlin.Any?
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Any?
             symbol = other: kotlin.Any?
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /A.equals
     argumentMapping = {
       b2 -> (KtVariableLikeSignature:
         name = other
         receiverType = null
         returnType = kotlin.Any?
-        symbol = other: kotlin.Any?)
+        symbol = other: kotlin.Any?
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Any?
             symbol = other: kotlin.Any?
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /A.equals
     argumentMapping = {
       a2 -> (KtVariableLikeSignature:
         name = other
         receiverType = null
         returnType = kotlin.Any?
-        symbol = other: kotlin.Any?)
+        symbol = other: kotlin.Any?
+        callableIdIfNonLocal = null)
     }

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = a: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int)
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = a: B
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: B)
+        symbol = a: B
+        callableIdIfNonLocal = null)
     }

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

@@ -13,22 +13,27 @@ KtSuccessCallInfo:
             name = a
             receiverType = null
             returnType = kotlin.Int
-            symbol = a: kotlin.Int,
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = kotlin.Function1<kotlin.String, kotlin.Boolean>
             symbol = b: kotlin.Function1<kotlin.String, kotlin.Boolean>
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int),
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null),
       { s -> true } -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = kotlin.Function1<kotlin.String, kotlin.Boolean>
-        symbol = b: kotlin.Function1<kotlin.String, kotlin.Boolean>)
+        symbol = b: kotlin.Function1<kotlin.String, kotlin.Boolean>
+        callableIdIfNonLocal = null)
     }

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

@@ -13,22 +13,27 @@ KtSuccessCallInfo:
             name = a
             receiverType = null
             returnType = kotlin.Int
-            symbol = a: kotlin.Int,
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = kotlin.String
             symbol = b: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       "foo" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = kotlin.String
-        symbol = b: kotlin.String),
+        symbol = b: kotlin.String
+        callableIdIfNonLocal = null),
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int)
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -13,22 +13,27 @@ KtSuccessCallInfo:
             name = a
             receiverType = null
             returnType = kotlin.Int
-            symbol = a: kotlin.Int,
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = kotlin.Function1<kotlin.String, kotlin.Boolean>
             symbol = b: kotlin.Function1<kotlin.String, kotlin.Boolean>
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int),
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null),
       { s -> true } -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = kotlin.Function1<kotlin.String, kotlin.Boolean>
-        symbol = b: kotlin.Function1<kotlin.String, kotlin.Boolean>)
+        symbol = b: kotlin.Function1<kotlin.String, kotlin.Boolean>
+        callableIdIfNonLocal = null)
     }

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = vararg a: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       args -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg a: kotlin.Int)
+        symbol = vararg a: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -13,22 +13,27 @@ KtSuccessCallInfo:
             name = a
             receiverType = null
             returnType = kotlin.Int
-            symbol = a: A,
+            symbol = a: A
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = kotlin.String
             symbol = b: B
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: A),
+        symbol = a: A
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = kotlin.String
-        symbol = b: B)
+        symbol = b: B
+        callableIdIfNonLocal = null)
     }

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

@@ -14,21 +14,26 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = vararg a: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg a: kotlin.Int),
+        symbol = vararg a: kotlin.Int
+        callableIdIfNonLocal = null),
       2 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg a: kotlin.Int),
+        symbol = vararg a: kotlin.Int
+        callableIdIfNonLocal = null),
       3 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg a: kotlin.Int)
+        symbol = vararg a: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

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

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

@@ -18,5 +18,7 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = p1: P1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function1.invoke
     argumentMapping = {}

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

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

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

@@ -18,5 +18,7 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = p1: P1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function1.invoke
     argumentMapping = {}

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = a: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int)
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = a: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /function
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int)
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

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

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

@@ -14,11 +14,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = i: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = null
     argumentMapping = {
       42 -> (KtVariableLikeSignature:
         name = i
         receiverType = null
         returnType = kotlin.Int
-        symbol = i: kotlin.Int)
+        symbol = i: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

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

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

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

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

@@ -15,22 +15,27 @@ KtSuccessCallInfo:
             name = a
             receiverType = null
             returnType = kotlin.Int
-            symbol = a: kotlin.Int,
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = kotlin.String
             symbol = b: kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /C.get
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int),
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null),
       "foo" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = kotlin.String
-        symbol = b: kotlin.String)
+        symbol = b: kotlin.String
+        callableIdIfNonLocal = null)
     }

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

@@ -16,19 +16,23 @@ KtErrorCallInfo:
               name = a
               receiverType = null
               returnType = kotlin.Int
-              symbol = a: kotlin.Int,
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.String
               symbol = b: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /C.get
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Int
-          symbol = a: kotlin.Int)
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>

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

@@ -16,24 +16,29 @@ KtErrorCallInfo:
               name = a
               receiverType = null
               returnType = kotlin.Int
-              symbol = a: kotlin.Int,
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.String
               symbol = b: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /C.get
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Int
-          symbol = a: kotlin.Int),
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null),
         "foo" -> (KtVariableLikeSignature:
           name = b
           receiverType = null
           returnType = kotlin.String
-          symbol = b: kotlin.String)
+          symbol = b: kotlin.String
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun get(a: Int, b: String): Boolean defined in C>

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

@@ -16,24 +16,29 @@ KtErrorCallInfo:
               name = a
               receiverType = null
               returnType = kotlin.Int
-              symbol = a: kotlin.Int,
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.String
               symbol = b: kotlin.String
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /C.get
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Int
-          symbol = a: kotlin.Int),
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null),
         "foo" -> (KtVariableLikeSignature:
           name = b
           receiverType = null
           returnType = kotlin.String
-          symbol = b: kotlin.String)
+          symbol = b: kotlin.String
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: R|kotlin/Int|, b: R|kotlin/String|): R|kotlin/Boolean|>

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

@@ -15,32 +15,39 @@ KtSuccessCallInfo:
             name = a
             receiverType = null
             returnType = kotlin.Int
-            symbol = a: kotlin.Int,
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = kotlin.String
-            symbol = b: kotlin.String,
+            symbol = b: kotlin.String
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = value
             receiverType = null
             returnType = kotlin.Boolean
             symbol = value: kotlin.Boolean
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /C.set
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = kotlin.Int
-        symbol = a: kotlin.Int),
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null),
       "foo" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = kotlin.String
-        symbol = b: kotlin.String),
+        symbol = b: kotlin.String
+        callableIdIfNonLocal = null),
       false -> (KtVariableLikeSignature:
         name = value
         receiverType = null
         returnType = kotlin.Boolean
-        symbol = value: kotlin.Boolean)
+        symbol = value: kotlin.Boolean
+        callableIdIfNonLocal = null)
     }

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

@@ -16,29 +16,35 @@ KtErrorCallInfo:
               name = a
               receiverType = null
               returnType = kotlin.Int
-              symbol = a: kotlin.Int,
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.String
-              symbol = b: kotlin.String,
+              symbol = b: kotlin.String
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = value
               receiverType = null
               returnType = kotlin.Boolean
               symbol = value: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /C.set
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Int
-          symbol = a: kotlin.Int),
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null),
         false -> (KtVariableLikeSignature:
           name = value
           receiverType = null
           returnType = kotlin.Boolean
-          symbol = value: kotlin.Boolean)
+          symbol = value: kotlin.Boolean
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>

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

@@ -16,34 +16,41 @@ KtErrorCallInfo:
               name = a
               receiverType = null
               returnType = kotlin.Int
-              symbol = a: kotlin.Int,
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.String
-              symbol = b: kotlin.String,
+              symbol = b: kotlin.String
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = value
               receiverType = null
               returnType = kotlin.Boolean
               symbol = value: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /C.set
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Int
-          symbol = a: kotlin.Int),
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null),
         "foo" -> (KtVariableLikeSignature:
           name = b
           receiverType = null
           returnType = kotlin.String
-          symbol = b: kotlin.String),
+          symbol = b: kotlin.String
+          callableIdIfNonLocal = null),
         3.14 -> (KtVariableLikeSignature:
           name = value
           receiverType = null
           returnType = kotlin.Boolean
-          symbol = value: kotlin.Boolean)
+          symbol = value: kotlin.Boolean
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<CONSTANT_EXPECTED_TYPE_MISMATCH: The floating-point literal does not conform to the expected type Boolean>

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

@@ -16,34 +16,41 @@ KtErrorCallInfo:
               name = a
               receiverType = null
               returnType = kotlin.Int
-              symbol = a: kotlin.Int,
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = b
               receiverType = null
               returnType = kotlin.String
-              symbol = b: kotlin.String,
+              symbol = b: kotlin.String
+              callableIdIfNonLocal = null,
             KtVariableLikeSignature:
               name = value
               receiverType = null
               returnType = kotlin.Boolean
               symbol = value: kotlin.Boolean
+              callableIdIfNonLocal = null
           ]
+          callableIdIfNonLocal = /C.set
       argumentMapping = {
         1 -> (KtVariableLikeSignature:
           name = a
           receiverType = null
           returnType = kotlin.Int
-          symbol = a: kotlin.Int),
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null),
         "foo" -> (KtVariableLikeSignature:
           name = b
           receiverType = null
           returnType = kotlin.String
-          symbol = b: kotlin.String),
+          symbol = b: kotlin.String
+          callableIdIfNonLocal = null),
         false -> (KtVariableLikeSignature:
           name = value
           receiverType = null
           returnType = kotlin.Boolean
-          symbol = value: kotlin.Boolean)
+          symbol = value: kotlin.Boolean
+          callableIdIfNonLocal = null)
       }
   ]
   diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: R|kotlin/Int|, b: R|kotlin/String|, value: R|kotlin/Boolean|): R|kotlin/Unit|>

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

@@ -14,21 +14,26 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = vararg elements: kotlin.Int
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/intArrayOf
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg elements: kotlin.Int),
+        symbol = vararg elements: kotlin.Int
+        callableIdIfNonLocal = null),
       2 -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg elements: kotlin.Int),
+        symbol = vararg elements: kotlin.Int
+        callableIdIfNonLocal = null),
       3 -> (KtVariableLikeSignature:
         name = elements
         receiverType = null
         returnType = kotlin.Int
-        symbol = vararg elements: kotlin.Int)
+        symbol = vararg elements: kotlin.Int
+        callableIdIfNonLocal = null)
     }

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

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

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

@@ -10,4 +10,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = val foo: kotlin.Int
+        callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Read:

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

@@ -11,4 +11,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = val foo: kotlin.Int
+        callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Read:

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

@@ -10,4 +10,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = ft<JavaSubClass, JavaSubClass?>
         symbol = val sub: ft<JavaSubClass, JavaSubClass?>
+        callableIdIfNonLocal = /JavaClass.sub
     simpleAccess = Read:

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

@@ -10,5 +10,6 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var foo: kotlin.Int
+        callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Write:
       value = 42

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

@@ -10,5 +10,6 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var foo: kotlin.Int
+        callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Write:
       value = null

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

@@ -11,5 +11,6 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var foo: kotlin.Int
+        callableIdIfNonLocal = /JavaClass.foo
     simpleAccess = Write:
       value = 42

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

@@ -10,4 +10,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = val foo: kotlin.Int
+        callableIdIfNonLocal = /KtClass.foo
     simpleAccess = Read:

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

@@ -11,4 +11,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = val i: kotlin.Int
+        callableIdIfNonLocal = /A.i
     simpleAccess = Read:

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

@@ -10,4 +10,5 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = KtSubClass
         symbol = val instance: KtSubClass
+        callableIdIfNonLocal = /KtClass.instance
     simpleAccess = Read:

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

@@ -10,5 +10,6 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var foo: kotlin.Int
+        callableIdIfNonLocal = /KtClass.foo
     simpleAccess = Write:
       value = 42

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

@@ -11,5 +11,6 @@ KtSuccessCallInfo:
         receiverType = null
         returnType = kotlin.Int
         symbol = var i: kotlin.Int
+        callableIdIfNonLocal = /A.i
     simpleAccess = Write:
       value = 1

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

@@ -16,11 +16,14 @@ KtSuccessCallInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = r: R
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /A.foo
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = r
         receiverType = null
         returnType = kotlin.Int
-        symbol = r: R)
+        symbol = r: R
+        callableIdIfNonLocal = null)
     }