CallableReferencesCandidateFactory.kt: minor cleanup for better reading

This commit is contained in:
Mikhail Glukhikh
2023-12-08 15:44:09 +01:00
committed by Space Team
parent 37789cf7f5
commit 25c0bd278e
@@ -55,7 +55,6 @@ class CallableReferencesCandidateFactory(
extensionReceiver = null, extensionReceiver = null,
expectedType, expectedType,
callComponents.builtIns, callComponents.builtIns,
buildTypeWithConversions = kotlinCall is CallableReferenceKotlinCallArgument
) )
return CallableReferenceResolutionCandidate( return CallableReferenceResolutionCandidate(
@@ -82,8 +81,6 @@ class CallableReferencesCandidateFactory(
extensionCallableReceiver, extensionCallableReceiver,
expectedType, expectedType,
callComponents.builtIns, callComponents.builtIns,
// conversions aren't needed for top-level callable references
buildTypeWithConversions = kotlinCall is CallableReferenceKotlinCallArgument
) )
fun createCallableReferenceCallCandidate(diagnostics: List<KotlinCallDiagnostic>) = CallableReferenceResolutionCandidate( fun createCallableReferenceCallCandidate(diagnostics: List<KotlinCallDiagnostic>) = CallableReferenceResolutionCandidate(
@@ -347,7 +344,6 @@ class CallableReferencesCandidateFactory(
extensionReceiver: CallableReceiver?, extensionReceiver: CallableReceiver?,
expectedType: UnwrappedType?, expectedType: UnwrappedType?,
builtins: KotlinBuiltIns, builtins: KotlinBuiltIns,
buildTypeWithConversions: Boolean = true
): Pair<UnwrappedType, CallableReferenceAdaptation?> { ): Pair<UnwrappedType, CallableReferenceAdaptation?> {
val argumentsAndReceivers = ArrayList<KotlinType>(descriptor.valueParameters.size + 2 + descriptor.contextReceiverParameters.size) val argumentsAndReceivers = ArrayList<KotlinType>(descriptor.valueParameters.size + 2 + descriptor.contextReceiverParameters.size)
@@ -388,6 +384,9 @@ class CallableReferencesCandidateFactory(
builtins = builtins builtins = builtins
) )
// conversions aren't needed for top-level callable references
val buildTypeWithConversions = kotlinCall is CallableReferenceKotlinCallArgument
val returnType = if (callableReferenceAdaptation == null || !buildTypeWithConversions) { val returnType = if (callableReferenceAdaptation == null || !buildTypeWithConversions) {
descriptor.valueParameters.mapTo(argumentsAndReceivers) { it.type } descriptor.valueParameters.mapTo(argumentsAndReceivers) { it.type }
descriptorReturnType descriptorReturnType