diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtSubstitutor.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtSubstitutor.kt index e97f7b65da6..2682cc9061a 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/types/KtSubstitutor.kt +++ b/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 } } } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt index cd4902b1cd2..7279427efeb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguous.descriptors.txt +++ b/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 (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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt index 3bb2ae0b6b6..1d02f3ff487 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousImplicitInvoke.descriptors.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt index 1bb3b114833..6fd6e3d7518 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithExplicitTypeParameters.descriptors.txt +++ b/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 (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 function(t: R|T|, a: R|kotlin/Char|): R|kotlin/Unit|, public final fun function(u: R|U|, b: R|kotlin/Boolean|): R|kotlin/Unit|, public final fun function(v: R|V|, c: R|kotlin/String|): R|kotlin/Unit|]> diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt index 6fb4dd5567c..8f339f3539a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/ambiguousWithInferredTypeParameters.descriptors.txt +++ b/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 (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 function(t: R|T|, a: R|kotlin/Char|): R|kotlin/Unit|, public final fun function(u: R|U|, b: R|kotlin/Boolean|): R|kotlin/Unit|, public final fun function(v: R|V|, c: R|kotlin/String|): R|kotlin/Unit|]> diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt index 7c727bc088c..50f7b5fc8fa 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt index 20a78f613b4..1a45af99974 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt index c55d44e2681..343605d0f80 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt index ebef6ecea6a..a1f99e7b333 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_arrayOf.txt @@ -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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt index d7a8b44cd4c..f1e7760174a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_multipleAnnotations_collectionLiteral.txt @@ -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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt index 53271cb8d20..757c10041bb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt index 60ef0212df6..454722c1337 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt index d786131de51..8bb9388ce5a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt index 74b02f96aa8..e45c462a41d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt index 74b02f96aa8..e45c462a41d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt index d786131de51..8bb9388ce5a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt index 4561ea11c5e..5cdc8c865d9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt index e8d0102860f..735d3317ab4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_param.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_parameterProperty.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt index be74d922bcf..adb4bab38ee 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_setparam.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_field.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_get.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_property.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnProperty_set.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt index 343101cb2d7..253f6bb4a0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnReceiver.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: returnType = Anno symbol = (): Anno valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt index cea6aab2847..c315b6acc7c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt index e4b61fe9768..5ea00ef4e5f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/assignments/insidePlusAssignTarget.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: returnType = kotlin.collections.MutableList symbol = kotlin/collections/mutableListOf(): kotlin.collections.MutableList valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = kotlin/collections/mutableListOf + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt index b49c646397d..342d6b2e1d0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt +++ b/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) } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt index bd7e066c33d..0bae720cb25 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt index 86676751c50..a45e64ed150 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Function0 symbol = f: kotlin.Function0 + callableIdIfNonLocal = null simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt index 3d8c6b7b381..7623632c418 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt index 194c7872936..cc4dd4042fa 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt index a139e37fd5d..d6581acfb0d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt index 350e1863f03..2264e45ff2c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt index 6ba6557e8f4..a7230ffca9b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt index d2a600fb641..1990e8e1e60 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt index 9fd8689ef05..45dc6823e1b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt index 40c3e5fbd61..86ae3e92fc0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt index 5b927e73b20..a0271f894b2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt index 8f4a1d21368..6b77a5da12a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt index 14dbfb8d598..0bc9964c455 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke1.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /invoke + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt index cb95ea2c7c6..3d875f262ba 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke2.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /invoke + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt index 2bc502cb6ca..fcbc9480079 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke3.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /invoke + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt index f6b30aa4778..1445c7ffbaa 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt index af5abc0b12a..039fe4ed043 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt index fd4f91b9c61..af5f48bafee 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.descriptors.txt @@ -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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt index 455a6087171..de17970f09e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt index 742a8978c4e..569501c0bec 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt index 25d5d83d677..7a3fc8e3e18 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.descriptors.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt index f69f6c33037..667163b5f3e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt index df54910c4aa..efdaaa347ab 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt index 997c5e2da33..22397dcde17 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt index 0ef806aba1d..70565554dcb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt index e0beb315d70..be593ecf69b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt index 21828b82cb5..a97dda7768a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt index 98a6e6107ee..389fbb907da 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt +++ b/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 symbol = b: kotlin.Function1 + 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 - symbol = b: kotlin.Function1) + symbol = b: kotlin.Function1 + callableIdIfNonLocal = null) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt index 0f8a4470c86..ec6964a0ab9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt index 98a6e6107ee..389fbb907da 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt +++ b/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 symbol = b: kotlin.Function1 + 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 - symbol = b: kotlin.Function1) + symbol = b: kotlin.Function1 + callableIdIfNonLocal = null) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt index 1283e49e6e2..2fc99cdb33c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt index 1715ccc8b49..1d74401395e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt index 0430e8008b9..531789b69c6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt index a405cdf198d..3e723c54d4a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.descriptors.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = {} \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt index ac44ea88137..df26fc85d53 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt index a405cdf198d..3e723c54d4a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.descriptors.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = {} \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt index ac44ea88137..df26fc85d53 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt +++ b/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 = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt index 59acf142756..d67d8bf4278 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt index edc940e1382..73bad248885 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt index 3cd6a4cc960..30ddcbc878a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/hiddenConstructor.txt @@ -10,6 +10,7 @@ KtErrorCallInfo: returnType = Obj symbol = (): Obj valueParameters = [] + callableIdIfNonLocal = null argumentMapping = {} ] diagnostic = ERROR diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt index a1ad877c0a8..5db025f5020 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt index 39e131b7cc8..51253e7ae7a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstuctorCall.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: returnType = A symbol = (): A valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt index 39e131b7cc8..51253e7ae7a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitJavaConstuctorCall.txt @@ -9,4 +9,5 @@ KtSuccessCallInfo: returnType = A symbol = (): A valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = null + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt index e93b4bd1a66..650b5572a25 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt index 6ea774bd9d8..813fa26853f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt index 5413c67d5f3..8796ed9dc5a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt +++ 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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt index bf2a8909170..68a94161e86 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt index 7f549521842..026d305b87b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt index 1946907b8a3..9c1fdfcd0f6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt index 35c81b414bf..70f10ab7fb9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt +++ 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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt index 6e3e940a16b..5438266b7c5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt index 89a884449b4..4b3e7c515c4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt index 70ee8bad69a..5b9232ae94f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaFunctionCall.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = /JavaClass.javaMethod(: JavaClass): kotlin.Unit valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /JavaClass.javaMethod + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt index 80dc07dd617..cbe1a27f6fc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt index 6fb17584935..43df1a9e204 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt index 5d394032ea6..92c795c9956 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt @@ -10,4 +10,5 @@ KtSuccessCallInfo: receiverType = null returnType = ft symbol = val sub: ft + callableIdIfNonLocal = /JavaClass.sub simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt index 1b0485515c2..dd0a534eea2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt +++ b/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 + value = 42 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt index 0ec6487d4ef..0755757d6db 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt +++ b/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 + value = null \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt index 82761b60bc8..70d0ff32b0a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt +++ b/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 + value = 42 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt index 80a305eb46c..d4c6d5380ce 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt index beef17521a7..4c10e7fd21d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt index b1bbd83c95b..217bad5ba72 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt +++ b/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: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt index 64ab460f16a..491849a126a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt index 7fde8f23928..ce35d355e13 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt index 5824b831d5f..47104e430eb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt +++ b/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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt index e6283776850..a262f021786 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt @@ -13,6 +13,7 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = kotlin/Int.inc(: kotlin.Int): kotlin.Int valueParameters = [] + callableIdIfNonLocal = kotlin/Int.inc partiallyAppliedSymbol = KtPartiallyAppliedSymbol: dispatchReceiver = null extensionReceiver = null @@ -21,3 +22,4 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int + callableIdIfNonLocal = null diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt index 6ba6557e8f4..a7230ffca9b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int + callableIdIfNonLocal = null simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt index ee36767761b..4b8fd99a5d5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt @@ -13,6 +13,7 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = kotlin/Int.inc(: kotlin.Int): kotlin.Int valueParameters = [] + callableIdIfNonLocal = kotlin/Int.inc getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol: dispatchReceiver = KtExplicitReceiverValue: expression = m @@ -28,7 +29,9 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.String symbol = k: K + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /MyMap.get indexArguments = [ "a" ] @@ -46,10 +49,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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt index 40c3e5fbd61..86ae3e92fc0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt index e28cf89235e..5f19323cd52 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt @@ -13,6 +13,7 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = kotlin/Int.inc(: kotlin.Int): kotlin.Int valueParameters = [] + callableIdIfNonLocal = kotlin/Int.inc getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol: dispatchReceiver = KtExplicitReceiverValue: expression = m @@ -28,7 +29,9 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.String symbol = k: K1 + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /MyMap.get indexArguments = [ "a" ] @@ -65,10 +68,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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt index a6a9925d68b..81c931f2db5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt @@ -13,6 +13,7 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = kotlin/Int.inc(: kotlin.Int): kotlin.Int valueParameters = [] + callableIdIfNonLocal = kotlin/Int.inc partiallyAppliedSymbol = KtPartiallyAppliedSymbol: dispatchReceiver = null extensionReceiver = null @@ -21,3 +22,4 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int + callableIdIfNonLocal = null diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt index 6ba6557e8f4..a7230ffca9b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt @@ -8,4 +8,5 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int + callableIdIfNonLocal = null simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt index dd14195c128..980c1fcd1c7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt @@ -13,6 +13,7 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = kotlin/Int.inc(: kotlin.Int): kotlin.Int valueParameters = [] + callableIdIfNonLocal = kotlin/Int.inc getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol: dispatchReceiver = KtExplicitReceiverValue: expression = m @@ -28,7 +29,9 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.String symbol = k: K + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /MyMap.get indexArguments = [ "a" ] @@ -46,10 +49,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 - ] \ No newline at end of file + callableIdIfNonLocal = null + ] + callableIdIfNonLocal = /MyMap.set diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt index 40c3e5fbd61..86ae3e92fc0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt index 1bd5fdb7582..247d02364ba 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt @@ -13,6 +13,7 @@ KtSuccessCallInfo: returnType = kotlin.Int symbol = kotlin/Int.inc(: kotlin.Int): kotlin.Int valueParameters = [] + callableIdIfNonLocal = kotlin/Int.inc getPartiallyAppliedSymbol = KtPartiallyAppliedSymbol: dispatchReceiver = KtExplicitReceiverValue: expression = m @@ -28,7 +29,9 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.String symbol = k: K1 + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /MyMap.get indexArguments = [ "a" ] @@ -65,10 +68,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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt index eaa0347eba8..7a62a790a81 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.descriptors.txt @@ -12,6 +12,7 @@ KtErrorCallInfo: returnType = kotlin.Unit symbol = /A.foo(: A): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /A.foo argumentMapping = {} ] diagnostic = ERROR \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt index ff6aeeabfe1..9121bed6059 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/privateMember.txt @@ -12,6 +12,7 @@ KtErrorCallInfo: returnType = kotlin.Unit symbol = /A.foo(: A): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /A.foo argumentMapping = {} ] diagnostic = ERROR diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt index 7989e23bf03..d6f2c56201f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt @@ -10,4 +10,5 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Function0 symbol = val f: kotlin.Function0 + callableIdIfNonLocal = /A.f simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt index 8bbf398ebd7..bdbe882463a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt index c3ede5f588b..bd1988d9ba0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt @@ -14,11 +14,14 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Function2, ft, kotlin.Int> symbol = function: kotlin.Function2, ft, 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> - symbol = function: kotlin.Function2, ft, kotlin.Int>) - } + symbol = function: kotlin.Function2, ft, kotlin.Int> + callableIdIfNonLocal = null) + } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt index f545b352f7f..ec0987c4448 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt @@ -14,11 +14,14 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Function2, ft, kotlin.Int> symbol = function: kotlin.Function2, ft, 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> - symbol = function: kotlin.Function2, ft, kotlin.Int>) + symbol = function: kotlin.Function2, ft, kotlin.Int> + callableIdIfNonLocal = null) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt index 18e5ac15641..658063d25ab 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.descriptors.txt @@ -10,6 +10,7 @@ KtErrorCallInfo: returnType = kotlin.Unit symbol = /foo(): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /foo argumentMapping = {} ] diagnostic = ERROR \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt index 58a31ff70ae..d8ea8a1dbdc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt @@ -10,6 +10,7 @@ KtErrorCallInfo: returnType = kotlin.Unit symbol = /foo(): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /foo argumentMapping = {} ] - diagnostic = ERROR \ No newline at end of file + diagnostic = ERROR diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt index 605f9a2aec2..b6d51e8e24d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt @@ -12,4 +12,5 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Int symbol = val length: kotlin.Int + callableIdIfNonLocal = kotlin/String.length simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt index 1f9212e4820..801e8178978 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitExtensionReceiver.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = /foo(: kotlin.String): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /foo argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt index 1867efeb4ef..9d7b341081c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt @@ -13,4 +13,5 @@ KtSuccessCallInfo: receiverType = null returnType = kotlin.Int symbol = val length: kotlin.Int + callableIdIfNonLocal = kotlin/String.length simpleAccess = Read: diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt index a4062f4530b..de736112e9e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitExtensionReceiver.txt @@ -14,4 +14,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = /foo(: kotlin.String): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /foo argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt index 6120ca0fd4b..f17bd247292 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt index 8d3e84b6922..02e2523fd95 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionLikeCall.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.String symbol = /invoke(: kotlin.Int): kotlin.String valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /invoke + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt index a8656e9d50b..12d90212c71 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt @@ -15,22 +15,27 @@ KtSuccessCallInfo: 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) - } \ No newline at end of file + symbol = p2: P2 + callableIdIfNonLocal = null) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt index a8a63678d5f..12d90212c71 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt @@ -15,22 +15,27 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt index c593f18905c..556504e3baf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt @@ -15,22 +15,27 @@ KtSuccessCallInfo: 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) } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt index a8a63678d5f..12d90212c71 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt @@ -15,22 +15,27 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt index 6e31e0b3ae9..70fea2721d8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: receiverType = null returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int symbol = p1: P1 + callableIdIfNonLocal = null ] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = { 1 -> (KtVariableLikeSignature: name = first receiverType = null returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int - symbol = p1: P1) - } + symbol = p1: P1 + callableIdIfNonLocal = null) + } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt index 1bc75b818ca..801ae7bedce 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: receiverType = null returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int symbol = p1: P1 + callableIdIfNonLocal = null ] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = { 1 -> (KtVariableLikeSignature: name = first receiverType = null returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int - symbol = p1: P1) + symbol = p1: P1 + callableIdIfNonLocal = null) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt index 6870fe1928c..bd5ab8d1028 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt index 1568f1d86d0..afd0d55f4e8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt @@ -13,22 +13,27 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt index 28fbf9c7648..59f83f6fd97 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt @@ -15,22 +15,27 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt index c1388aa229f..a0004587fa5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt index a99ba3db83f..a4a0fa2091f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_dispatchReceiver.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /invoke + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt index a99ba3db83f..a4a0fa2091f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithInvokeFunctionCall_extensionReceiver.txt @@ -11,4 +11,5 @@ KtSuccessCallInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] - argumentMapping = {} \ No newline at end of file + callableIdIfNonLocal = /invoke + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt index 074ee48e27b..d96e1b0b2bf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: 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) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt index b7affcd0c98..33243237984 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/customSerlializable.txt @@ -16,11 +16,14 @@ KtSuccessCallInfo: receiverType = null returnType = test.FirstTarget symbol = x: test.FirstTarget + callableIdIfNonLocal = null ] + callableIdIfNonLocal = test/Serializer.serializeFirstTarget argumentMapping = { target -> (KtVariableLikeSignature: name = x receiverType = null returnType = test.FirstTarget - symbol = x: test.FirstTarget) - } \ No newline at end of file + symbol = x: test.FirstTarget + callableIdIfNonLocal = null) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt index ff305d0315d..b32698eae21 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/withTestCompilerPluginEnabled/dummyFunction.txt @@ -14,11 +14,14 @@ KtSuccessCallInfo: receiverType = null returnType = test.Test symbol = value: test.Test + callableIdIfNonLocal = null ] + callableIdIfNonLocal = test/dummyTest argumentMapping = { Test() -> (KtVariableLikeSignature: name = value receiverType = null returnType = test.Test - symbol = value: test.Test) + symbol = value: test.Test + callableIdIfNonLocal = null) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt index 6f547211827..66c5b04acb6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.descriptors.txt @@ -15,13 +15,16 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -42,13 +45,16 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -69,12 +75,15 @@ KtInapplicableCallCandidateInfo: 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) } - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt index 8bff9349aec..14f2f90b704 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt @@ -15,13 +15,16 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -42,13 +45,16 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -69,12 +75,15 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt index 77ad58d330d..6d0d190e94e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousImplicitInvoke.txt @@ -17,7 +17,9 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.String symbol = a: kotlin.String + callableIdIfNonLocal = null ] + callableIdIfNonLocal = null argumentMapping = {} isInBestCandidates = true @@ -40,7 +42,9 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Boolean symbol = b: kotlin.Boolean + callableIdIfNonLocal = null ] + callableIdIfNonLocal = null argumentMapping = {} isInBestCandidates = true @@ -61,6 +65,8 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Char symbol = c: kotlin.Char + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /x argumentMapping = {} isInBestCandidates = false diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt index e39863b9689..608c805faf3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithExplicitTypeParameters.txt @@ -14,19 +14,23 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -46,19 +50,23 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -78,18 +86,22 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt index e39863b9689..c3758ff4f68 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.descriptors.txt @@ -14,19 +14,23 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -46,19 +50,23 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -78,18 +86,22 @@ KtInapplicableCallCandidateInfo: 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) } - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt index 78058a8ca15..458b6e2760d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguousWithInferredTypeParameters.txt @@ -14,19 +14,23 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -46,19 +50,23 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true @@ -78,18 +86,22 @@ KtInapplicableCallCandidateInfo: 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) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt index 4397c145f3e..67d861f819f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.descriptors.txt @@ -17,13 +17,16 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /invoke argumentMapping = { true -> (KtVariableLikeSignature: name = i receiverType = null returnType = kotlin.Int - symbol = i: kotlin.Int) + symbol = i: kotlin.Int + callableIdIfNonLocal = null) } isInBestCandidates = false @@ -44,13 +47,16 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Char symbol = c: kotlin.Char + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /x argumentMapping = { true -> (KtVariableLikeSignature: name = c receiverType = null returnType = kotlin.Char - symbol = c: kotlin.Char) + symbol = c: kotlin.Char + callableIdIfNonLocal = null) } isInBestCandidates = false @@ -70,12 +76,15 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.Boolean symbol = b: kotlin.Boolean + callableIdIfNonLocal = null ] + callableIdIfNonLocal = null argumentMapping = { true -> (KtVariableLikeSignature: name = b receiverType = null returnType = kotlin.Boolean - symbol = b: kotlin.Boolean) + symbol = b: kotlin.Boolean + callableIdIfNonLocal = null) } - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt index 1524eda9096..0a0316ab79a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt @@ -17,13 +17,16 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /invoke argumentMapping = { true -> (KtVariableLikeSignature: name = i receiverType = null returnType = kotlin.Int - symbol = i: kotlin.Int) + symbol = i: kotlin.Int + callableIdIfNonLocal = null) } isInBestCandidates = false @@ -44,13 +47,16 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Char symbol = c: kotlin.Char + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /x argumentMapping = { true -> (KtVariableLikeSignature: name = c receiverType = null returnType = kotlin.Char - symbol = c: kotlin.Char) + symbol = c: kotlin.Char + callableIdIfNonLocal = null) } isInBestCandidates = false @@ -70,12 +76,15 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.Boolean symbol = b: kotlin.Boolean + callableIdIfNonLocal = null ] + callableIdIfNonLocal = null argumentMapping = { true -> (KtVariableLikeSignature: name = b receiverType = null returnType = kotlin.Boolean - symbol = b: kotlin.Boolean) + symbol = b: kotlin.Boolean + callableIdIfNonLocal = null) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt index 45e1142dbb9..80ee143c1c8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.descriptors.txt @@ -17,13 +17,16 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Boolean symbol = b: kotlin.Boolean + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /A.x argumentMapping = { 1 -> (KtVariableLikeSignature: name = b receiverType = null returnType = kotlin.Boolean - symbol = b: kotlin.Boolean) + symbol = b: kotlin.Boolean + callableIdIfNonLocal = null) } isInBestCandidates = false @@ -45,12 +48,15 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /invoke argumentMapping = { 1 -> (KtVariableLikeSignature: name = i receiverType = null returnType = kotlin.Int - symbol = i: kotlin.Int) + symbol = i: kotlin.Int + callableIdIfNonLocal = null) } - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt index 2d5c5e683ed..8f24bbf4d80 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt @@ -17,13 +17,16 @@ KtInapplicableCallCandidateInfo: receiverType = null returnType = kotlin.Boolean symbol = b: kotlin.Boolean + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /A.x argumentMapping = { 1 -> (KtVariableLikeSignature: name = b receiverType = null returnType = kotlin.Boolean - symbol = b: kotlin.Boolean) + symbol = b: kotlin.Boolean + callableIdIfNonLocal = null) } isInBestCandidates = false @@ -45,12 +48,15 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int + callableIdIfNonLocal = null ] + callableIdIfNonLocal = /invoke argumentMapping = { 1 -> (KtVariableLikeSignature: name = i receiverType = null returnType = kotlin.Int - symbol = i: kotlin.Int) + symbol = i: kotlin.Int + callableIdIfNonLocal = null) } - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt index 11f40ed48f9..bf84fd7e1f6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/arrayOfInAnnotation.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt index 2e05101534c..d431ca7642e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.descriptors.txt @@ -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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt index fe7c239a882..7ebefbbcdcc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/builderInference.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt index bb046b1cce4..3906ed8c858 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/comparisonCall.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt index 508208c388c..9612fd46d5f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.descriptors.txt @@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -28,6 +29,7 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true @@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} - isInBestCandidates = false + isInBestCandidates = false \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt index 7e078d5609e..aeb6ba602fe 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke1.txt @@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -28,6 +29,7 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true @@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt index e0eb7191fc3..a37783d57b7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.descriptors.txt @@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -29,6 +30,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -45,5 +47,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt index 99b4a201be6..623c343e86a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke2.txt @@ -12,6 +12,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -29,6 +30,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -45,5 +47,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt index 7699c9b82be..d4c7026fcc4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.descriptors.txt @@ -11,6 +11,7 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true @@ -28,6 +29,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} - isInBestCandidates = false + isInBestCandidates = false \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt index 8177727d061..da9be11798f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/consecutiveImplicitInvoke3.txt @@ -11,6 +11,7 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Double): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true @@ -28,6 +29,7 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Long symbol = /invoke(: kotlin.Int): kotlin.Long valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false @@ -45,5 +47,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Double symbol = /invoke(: kotlin.Long): kotlin.Double valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = false diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt index 6c7f2457de1..6fc714fae6c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromAny.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt index 0f624e25f56..9448b7bff0f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_fromSuperType.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt index 3a574b99e15..5da06857ed2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/eqEqCall_overridden.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt index b3393c186e7..206c70a711d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallInTheSameFile.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt index 9fe8144c746..36df0fb07eb 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithExtensionReceiverAndTypeArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt index d9f2cbe8120..da97c1e1453 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithLambdaArgument.txt +++ b/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 symbol = b: kotlin.Function1 + 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 - symbol = b: kotlin.Function1) + symbol = b: kotlin.Function1 + callableIdIfNonLocal = null) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt index c434d35f8a1..b64d7e94176 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNamedArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt index d9f2cbe8120..da97c1e1453 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithNonTrailingLambdaArgument.txt +++ b/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 symbol = b: kotlin.Function1 + 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 - symbol = b: kotlin.Function1) + symbol = b: kotlin.Function1 + callableIdIfNonLocal = null) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt index 7570e9ad6ec..e0e1077d351 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithSpreadArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt index c191f3537a0..71079d465a0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithTypeArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt index 2727057f9e5..f0d30c3dfec 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionCallWithVarargArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt index 58f16cead16..5aa69288f0e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.descriptors.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = {} - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt index 094f9e8b248..0d6e99277e8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_dispatchReceiver.txt @@ -18,6 +18,8 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.String symbol = p1: P1 + callableIdIfNonLocal = null ] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt index 58f16cead16..5aa69288f0e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.descriptors.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = kotlin/Function1.invoke(: P1: kotlin.Function1): R valueParameters = [] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = {} - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt index 094f9e8b248..0d6e99277e8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionTypeVariableCall_extensionReceiver.txt @@ -18,6 +18,8 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.String symbol = p1: P1 + callableIdIfNonLocal = null ] + callableIdIfNonLocal = kotlin/Function1.invoke argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt index 6bb839c79b7..e26eb631737 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverCall.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt index 0ccb51cc92a..79c72541bfa 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/functionWithReceiverSafeCall.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt index 5e39e4587aa..4cafd51c42a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/hiddenConstructor.txt @@ -10,5 +10,6 @@ KtInapplicableCallCandidateInfo: returnType = Obj symbol = (): Obj valueParameters = [] + callableIdIfNonLocal = null argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt index 60cc0e99b72..ae5a4e18230 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstructorDelegationCall.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt index d9d80cc423f..bcc08311da1 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitConstuctorCall.txt @@ -9,5 +9,6 @@ KtApplicableCallCandidateInfo: returnType = A symbol = (): A valueParameters = [] + callableIdIfNonLocal = null argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt index d9d80cc423f..bcc08311da1 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/implicitJavaConstuctorCall.txt @@ -9,5 +9,6 @@ KtApplicableCallCandidateInfo: returnType = A symbol = (): A valueParameters = [] + callableIdIfNonLocal = null argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt index 71417ca41c8..5ff38032c97 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGet.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt index ebf95b732ba..e1d4e2c09a2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithNotEnoughArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt index 0fa15b2dd8e..153d4107092 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.descriptors.txt @@ -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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt index 362cc14bc55..a2638c19dd5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt index aaed1f4798c..c05de0f2190 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSet.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt index c52306bfc7f..af22a0eacb2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithNotEnoughArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt index 54379f65e86..40d186f1378 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.descriptors.txt @@ -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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt index 4edabb987e6..b9f064c4f75 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt index 131302f722b..a65c8e772ff 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/intArrayOfInAnnotation.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt index 9ce02b4307c..5628b1c8b64 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/javaFunctionCall.txt @@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /JavaClass.javaMethod(: JavaClass): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /JavaClass.javaMethod argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt index d7c923389cb..5e405071e7e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/memberFunctionCallWithTypeArgument.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt index d35e81ddeda..42c42da93c8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.descriptors.txt @@ -12,5 +12,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /A.foo(: A): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /A.foo argumentMapping = {} - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt index 1dea7f18aa4..145a6e70f0b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/privateMember.txt @@ -12,5 +12,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /A.foo(: A): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /A.foo argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt index 3e900a27334..1952df0cd6d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/resolveCallInSuperConstructorParam.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt index 64f30ed816d..cb91aaade4b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt @@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.Function2, ft, kotlin.Int> symbol = function: kotlin.Function2, ft, 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> - symbol = function: kotlin.Function2, ft, kotlin.Int>) + symbol = function: kotlin.Function2, ft, kotlin.Int> + callableIdIfNonLocal = null) } - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt index 8e875389d01..7592fc90ec1 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt @@ -14,12 +14,15 @@ KtApplicableCallCandidateInfo: receiverType = null returnType = kotlin.Function2, ft, kotlin.Int> symbol = function: kotlin.Function2, ft, 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> - symbol = function: kotlin.Function2, ft, kotlin.Int>) + symbol = function: kotlin.Function2, ft, kotlin.Int> + callableIdIfNonLocal = null) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt index b6b278a0f09..fdbc3945619 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.descriptors.txt @@ -10,5 +10,6 @@ KtInapplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /foo(): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /foo argumentMapping = {} - isInBestCandidates = true + isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt index 0dc82b6ad61..1fe8e870085 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt index c51edbc36c2..a154067a41d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/smartCastExplicitExtensionReceiver.txt @@ -13,5 +13,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /foo(: kotlin.String): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /foo argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt index 35bbda1ceb6..7a87dff06a1 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunction.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt index 0326c474449..7d8d9b338b0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionLikeCall.txt @@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.String symbol = /invoke(: kotlin.Int): kotlin.String valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt index 6aeeed5d51b..a5a7b55ad3b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterName.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt index 6aeeed5d51b..a5a7b55ad3b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotation.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt index 6a5793da0d0..01fc9ae57f5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt @@ -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 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt index 6aeeed5d51b..a5a7b55ad3b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameAnnotationConflict.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt index 13a4ecb4b7e..e89c9f31007 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameGeneric.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt index e79d7777227..6909cdbefa0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameInNonFunctionType.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt index cd4a15ecbf7..ba706a8c66c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableAsFunctionWithParameterNameMixed.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt index 423bd243953..cfffa5ef693 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithExtensionInvoke.txt +++ b/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 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt index e9a520e5cb1..b20e3ceb8ed 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_dispatchReceiver.txt @@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt index e9a520e5cb1..b20e3ceb8ed 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithInvokeFunctionCall_extensionReceiver.txt @@ -11,5 +11,6 @@ KtApplicableCallCandidateInfo: returnType = kotlin.Unit symbol = /invoke(: kotlin.Int): kotlin.Unit valueParameters = [] + callableIdIfNonLocal = /invoke argumentMapping = {} isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt index 197cabb65e6..7b3778f65fe 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/variableWithMemberInvoke.txt +++ b/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