diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt index 1725f5d33de..db52258884d 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt @@ -389,7 +389,11 @@ internal class KtFe10CallResolver( this is PropertyDescriptor && kind == CallableMemberDescriptor.Kind.SYNTHESIZED private fun ResolvedCall<*>.createArgumentMapping(signature: KtFunctionLikeSignature<*>): LinkedHashMap> { - val parameterSignatureByName = signature.valueParameters.associateBy { it.symbol.name } + val parameterSignatureByName = signature.valueParameters.associateBy { + // ResolvedCall.valueArguments have their names affected by the `@ParameterName` annotations, + // so we use `name` instead of `symbol.name` + it.name + } val result = LinkedHashMap>() for ((parameter, arguments) in valueArguments) { val parameterSymbol = KtFe10DescValueParameterSymbol(parameter, analysisContext) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java index d9e56f2b76e..f78a48f1703 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/fir/Fe10ResolveCallTestGenerated.java @@ -736,6 +736,12 @@ public class Fe10ResolveCallTestGenerated extends AbstractResolveCallTest { runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.kt"); } + @Test + @TestMetadata("variableAsFunctionWithParameterNameAnnotationConflict2.kt") + public void testVariableAsFunctionWithParameterNameAnnotationConflict2() throws Exception { + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.kt"); + } + @Test @TestMetadata("variableAsFunctionWithParameterNameGeneric.kt") public void testVariableAsFunctionWithParameterNameGeneric() throws Exception { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt index 20c07e98385..18e421dfc4d 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt @@ -734,10 +734,14 @@ internal class KtFirCallResolver( private fun Iterable>?.createArgumentMapping( signatureOfCallee: KtFunctionLikeSignature<*> ): LinkedHashMap> { - val paramSignatureByName = signatureOfCallee.valueParameters.associateBy { it.symbol.name } + val paramSignatureByName = signatureOfCallee.valueParameters.associateBy { + // We intentionally use `symbol.name` instead of `name` here, since + // `FirValueParameter.name` is not affected by the `@ParameterName` + it.symbol.name + } val ktArgumentMapping = LinkedHashMap>() this?.forEach { (firExpression, firValueParameter) -> - val parameterSymbol = paramSignatureByName[firValueParameter.symbol.name] ?: return@forEach + val parameterSymbol = paramSignatureByName[firValueParameter.name] ?: return@forEach mapArgumentExpressionToParameter(firExpression, parameterSymbol, ktArgumentMapping) } return ktArgumentMapping diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt index 2144c51b6be..4102ebc1e21 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirValueParameterSymbol.kt @@ -44,7 +44,7 @@ internal class KtFirValueParameterSymbol( ) : KtValueParameterSymbol(), KtFirSymbol { override val psi: PsiElement? by cached { firSymbol.findPsi() } - override val name: Name by cached { firSymbol.getNameByAnnotation(resolveState) } + override val name: Name get() = withValidityAssertion { firSymbol.name } override val isVararg: Boolean get() = withValidityAssertion { firSymbol.isVararg } @@ -72,36 +72,3 @@ internal class KtFirValueParameterSymbol( override fun equals(other: Any?): Boolean = symbolEquals(other) override fun hashCode(): Int = symbolHashCode() } - - -private fun FirValueParameterSymbol.getNameByAnnotation(resolveState: FirModuleResolveState): Name { - val defaultName = fir.name - if (fir.psi != null) return defaultName - - // The case where PSI is null is when calling `invoke()` on a variable with functional type, e.g. `x(1)` below: - // - // fun foo(x: (item: Int) -> Unit) { x(1) } - // fun bar(x: Function1<@ParameterName("item") Int, Unit>) { x(1) } - // - // The function being called is `invoke(p1: Int)` on `Function1` which is from the stdlib, and therefore no source - // PSI for the function or its parameters. In that case, we use the `@ParameterName` annotation on the parameter type if present - // and fall back to the parameter names from the `invoke()` function (`p1`, `p2`, etc.). - // - // Note: During type resolution, `@ParameterName` type annotations are added based on the names (which are optional) in the - // function type notation. Therefore the `x` parameter in both example functions above have the same type and type annotations. - val parameterNameAnnotation = - resolvedReturnType.attributes.customAnnotations - .getAnnotationsByClassId(StandardNames.FqNames.parameterNameClassId) - .singleOrNull()?.safeAs() ?: return defaultName - - // The parent KtDeclaration is where the variable with functional type and `@ParameterName` annotation is declared. - val parentKtDeclaration = - parameterNameAnnotation.psi?.getNonStrictParentOfType() ?: return defaultName - val parentFirDeclaration = parentKtDeclaration.getOrBuildFirOfType(resolveState) - - // Resolve to ARGUMENTS_OF_ANNOTATIONS phase to get `name` argument from mapping. - parentFirDeclaration.ensureResolved(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) - val nameArgument = parameterNameAnnotation.argumentMapping.mapping[StandardClassIds.Annotations.ParameterNames.parameterNameName] - val parameterNameFromAnnotation = nameArgument?.unwrapArgument()?.safeAs>()?.value as? String - return parameterNameFromAnnotation?.let { Name.identifier(it) } ?: defaultName -} \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java index 757d83dc216..ce38c92df80 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/fir/FirResolveCallTestGenerated.java @@ -736,6 +736,12 @@ public class FirResolveCallTestGenerated extends AbstractResolveCallTest { runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.kt"); } + @Test + @TestMetadata("variableAsFunctionWithParameterNameAnnotationConflict2.kt") + public void testVariableAsFunctionWithParameterNameAnnotationConflict2() throws Exception { + runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.kt"); + } + @Test @TestMetadata("variableAsFunctionWithParameterNameGeneric.kt") public void testVariableAsFunctionWithParameterNameGeneric() throws Exception { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt index 3e8eb10db23..2da19f4f1e2 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer.render import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.types.KtType +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices @@ -115,6 +116,7 @@ private fun KtAnalysisSession.stringRepresentation(call: KtCallInfo): String { is KtDiagnostic -> "$severity<$factoryName: $defaultMessage>" is KtType -> render() is Enum<*> -> name + is Name -> asString() else -> buildString { val clazz = this@stringValue::class append(clazz.simpleName!!) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSignature.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSignature.kt index 2c582b67271..87336f4f462 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSignature.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtSignature.kt @@ -6,10 +6,17 @@ package org.jetbrains.kotlin.analysis.api.symbols import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationApplication +import org.jetbrains.kotlin.analysis.api.annotations.KtConstantAnnotationValue +import org.jetbrains.kotlin.analysis.api.annotations.annotationsByClassId import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.withValidityAssertion +import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.StandardClassIds +import org.jetbrains.kotlin.utils.addToStdlib.runIf /** * A signature for a callable symbol. Comparing to a `KtCallableSymbol`, a signature can carry use-site type information. For example @@ -83,6 +90,63 @@ public data class KtVariableLikeSignature( get() = withValidityAssertion { _returnType } override val receiverType: KtType? get() = withValidityAssertion { _receiverType } + + /** + * A name of the variable with respect to the `@ParameterName` annotation. Can be different from the [KtVariableLikeSymbol.name]. + * + * Some variables can have their names changed by special annotations like `@ParameterName(name = "newName")`. This is used to preserve + * the names of the lambda parameters in the situations like this: + * + * ``` + * // compiled library + * fun foo(): (bar: String) -> Unit { ... } + * + * // source code + * fun test() { + * val action = foo() + * action("") // this call + * } + * ``` + * + * Unfortunately, [symbol] for the `action("")` call will be pointing to the `Function1.invoke(p1: P1): R`, because we + * intentionally unwrap use-site substitution overrides. Because of this, `symbol.name` will yield `"p1"`, and not `"bar"`. + * + * To overcome this problem, [name] property is introduced: it allows to get the intended name of the parameter, + * with respect to `@ParameterName` annotation. + * + * @see org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder.unwrapUseSiteSubstitutionOverride + */ + val name: Name + get() = withValidityAssertion { + // The case where PSI is null is when calling `invoke()` on a variable with functional type, e.g. `x(1)` below: + // + // fun foo(x: (item: Int) -> Unit) { x(1) } + // fun bar(x: Function1<@ParameterName("item") Int, Unit>) { x(1) } + val nameCanBeDeclaredInAnnotation = _symbol.psi == null + + runIf(nameCanBeDeclaredInAnnotation) { getValueFromParameterNameAnnotation() } ?: _symbol.name + } + + private fun getValueFromParameterNameAnnotation(): Name? { + val resultingAnnotation = findParameterNameAnnotation() ?: return null + val parameterNameArgument = resultingAnnotation.arguments + .singleOrNull { it.name == StandardClassIds.Annotations.ParameterNames.parameterNameName } + + val constantArgumentValue = parameterNameArgument?.expression as? KtConstantAnnotationValue ?: return null + + return (constantArgumentValue.constantValue.value as? String)?.let(Name::identifier) + } + + private fun findParameterNameAnnotation(): KtAnnotationApplication? { + val allParameterNameAnnotations = returnType.annotationsByClassId(StandardNames.FqNames.parameterNameClassId) + val (explicitAnnotations, implicitAnnotations) = allParameterNameAnnotations.partition { it.psi != null } + + return if (explicitAnnotations.isNotEmpty()) { + explicitAnnotations.first() + } else { + implicitAnnotations.singleOrNull() + } + } } public fun S.toSignature(substitutor: KtSubstitutor = KtSubstitutor.Empty(token)): KtSignature { diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt index 7f7861789e4..7c727bc088c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationEntry.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (value: Annotation): AnnotationInner valueParameters = [ KtVariableLikeSignature: + name = value receiverType = null returnType = Annotation symbol = value: Annotation ] argumentMapping = { Annotation("v1", "v2") -> (KtVariableLikeSignature: + name = value receiverType = null returnType = Annotation symbol = value: Annotation) - } \ No newline at end of file + } 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 fdba39092d0..20a78f613b4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_arrayOf.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = (vararg strings: kotlin.String): Annotation valueParameters = [ KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String ] argumentMapping = { arrayOf("v1", "v2") -> (KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String) - } \ No newline at end of file + } 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 17ae71d1918..c55d44e2681 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_collectionLiteral.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = (vararg strings: kotlin.String): Annotation valueParameters = [ KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String ] argumentMapping = { ["v1", "v2"] -> (KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String) - } \ No newline at end of file + } 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 90309b7b7cf..ebef6ecea6a 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 @@ -10,17 +10,20 @@ KtSuccessCallInfo: symbol = kotlin/arrayOf(vararg elements: T): kotlin.Array valueParameters = [ KtVariableLikeSignature: + name = elements receiverType = null returnType = Annotation symbol = vararg elements: T ] argumentMapping = { Annotation("v1", "v2") -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = Annotation symbol = vararg elements: T), Annotation(strings = arrayOf("v3", "v4")) -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = Annotation symbol = vararg elements: T) - } \ No newline at end of file + } 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 477d8afa1fd..d7a8b44cd4c 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 @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (vararg annos: Annotation): AnnotationArray valueParameters = [ KtVariableLikeSignature: + name = annos receiverType = null returnType = Annotation symbol = vararg annos: Annotation ] argumentMapping = { [Annotation("v1", "v2"), Annotation(["v3", "v4"])] -> (KtVariableLikeSignature: + name = annos receiverType = null returnType = Annotation symbol = vararg annos: Annotation) - } \ No newline at end of file + } 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 10084cdd360..53271cb8d20 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_noarg.txt @@ -10,8 +10,9 @@ KtSuccessCallInfo: symbol = (vararg strings: kotlin.String): Annotation valueParameters = [ KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String ] - argumentMapping = {} \ No newline at end of file + 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 b06101c6fb5..60ef0212df6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationInAnnotation_vararg.txt @@ -10,17 +10,20 @@ KtSuccessCallInfo: symbol = (vararg strings: kotlin.String): Annotation valueParameters = [ KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String ] argumentMapping = { "v1" -> (KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String), "v2" -> (KtVariableLikeSignature: + name = strings receiverType = null returnType = kotlin.String symbol = vararg strings: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt index ddb4eb2b6e5..d786131de51 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnDelegate.txt @@ -9,8 +9,9 @@ KtSuccessCallInfo: symbol = (vararg names: kotlin.String): kotlin.Suppress valueParameters = [ KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String ] - argumentMapping = {} \ No newline at end of file + 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 1ec11b4cf88..74b02f96aa8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_asT.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (vararg names: kotlin.String): kotlin.Suppress valueParameters = [ KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String ] argumentMapping = { "UNCHECKED_CAST" -> (KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String) - } \ No newline at end of file + } 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 1ec11b4cf88..74b02f96aa8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_destructuring.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (vararg names: kotlin.String): kotlin.Suppress valueParameters = [ KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String ] argumentMapping = { "UNCHECKED_CAST" -> (KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String) - } \ No newline at end of file + } 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 ddb4eb2b6e5..d786131de51 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_if.txt @@ -9,8 +9,9 @@ KtSuccessCallInfo: symbol = (vararg names: kotlin.String): kotlin.Suppress valueParameters = [ KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String ] - argumentMapping = {} \ No newline at end of file + 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 d0c34b9f533..4561ea11c5e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnExpression_whenBranch.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (vararg names: kotlin.String): kotlin.Suppress valueParameters = [ KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String ] argumentMapping = { "DEPRECATION" -> (KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt index b6cf44d4386..e8d0102860f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnFile.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (name: kotlin.String): kotlin.jvm.JvmName valueParameters = [ KtVariableLikeSignature: + name = name receiverType = null returnType = kotlin.String symbol = name: kotlin.String ] argumentMapping = { "Foo" -> (KtVariableLikeSignature: + name = name receiverType = null returnType = kotlin.String symbol = name: kotlin.String) - } \ No newline at end of file + } 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 2278a8ffdc2..be74d922bcf 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/annotationOnParameter_reified.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (vararg names: kotlin.String): kotlin.Suppress valueParameters = [ KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String ] argumentMapping = { "s" -> (KtVariableLikeSignature: + name = names receiverType = null returnType = kotlin.String symbol = vararg names: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt index 30fd5ec2c86..cea6aab2847 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/arrayOfInAnnotation.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = kotlin/arrayOf(vararg elements: T): kotlin.Array valueParameters = [ KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: T ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: T), 2 -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: T), 3 -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: T) - } \ No newline at end of file + } 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 ffda3c50e0f..b49c646397d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.descriptors.txt @@ -13,12 +13,14 @@ KtSuccessCallInfo: symbol = test/Target.add(: test.Target, t: T): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = t receiverType = null returnType = kotlin.String symbol = t: T ] argumentMapping = { s -> (KtVariableLikeSignature: + name = t receiverType = null returnType = kotlin.String symbol = t: T) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt index e954cdd274a..bd7e066c33d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/builderInference.txt @@ -13,13 +13,15 @@ KtSuccessCallInfo: symbol = test/Target.add(: test.Target, t: T): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = t receiverType = null returnType = T symbol = t: T ] argumentMapping = { s -> (KtVariableLikeSignature: + name = t receiverType = null returnType = T symbol = t: T) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt index 8fcc016500b..86676751c50 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/calleeExpressionOfImplicitInvoke.txt @@ -4,6 +4,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = f receiverType = null returnType = kotlin.Function0 symbol = f: kotlin.Function0 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt index feb546af86c..3d8c6b7b381 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/comparisonCall.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = kotlin/Int.compareTo(: kotlin.Int, other: kotlin.Int): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int ] argumentMapping = { j -> (KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt index bf65d9421cb..194c7872936 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /A.plusAssign(: A, i: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int) - } \ No newline at end of file + } 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 583ee80b68a..a139e37fd5d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVal_lhs.txt @@ -4,6 +4,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = l receiverType = null returnType = A symbol = l: A diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt index cf99c2f10c3..350e1863f03 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar.txt @@ -14,6 +14,7 @@ KtSuccessCallInfo: symbol = kotlin/Int.plus(: kotlin.Int, other: kotlin.Int): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int @@ -22,6 +23,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int - symbol = var i: kotlin.Int \ No newline at end of file + symbol = var i: kotlin.Int 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 8ac0368f019..6ba6557e8f4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignOnVar_lhs.txt @@ -4,6 +4,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.descriptors.txt index 6a02d4aad28..51ad3dc010e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.descriptors.txt @@ -14,6 +14,7 @@ KtSuccessCallInfo: symbol = kotlin/Int.plus(: kotlin.Int, other: kotlin.Int): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int @@ -29,6 +30,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K @@ -47,10 +49,12 @@ KtSuccessCallInfo: symbol = /MyMap.set(: MyMap, k: K, v: V): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt index 488f34d4f99..15f26c36493 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention.txt @@ -14,6 +14,7 @@ KtSuccessCallInfo: symbol = kotlin/Int.plus(: kotlin.Int, other: kotlin.Int): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int @@ -29,6 +30,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String @@ -47,11 +49,13 @@ KtSuccessCallInfo: symbol = /MyMap.set(: MyMap, k: kotlin.String, v: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: kotlin.Int - ] \ No newline at end of file + ] diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.descriptors.txt index 153e6958dd8..23f2788cc94 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.descriptors.txt @@ -14,6 +14,7 @@ KtSuccessCallInfo: symbol = kotlin/Int.plus(: kotlin.Int, other: kotlin.Int): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int @@ -29,6 +30,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K1): V1 valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K1 @@ -66,10 +68,12 @@ KtSuccessCallInfo: symbol = /Foo.set(: MyMap, : Foo, k: K2, v: V2): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K2, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V2 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 1282a025c63..3a3e457d470 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_complexReceivers.txt @@ -14,6 +14,7 @@ KtSuccessCallInfo: symbol = kotlin/Int.plus(: kotlin.Int, other: kotlin.Int): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: kotlin.Int @@ -29,6 +30,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String @@ -66,11 +68,13 @@ KtSuccessCallInfo: symbol = /Foo.set(: MyMap, : Foo, k: K2, v: V2): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K2, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V2 - ] \ No newline at end of file + ] diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.descriptors.txt index a1efefad5b2..ddcb304fcef 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.descriptors.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K) 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 ed8cd2531ab..3197a7c3bb8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayAccessConvention_lhs.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt index e03ee8004f3..5b927e73b20 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /A.plusAssign(: A, i: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.descriptors.txt index d63ed9c8fe2..057bf7c95c0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.descriptors.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K) 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 e7b1ad86d4b..5a57f999fb7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/compoundAssignWithArrayGetConvention_lhs.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): A valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String) - } \ No newline at end of file + } 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 2701b397cb1..f6b30aa4778 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/consecutiveImplicitInvoke_callee.txt @@ -4,6 +4,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int 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 fed342ed066..af5abc0b12a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = (p1: kotlin.Int): Base valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int ] argumentMapping = { i + j -> (KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int) - } \ No newline at end of file + } 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 3707e0f9c03..fd4f91b9c61 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 @@ -11,12 +11,14 @@ KtErrorCallInfo: symbol = (p1: kotlin.Int): Base valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int ] argumentMapping = { s -> (KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int) 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 e2a1e4e13ce..455a6087171 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 @@ -11,15 +11,17 @@ KtErrorCallInfo: symbol = (p1: kotlin.Int): Base valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int ] argumentMapping = { s -> (KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int) } ] - diagnostic = ERROR \ No newline at end of file + 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 bbc16e2acf1..742a8978c4e 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = (p1: kotlin.Int): Sub valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int ] argumentMapping = { s.length -> (KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int) - } \ No newline at end of file + } 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 cea8bd1781a..25d5d83d677 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 @@ -11,20 +11,24 @@ KtErrorCallInfo: symbol = (i: kotlin.Int, j: kotlin.Int): Sub valueParameters = [ KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int, KtVariableLikeSignature: + name = j receiverType = null returnType = kotlin.Int symbol = j: kotlin.Int ] argumentMapping = { i -> (KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int), j -> (KtVariableLikeSignature: + name = j receiverType = null returnType = kotlin.Int symbol = j: kotlin.Int) @@ -40,12 +44,14 @@ KtErrorCallInfo: symbol = (p: kotlin.Int): Sub valueParameters = [ KtVariableLikeSignature: + name = p receiverType = null returnType = kotlin.Int symbol = p: kotlin.Int ] argumentMapping = { i -> (KtVariableLikeSignature: + name = p receiverType = null returnType = kotlin.Int symbol = p: kotlin.Int) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt index bb1de31267a..e3a87692e26 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_this_unresolved.txt @@ -11,6 +11,7 @@ KtErrorCallInfo: symbol = (p: kotlin.Int): Sub valueParameters = [ KtVariableLikeSignature: + name = p receiverType = null returnType = kotlin.Int symbol = p: kotlin.Int @@ -27,14 +28,16 @@ KtErrorCallInfo: symbol = (i: kotlin.Int, j: kotlin.Int): Sub valueParameters = [ KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int, KtVariableLikeSignature: + name = j receiverType = null returnType = kotlin.Int symbol = j: kotlin.Int ] argumentMapping = {} ] - diagnostic = ERROR \ No newline at end of file + 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 fa71c4a2110..f69f6c33037 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/enumAsAnnotationValue.txt @@ -9,13 +9,15 @@ KtSuccessCallInfo: symbol = (color: Color): Annotation valueParameters = [ KtVariableLikeSignature: + name = color receiverType = null returnType = Color symbol = color: Color ] argumentMapping = { Color.R -> (KtVariableLikeSignature: + name = color receiverType = null returnType = Color symbol = color: Color) - } \ No newline at end of file + } 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 fd77894f73b..df54910c4aa 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromAny.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = kotlin/Any.equals(: kotlin.Any, other: kotlin.Any?): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Any? symbol = other: kotlin.Any? ] argumentMapping = { b2 -> (KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Any? symbol = other: kotlin.Any?) 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 21882283394..997c5e2da33 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_fromSuperType.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /A.equals(: A, other: kotlin.Any?): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Any? symbol = other: kotlin.Any? ] argumentMapping = { b2 -> (KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Any? symbol = other: kotlin.Any?) - } \ No newline at end of file + } 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 101a50c1dff..0ef806aba1d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/eqEqCall_overridden.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /A.equals(: A, other: kotlin.Any?): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Any? symbol = other: kotlin.Any? ] argumentMapping = { a2 -> (KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Any? symbol = other: kotlin.Any?) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt index a6695840943..e0beb315d70 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallInTheSameFile.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = /function(a: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt index fd4e692d83b..21828b82cb5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithExtensionReceiverAndTypeArgument.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /function(: A, a: B): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: B ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: B) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt index 58cb4252761..98a6e6107ee 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithLambdaArgument.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = /function(a: kotlin.Int, b: kotlin.Function1): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.Function1 symbol = b: kotlin.Function1 ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), { s -> true } -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.Function1 symbol = b: kotlin.Function1) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt index 42c7e90a377..0f8a4470c86 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNamedArgument.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = /function(a: kotlin.Int, b: kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String ] argumentMapping = { "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String), 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt index 58cb4252761..98a6e6107ee 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithNonTrailingLambdaArgument.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = /function(a: kotlin.Int, b: kotlin.Function1): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.Function1 symbol = b: kotlin.Function1 ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), { s -> true } -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.Function1 symbol = b: kotlin.Function1) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt index 775d535335c..1283e49e6e2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithSpreadArgument.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = /function(vararg a: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = vararg a: kotlin.Int ] argumentMapping = { args -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = vararg a: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt index 1e9ff2d7a0f..1715ccc8b49 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithTypeArgument.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = /function(a: A, b: B): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: A, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: B ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: A), "" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: B) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt index 53a1755e72a..0430e8008b9 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionCallWithVarargArgument.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = /function(vararg a: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = vararg a: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = vararg a: kotlin.Int), 2 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = vararg a: kotlin.Int), 3 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = vararg a: kotlin.Int) - } \ 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 e4ce17875b1..e057691ffae 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_dispatchReceiver.txt @@ -14,8 +14,9 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: kotlin.Function1, p1: kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.String symbol = p1: kotlin.String ] - argumentMapping = {} \ No newline at end of file + argumentMapping = {} 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 e4ce17875b1..e057691ffae 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionTypeVariableCall_extensionReceiver.txt @@ -14,8 +14,9 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: kotlin.Function1, p1: kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.String symbol = p1: kotlin.String ] - argumentMapping = {} \ No newline at end of file + argumentMapping = {} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt index e46ff4d44f0..59acf142756 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverCall.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /function(: kotlin.String, a: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt index ce6f1fa6609..edc940e1382 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/functionWithReceiverSafeCall.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /function(: kotlin.String, a: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt index db0f00e2c2b..a1ad877c0a8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/implicitConstructorDelegationCall.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = (i: kotlin.Int): A valueParameters = [ KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int ] argumentMapping = { 42 -> (KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = i: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt index 9552e772e20..e93b4bd1a66 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGet.txt @@ -12,21 +12,25 @@ KtSuccessCallInfo: symbol = /C.get(: C, a: kotlin.Int, b: kotlin.String): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt index a854aa81c8c..6ea774bd9d8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithNotEnoughArgs.txt @@ -13,19 +13,22 @@ KtErrorCallInfo: symbol = /C.get(: C, a: kotlin.Int, b: kotlin.String): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int) } ] - diagnostic = ERROR \ No newline at end of file + 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 924bfa4a302..5413c67d5f3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.descriptors.txt @@ -13,20 +13,24 @@ KtErrorCallInfo: symbol = /C.get(: C, a: kotlin.Int, b: kotlin.String): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt index 0d07d0f1ba6..bf2a8909170 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt @@ -13,23 +13,27 @@ KtErrorCallInfo: symbol = /C.get(: C, a: kotlin.Int, b: kotlin.String): kotlin.Boolean valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String) } ] - diagnostic = ERROR \ No newline at end of file + 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 f821de58184..7f549521842 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSet.txt @@ -12,29 +12,35 @@ KtSuccessCallInfo: symbol = /C.set(: C, a: kotlin.Int, b: kotlin.String, value: kotlin.Boolean): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String, KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String), false -> (KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt index c794d7db761..1946907b8a3 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithNotEnoughArgs.txt @@ -13,27 +13,32 @@ KtErrorCallInfo: symbol = /C.set(: C, a: kotlin.Int, b: kotlin.String, value: kotlin.Boolean): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String, KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), false -> (KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean) } ] - diagnostic = ERROR \ No newline at end of file + 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 01e8bb813dd..4b8fff95ee5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.descriptors.txt @@ -13,28 +13,34 @@ KtErrorCallInfo: symbol = /C.set(: C, a: kotlin.Int, b: kotlin.String, value: kotlin.Boolean): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String, KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String), 3.14 -> (KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt index a16d635ab20..6e3e940a16b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt @@ -13,31 +13,37 @@ KtErrorCallInfo: symbol = /C.set(: C, a: kotlin.Int, b: kotlin.String, value: kotlin.Boolean): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String, KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = a receiverType = null returnType = kotlin.Int symbol = a: kotlin.Int), "foo" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = kotlin.String symbol = b: kotlin.String), false -> (KtVariableLikeSignature: + name = value receiverType = null returnType = kotlin.Boolean symbol = value: kotlin.Boolean) } ] - diagnostic = ERROR \ No newline at end of file + 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 45a3acb85fa..89a884449b4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/intArrayOfInAnnotation.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = kotlin/intArrayOf(vararg elements: kotlin.Int): kotlin.IntArray valueParameters = [ KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: kotlin.Int), 2 -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: kotlin.Int), 3 -> (KtVariableLikeSignature: + name = elements receiverType = null returnType = kotlin.Int symbol = vararg elements: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt index 0ed3051a953..80dc07dd617 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter.txt @@ -6,6 +6,7 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = val foo: kotlin.Int 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 dfde07cea1e..6fb17584935 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyGetter_unqualified.txt @@ -7,6 +7,7 @@ KtSuccessCallInfo: type: JavaClass extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = val foo: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt index 237627db6a9..5d394032ea6 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt @@ -6,6 +6,7 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = sub receiverType = null returnType = ft symbol = val sub: ft diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt index 398a31ee073..1b0485515c2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter.txt @@ -6,8 +6,9 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = var foo: kotlin.Int simpleAccess = Write: - value = 42 \ No newline at end of file + value = 42 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt index 5029e8e6c6f..0ec6487d4ef 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetterIncomplete.txt @@ -6,8 +6,9 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = var foo: kotlin.Int simpleAccess = Write: - value = null \ No newline at end of file + value = null 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 f6db6a816c0..82761b60bc8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertySetter_unqualified.txt @@ -7,8 +7,9 @@ KtSuccessCallInfo: type: JavaClass extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = var foo: kotlin.Int simpleAccess = Write: - value = 42 \ No newline at end of file + value = 42 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt index 590a703c0ba..80a305eb46c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter.txt @@ -6,6 +6,7 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = val foo: kotlin.Int 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 c8d33cdf20f..beef17521a7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyGetter_unqualified.txt @@ -7,6 +7,7 @@ KtSuccessCallInfo: type: A extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = val i: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt index 78e758e060f..b1bbd83c95b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertyNestedGetter.txt @@ -6,6 +6,7 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = instance receiverType = null returnType = KtSubClass symbol = val instance: KtSubClass diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt index e21894784f2..64ab460f16a 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter.txt @@ -6,8 +6,9 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = foo receiverType = null returnType = kotlin.Int symbol = var foo: kotlin.Int simpleAccess = Write: - value = 42 \ No newline at end of file + 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 c717f98bc1c..7fde8f23928 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/kotlinPropertySetter_unqualified.txt @@ -7,8 +7,9 @@ KtSuccessCallInfo: type: A extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int simpleAccess = Write: - value = 1 \ No newline at end of file + 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 c1cca76d87a..5824b831d5f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/memberFunctionCallWithTypeArgument.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /A.foo(: A, r: R): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = r receiverType = null returnType = kotlin.Int symbol = r: R ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = r receiverType = null returnType = kotlin.Int symbol = r: R) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt index d82c447e07c..e6283776850 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int - symbol = var i: kotlin.Int \ No newline at end of file + symbol = var i: kotlin.Int 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 8ac0368f019..6ba6557e8f4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorOnVar_base.txt @@ -4,6 +4,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.descriptors.txt index fba953257d3..bce37e8ef91 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.descriptors.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K @@ -42,10 +43,12 @@ KtSuccessCallInfo: symbol = /MyMap.set(: MyMap, k: K, v: V): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt index 9ce01ac220c..3252c029903 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String @@ -42,11 +43,13 @@ KtSuccessCallInfo: symbol = /MyMap.set(: MyMap, k: kotlin.String, v: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: kotlin.Int - ] \ No newline at end of file + ] diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt index a1efefad5b2..ddcb304fcef 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K) 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 ed8cd2531ab..3197a7c3bb8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_base.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt index efd041d671b..eedc56c3f45 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K1): V1 valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K1 @@ -61,10 +62,12 @@ KtSuccessCallInfo: symbol = /Foo.set(: MyMap, : Foo, k: K2, v: V2): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K2, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V2 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 514f6dfc29b..b3b41039c18 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/postfixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String @@ -61,11 +62,13 @@ KtSuccessCallInfo: symbol = /Foo.set(: MyMap, : Foo, k: K2, v: V2): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K2, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V2 - ] \ No newline at end of file + ] diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt index a79b187e3fe..a6a9925d68b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar.txt @@ -17,6 +17,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int - symbol = var i: kotlin.Int \ No newline at end of file + symbol = var i: kotlin.Int 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 8ac0368f019..6ba6557e8f4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorOnVar_base.txt @@ -4,6 +4,7 @@ KtSuccessCallInfo: dispatchReceiver = null extensionReceiver = null signature = KtVariableLikeSignature: + name = i receiverType = null returnType = kotlin.Int symbol = var i: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.descriptors.txt index a165ca83351..dd14195c128 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.descriptors.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K @@ -42,10 +43,12 @@ KtSuccessCallInfo: symbol = /MyMap.set(: MyMap, k: K, v: V): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt index 8762fa13178..39837606910 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String @@ -42,10 +43,12 @@ KtSuccessCallInfo: symbol = /MyMap.set(: MyMap, k: kotlin.String, v: kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt index a1efefad5b2..ddcb304fcef 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.descriptors.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K): V valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K) 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 ed8cd2531ab..3197a7c3bb8 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_base.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String ] argumentMapping = { "a" -> (KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt index a2ef3be3ae7..071fcaf884b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.descriptors.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: K1): V1 valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K1 @@ -61,10 +62,12 @@ KtSuccessCallInfo: symbol = /Foo.set(: MyMap, : Foo, k: K2, v: V2): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K2, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V2 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 3f6c7137b8a..9808aa31222 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/prefixUnaryOperatorWithArrayAccessConvention_complexDispatcher.txt @@ -24,6 +24,7 @@ KtSuccessCallInfo: symbol = /MyMap.get(: MyMap, k: kotlin.String): kotlin.Int valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: kotlin.String @@ -61,11 +62,13 @@ KtSuccessCallInfo: symbol = /Foo.set(: MyMap, : Foo, k: K2, v: V2): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = k receiverType = null returnType = kotlin.String symbol = k: K2, KtVariableLikeSignature: + name = v receiverType = null returnType = kotlin.Int symbol = v: V2 - ] \ No newline at end of file + ] diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt index 4911f5b0542..7989e23bf03 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/qualifiedCalleeExpressionOfImplicitInvoke.txt @@ -6,6 +6,7 @@ KtSuccessCallInfo: isSafeNavigation = false extensionReceiver = null signature = KtVariableLikeSignature: + name = f receiverType = null returnType = kotlin.Function0 symbol = val f: kotlin.Function0 diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt index b3c8d849332..8bbf398ebd7 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/resolveCallInSuperConstructorParam.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /to(: A, other: B): A valueParameters = [ KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: B ] argumentMapping = { 2 -> (KtVariableLikeSignature: + name = other receiverType = null returnType = kotlin.Int symbol = other: B) - } \ 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 095a280bf90..c3ede5f588b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt @@ -10,13 +10,15 @@ KtSuccessCallInfo: symbol = java/util/Comparator(function: kotlin.Function2, ft, kotlin.Int>): java.util.Comparator valueParameters = [ KtVariableLikeSignature: + name = function receiverType = null returnType = kotlin.Function2, ft, kotlin.Int> symbol = function: kotlin.Function2, ft, kotlin.Int> ] argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: + name = function receiverType = null returnType = kotlin.Function2, ft, kotlin.Int> symbol = function: kotlin.Function2, ft, kotlin.Int>) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt index 7754b56f7ef..605f9a2aec2 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastExplicitDispatchReceiver.txt @@ -8,6 +8,7 @@ KtSuccessCallInfo: smartCastType = kotlin.String extensionReceiver = null signature = KtVariableLikeSignature: + name = length receiverType = null returnType = kotlin.Int symbol = val length: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt index 25d805f11a6..1867efeb4ef 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/smartCastImplicitDispatchReceiver.txt @@ -9,6 +9,7 @@ KtSuccessCallInfo: smartCastType = kotlin.String extensionReceiver = null signature = KtVariableLikeSignature: + name = length receiverType = null returnType = kotlin.Int symbol = val length: kotlin.Int diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.descriptors.txt index 4e0e4d31a1b..8036f6aedfc 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.descriptors.txt @@ -12,12 +12,14 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: kotlin.Function1, p1: P1): R valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: P1 ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: P1) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt index e945e8e05fe..38c4479331d 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunction.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: kotlin.Function1, p1: kotlin.Int): kotlin.String valueParameters = [ KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int ] argumentMapping = { 1 -> (KtVariableLikeSignature: + name = p1 receiverType = null returnType = kotlin.Int symbol = p1: kotlin.Int) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.descriptors.txt index 6f4f3c26b17..a8656e9d50b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.descriptors.txt @@ -12,12 +12,25 @@ KtSuccessCallInfo: symbol = kotlin/Function2.invoke(: kotlin.Function2, p1: P1, p2: P2): R valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int symbol = p1: P1, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String symbol = p2: P2 ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: P1), + "" -> (KtVariableLikeSignature: + name = b + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: P2) + } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt index 3b2ffd43213..497d9607d16 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterName.txt @@ -9,15 +9,28 @@ KtSuccessCallInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = kotlin.Unit - symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) kotlin.String, kotlin.Unit>, a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, b: @R|kotlin.ParameterName|(name = String(b)) kotlin.String): kotlin.Unit + symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) kotlin.String, kotlin.Unit>, p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int - symbol = a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String - symbol = b: @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int), + "" -> (KtVariableLikeSignature: + name = b + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String) + } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.descriptors.txt index 6f4f3c26b17..a8656e9d50b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.descriptors.txt @@ -12,12 +12,25 @@ KtSuccessCallInfo: symbol = kotlin/Function2.invoke(: kotlin.Function2, p1: P1, p2: P2): R valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int symbol = p1: P1, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String symbol = p2: P2 ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: P1), + "" -> (KtVariableLikeSignature: + name = b + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: P2) + } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt index 3b2ffd43213..e3dfa660f8b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotation.txt @@ -9,15 +9,28 @@ KtSuccessCallInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = kotlin.Unit - symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) kotlin.String, kotlin.Unit>, a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, b: @R|kotlin.ParameterName|(name = String(b)) kotlin.String): kotlin.Unit + symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) kotlin.String, kotlin.Unit>, p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int - symbol = a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String - symbol = b: @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int), + "" -> (KtVariableLikeSignature: + name = b + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String) + } 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 f52a154e1de..c593f18905c 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.txt @@ -12,12 +12,25 @@ KtSuccessCallInfo: symbol = kotlin/Function2.invoke(: kotlin.Function2, p1: P1, p2: P2): R valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) @R|kotlin.ParameterName|(name = String(notMe)) kotlin.Int symbol = p1: P1, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(b)) @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String symbol = p2: P2 ] - argumentMapping = {} \ No newline at end of file + 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), + "" -> (KtVariableLikeSignature: + name = b + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(b)) @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String + symbol = p2: P2) + } \ 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 3b2ffd43213..e3dfa660f8b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict.txt @@ -9,15 +9,28 @@ KtSuccessCallInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = kotlin.Unit - symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) kotlin.String, kotlin.Unit>, a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, b: @R|kotlin.ParameterName|(name = String(b)) kotlin.String): kotlin.Unit + symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, @R|kotlin.ParameterName|(name = String(b)) kotlin.String, kotlin.Unit>, p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int - symbol = a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String - symbol = b: @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int), + "" -> (KtVariableLikeSignature: + name = b + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(b)) kotlin.String + symbol = p2: @R|kotlin.ParameterName|(name = String(b)) kotlin.String) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt new file mode 100644 index 00000000000..6e31e0b3ae9 --- /dev/null +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.txt @@ -0,0 +1,26 @@ +KtSuccessCallInfo: + call = KtSimpleFunctionCall: + isImplicitInvoke = true + partiallyAppliedSymbol = KtPartiallyAppliedSymbol: + dispatchReceiver = KtExplicitReceiverValue: + expression = x + isSafeNavigation = false + extensionReceiver = null + signature = KtFunctionLikeSignature: + receiverType = null + returnType = kotlin.Unit + symbol = kotlin/Function1.invoke(: kotlin.Function1, p1: P1): R + valueParameters = [ + KtVariableLikeSignature: + name = first + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int + symbol = p1: P1 + ] + 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) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.kt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.kt new file mode 100644 index 00000000000..d302bf85941 --- /dev/null +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.kt @@ -0,0 +1,4 @@ +// @ParameterName annotation takes precedence over name in function type parameter +fun call(x: (@ParameterName("first") @ParameterName("second") Int) -> Unit) { + x(1) +} diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt new file mode 100644 index 00000000000..a639f235704 --- /dev/null +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameAnnotationConflict2.txt @@ -0,0 +1,26 @@ +KtSuccessCallInfo: + call = KtSimpleFunctionCall: + isImplicitInvoke = true + partiallyAppliedSymbol = KtPartiallyAppliedSymbol: + dispatchReceiver = KtExplicitReceiverValue: + expression = x + isSafeNavigation = false + extensionReceiver = null + signature = KtFunctionLikeSignature: + receiverType = null + returnType = kotlin.Unit + symbol = kotlin/Function1.invoke(: kotlin.Function1<@R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int, kotlin.Unit>, p1: @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int): kotlin.Unit + valueParameters = [ + KtVariableLikeSignature: + name = first + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int + ] + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = first + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(first)) @R|kotlin.ParameterName|(name = String(second)) kotlin.Int) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.descriptors.txt index 6774664290d..0cf8fe53972 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.descriptors.txt @@ -12,8 +12,15 @@ KtSuccessCallInfo: symbol = kotlin/Function1.invoke(: kotlin.Function1, p1: P1): R valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int symbol = p1: P1 ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: P1) + } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt index e71fafc5ef1..ccb9f74f669 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameGeneric.txt @@ -9,11 +9,18 @@ KtSuccessCallInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = kotlin.Unit - symbol = kotlin/Function1.invoke(: kotlin.Function1<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, kotlin.Unit>, a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int): kotlin.Unit + symbol = kotlin/Function1.invoke(: kotlin.Function1<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, kotlin.Unit>, p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int - symbol = a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int ] - argumentMapping = {} \ No newline at end of file + argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt index a79bc9ad92e..1568f1d86d0 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameInNonFunctionType.txt @@ -10,21 +10,25 @@ KtSuccessCallInfo: symbol = /call(a: @R|kotlin.ParameterName|(name = String(notMe)) kotlin.Int, b: @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(notMe)) kotlin.Int symbol = a: @R|kotlin.ParameterName|(name = String(notMe)) kotlin.Int, KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String symbol = b: @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String ] 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), "" -> (KtVariableLikeSignature: + name = b receiverType = null returnType = @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String symbol = b: @R|kotlin.ParameterName|(name = String(meNeither)) kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.descriptors.txt index aafb870651c..54650c7bad4 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.descriptors.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.descriptors.txt @@ -12,16 +12,24 @@ KtSuccessCallInfo: symbol = kotlin/Function2.invoke(: kotlin.Function2, p1: P1, p2: P2): R valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int symbol = p1: P1, KtVariableLikeSignature: + name = p2 receiverType = null returnType = kotlin.String symbol = p2: P2 ] argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: P1), "" -> (KtVariableLikeSignature: + name = p2 receiverType = null returnType = kotlin.String symbol = p2: P2) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt index 29f3a1a9a05..aaa25373d57 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableAsFunctionWithParameterNameMixed.txt @@ -9,20 +9,28 @@ KtSuccessCallInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = kotlin.Unit - symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, kotlin.String, kotlin.Unit>, a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, p2: kotlin.String): kotlin.Unit + symbol = kotlin/Function2.invoke(: kotlin.Function2<@R|kotlin.ParameterName|(name = String(a)) kotlin.Int, kotlin.String, kotlin.Unit>, p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, p2: kotlin.String): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = a receiverType = null returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int - symbol = a: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int, KtVariableLikeSignature: + name = p2 receiverType = null returnType = kotlin.String symbol = p2: kotlin.String ] argumentMapping = { + 1 -> (KtVariableLikeSignature: + name = a + receiverType = null + returnType = @R|kotlin.ParameterName|(name = String(a)) kotlin.Int + symbol = p1: @R|kotlin.ParameterName|(name = String(a)) kotlin.Int), "" -> (KtVariableLikeSignature: + name = p2 receiverType = null returnType = kotlin.String symbol = p2: kotlin.String) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt index 1f9bd2d4106..c1388aa229f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithExtensionInvoke.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /invoke(: Foo, t: T): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = t receiverType = null returnType = kotlin.String symbol = t: T ] argumentMapping = { "" -> (KtVariableLikeSignature: + name = t receiverType = null returnType = kotlin.String symbol = t: T) - } \ No newline at end of file + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt index efe4e30ea55..074ee48e27b 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.txt @@ -12,13 +12,15 @@ KtSuccessCallInfo: symbol = /Foo.invoke(: Foo, t: T): kotlin.Unit valueParameters = [ KtVariableLikeSignature: + name = t receiverType = null returnType = kotlin.String symbol = t: T ] argumentMapping = { "" -> (KtVariableLikeSignature: + name = t receiverType = null returnType = kotlin.String symbol = t: T) - } \ No newline at end of file + }