[Analysis API] actualize testdata

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt

@@ -14,22 +14,27 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt

@@ -17,12 +17,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt

@@ -17,12 +17,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt

@@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -28,6 +29,7 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Long
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true
 
@@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Double
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
-  isInBestCandidates = false
+  isInBestCandidates = false

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt

@@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -28,6 +29,7 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Long
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true
 
@@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Double
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt

@@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -29,6 +30,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Long
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -45,5 +47,6 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Double
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt

@@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -29,6 +30,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Long
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -45,5 +47,6 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Double
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt

@@ -11,6 +11,7 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true
 
@@ -28,6 +29,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Long
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Double
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
-  isInBestCandidates = false
+  isInBestCandidates = false

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt

@@ -11,6 +11,7 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Double): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true
 
@@ -28,6 +29,7 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Long
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Long
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false
 
@@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Double
         symbol = /invoke(<extension receiver>: kotlin.Long): kotlin.Double
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = false

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt

@@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt

@@ -13,23 +13,28 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt

@@ -13,23 +13,28 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt

@@ -13,23 +13,28 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt

@@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt

@@ -13,23 +13,28 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt

@@ -14,22 +14,27 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt

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

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt

@@ -18,6 +18,8 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = p1: P1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function1.invoke
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt

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

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt

@@ -18,6 +18,8 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = p1: P1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function1.invoke
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt

@@ -10,5 +10,6 @@ KtInapplicableCallCandidateInfo:
         returnType = Obj
         symbol = <constructor>(): Obj
         valueParameters = []
+        callableIdIfNonLocal = null
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt

@@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt

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

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt

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

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt

@@ -15,23 +15,28 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt

@@ -16,18 +16,22 @@ KtInapplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt

@@ -16,23 +16,28 @@ KtInapplicableCallCandidateInfo:
             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)
     }
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt

@@ -16,23 +16,28 @@ KtInapplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt

@@ -15,33 +15,40 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt

@@ -16,28 +16,34 @@ KtInapplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt

@@ -16,33 +16,40 @@ KtInapplicableCallCandidateInfo:
             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)
     }
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt

@@ -16,33 +16,40 @@ KtInapplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt

@@ -14,22 +14,27 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt

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

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             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)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt

@@ -12,5 +12,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /A.foo(<dispatch receiver>: A): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /A.foo
     argumentMapping = {}
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt

@@ -12,5 +12,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /A.foo(<dispatch receiver>: A): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /A.foo
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = other: B
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /to
     argumentMapping = {
       2 -> (KtVariableLikeSignature:
         name = other
         receiverType = null
         returnType = kotlin.Int
-        symbol = other: B)
+        symbol = other: B
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt

@@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
             symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = java/util/Comparator
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
         returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
-        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>)
+        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+        callableIdIfNonLocal = null)
     }
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt

@@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
             symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = java/util/Comparator
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
         returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
-        symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>)
+        symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt

@@ -10,5 +10,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /foo(): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /foo
     argumentMapping = {}
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt

@@ -10,5 +10,6 @@ KtInapplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /foo(): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /foo
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt

@@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /foo(<extension receiver>: kotlin.String): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /foo
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.Int
             symbol = p1: P1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function1.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = p1
         receiverType = null
         returnType = kotlin.Int
-        symbol = p1: P1)
+        symbol = p1: P1
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt

@@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.String
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.String
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt

@@ -15,23 +15,28 @@ KtApplicableCallCandidateInfo:
             name = a
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-            symbol = p1: P1,
+            symbol = p1: P1
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(b))  kotlin.String
             symbol = p2: P2
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function2.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-        symbol = p1: P1),
+        symbol = p1: P1
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(b))  kotlin.String
-        symbol = p2: P2)
+        symbol = p2: P2
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt

@@ -15,23 +15,28 @@ KtApplicableCallCandidateInfo:
             name = a
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-            symbol = p1: P1,
+            symbol = p1: P1
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(b))  kotlin.String
             symbol = p2: P2
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function2.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-        symbol = p1: P1),
+        symbol = p1: P1
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(b))  kotlin.String
-        symbol = p2: P2)
+        symbol = p2: P2
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt

@@ -15,23 +15,28 @@ KtApplicableCallCandidateInfo:
             name = a
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(a)) @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int
-            symbol = p1: P1,
+            symbol = p1: P1
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(b)) @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String
             symbol = p2: P2
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function2.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(a)) @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int
-        symbol = p1: P1),
+        symbol = p1: P1
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(b)) @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String
-        symbol = p2: P2)
+        symbol = p2: P2
+        callableIdIfNonLocal = null)
     }
-  isInBestCandidates = true
+  isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt

@@ -15,23 +15,28 @@ KtApplicableCallCandidateInfo:
             name = a
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-            symbol = p1: P1,
+            symbol = p1: P1
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(b))  kotlin.String
             symbol = p2: P2
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function2.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-        symbol = p1: P1),
+        symbol = p1: P1
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(b))  kotlin.String
-        symbol = p2: P2)
+        symbol = p2: P2
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
             symbol = p1: P1
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function1.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-        symbol = p1: P1)
+        symbol = p1: P1
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt

@@ -13,23 +13,28 @@ KtApplicableCallCandidateInfo:
             name = a
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int
-            symbol = a: @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int,
+            symbol = a: @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = b
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String
             symbol = b: @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /call
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int
-        symbol = a: @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int),
+        symbol = a: @R|kotlin.ParameterName|(name = String(notMe))  kotlin.Int
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = b
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String
-        symbol = b: @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String)
+        symbol = b: @R|kotlin.ParameterName|(name = String(meNeither))  kotlin.String
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt

@@ -15,23 +15,28 @@ KtApplicableCallCandidateInfo:
             name = a
             receiverType = null
             returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-            symbol = p1: P1,
+            symbol = p1: P1
+            callableIdIfNonLocal = null,
           KtVariableLikeSignature:
             name = p2
             receiverType = null
             returnType = kotlin.String
             symbol = p2: P2
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = kotlin/Function2.invoke
     argumentMapping = {
       1 -> (KtVariableLikeSignature:
         name = a
         receiverType = null
         returnType = @R|kotlin.ParameterName|(name = String(a))  kotlin.Int
-        symbol = p1: P1),
+        symbol = p1: P1
+        callableIdIfNonLocal = null),
       "" -> (KtVariableLikeSignature:
         name = p2
         receiverType = null
         returnType = kotlin.String
-        symbol = p2: P2)
+        symbol = p2: P2
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = t: T
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /invoke
     argumentMapping = {
       "" -> (KtVariableLikeSignature:
         name = t
         receiverType = null
         returnType = kotlin.String
-        symbol = t: T)
+        symbol = t: T
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt

@@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt

@@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo:
         returnType = kotlin.Unit
         symbol = /invoke(<extension receiver>: kotlin.Int): kotlin.Unit
         valueParameters = []
+        callableIdIfNonLocal = /invoke
     argumentMapping = {}
   isInBestCandidates = true

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt

@@ -16,12 +16,15 @@ KtApplicableCallCandidateInfo:
             receiverType = null
             returnType = kotlin.String
             symbol = t: T
+            callableIdIfNonLocal = null
         ]
+        callableIdIfNonLocal = /Foo.invoke
     argumentMapping = {
       "" -> (KtVariableLikeSignature:
         name = t
         receiverType = null
         returnType = kotlin.String
-        symbol = t: T)
+        symbol = t: T
+        callableIdIfNonLocal = null)
     }
   isInBestCandidates = true