From 21b86123e8df6610d75454c3acee1d790188b240 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Tue, 26 Apr 2022 12:22:32 +0300 Subject: [PATCH] FIR: Adjust analysis test data after changes in how we load Java types Especially, it's about types based on type parameters --- .../samConstructorCall.descriptors.txt | 24 ++++++++++++++++++ .../resolveCall/samConstructorCall.txt | 6 ++--- .../samConstructorCall.descriptors.txt | 25 +++++++++++++++++++ .../singleCandidate/samConstructorCall.txt | 6 ++--- .../Implement_java_util_Collection.pretty.txt | 2 +- .../constructorViaTypeAlias.pretty.txt | 2 +- .../functionWithImplicitType.fir.txt | 2 +- 7 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt create mode 100644 analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt new file mode 100644 index 00000000000..c3ede5f588b --- /dev/null +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt @@ -0,0 +1,24 @@ +KtSuccessCallInfo: + call = KtSimpleFunctionCall: + isImplicitInvoke = false + partiallyAppliedSymbol = KtPartiallyAppliedSymbol: + dispatchReceiver = null + extensionReceiver = null + signature = KtFunctionLikeSignature: + receiverType = null + returnType = java.util.Comparator> + 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>) + } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt index c3ede5f588b..f545b352f7f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt @@ -7,18 +7,18 @@ KtSuccessCallInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = java.util.Comparator> - symbol = java/util/Comparator(function: kotlin.Function2, ft, kotlin.Int>): java.util.Comparator + 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> + 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>) + symbol = function: kotlin.Function2, ft, kotlin.Int>) } diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt new file mode 100644 index 00000000000..64f30ed816d --- /dev/null +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt @@ -0,0 +1,25 @@ +KtApplicableCallCandidateInfo: + candidate = KtSimpleFunctionCall: + isImplicitInvoke = false + partiallyAppliedSymbol = KtPartiallyAppliedSymbol: + dispatchReceiver = null + extensionReceiver = null + signature = KtFunctionLikeSignature: + receiverType = null + returnType = java.util.Comparator> + 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>) + } + isInBestCandidates = true diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt index 64f30ed816d..8e875389d01 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt +++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt @@ -7,19 +7,19 @@ KtApplicableCallCandidateInfo: signature = KtFunctionLikeSignature: receiverType = null returnType = java.util.Comparator> - symbol = java/util/Comparator(function: kotlin.Function2, ft, kotlin.Int>): java.util.Comparator + 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> + 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>) + symbol = function: kotlin.Function2, ft, kotlin.Int>) } isInBestCandidates = true diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt index bc5036ce49f..4d4a7b73a82 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt @@ -8,7 +8,7 @@ abstract operator fun iterator(): kotlin.collections.MutableIterator! -fun toArray(p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! +fun toArray(p0: kotlin.Array<(out) (T!!..T?)>!): kotlin.Array<(out) (T!!..T?)>! abstract fun add(p0: test.SomeClass!): kotlin.Boolean diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt index 68acaedb3d3..20cbaa66748 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt @@ -1 +1 @@ -constructor(c: kotlin.collections.(Mutable)Collection!) \ No newline at end of file +constructor(c: kotlin.collections.(Mutable)Collection!) diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt index 7b9c3fdeeed..ca0af4be9c6 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt @@ -2,5 +2,5 @@ FILE: functionWithImplicitType.kt public final [BODY_RESOLVE] fun checkSubtype([BODY_RESOLVE] t: R|T|): R|T| { ^checkSubtype R|/t| } - public final [BODY_RESOLVE] val ab: R|kotlin/collections/List?| = R|/checkSubtype|?|>(Q|java/util/Collections|.R|java/util/Collections.emptyList||>()) + public final [BODY_RESOLVE] val ab: R|kotlin/collections/List?| = R|/checkSubtype|?|>(Q|java/util/Collections|.R|java/util/Collections.emptyList|()) [BODY_RESOLVE] public get(): R|kotlin/collections/List?|