azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use receivers from candidate as a fallback during completion of callable references

Browse Source 
^KT-45083 Fixed
This commit is contained in:
Victor Petukhov
2021-06-03 17:03:58 +03:00
committed by TeamCityServer
parent fe8f7cfcae
commit 750f327878
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
+10 -5
View File
@@ -403,15 +403,20 @@ class ResolvedAtomCompleter(
callableCandidate: CallableReferenceCandidate,
recordedDescriptor: CallableDescriptor
): CallableReferenceResultTypeInfo {
val dispatchReceiver = recordedDescriptor.dispatchReceiverParameter?.value
?: callableCandidate.dispatchReceiver?.receiver?.receiverValue
val extensionReceiver = recordedDescriptor.extensionReceiverParameter?.value
?: callableCandidate.extensionReceiver?.receiver?.receiverValue
val explicitCallableReceiver = when (callableCandidate.explicitReceiverKind) {
ExplicitReceiverKind.DISPATCH_RECEIVER -> callableCandidate.dispatchReceiver
ExplicitReceiverKind.EXTENSION_RECEIVER -> callableCandidate.extensionReceiver
ExplicitReceiverKind.DISPATCH_RECEIVER -> dispatchReceiver
ExplicitReceiverKind.EXTENSION_RECEIVER -> extensionReceiver
else -> null
}
return CallableReferenceResultTypeInfo(
recordedDescriptor.dispatchReceiverParameter?.value,
recordedDescriptor.extensionReceiverParameter?.value,
explicitCallableReceiver?.receiver?.receiverValue,
dispatchReceiver,
extensionReceiver,
explicitCallableReceiver,
TypeSubstitutor.EMPTY,
callableCandidate.reflectionCandidateType.replaceFunctionTypeArgumentsByDescriptor(recordedDescriptor)
)