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

[NI] Fix suspend conversions for subtypes of functional types

Browse Source 
Fix for recently added tests:
  - testIntersectionTypeToSubtypeConversion
  - testSubtypeOfFunctionalTypeToSuspendConversion
This commit is contained in:
Mikhail Zarechenskiy
2020-05-20 21:33:39 +03:00
parent 3903814c9c
commit 2ff5b253ae
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/suspendConversionUtils.kt
+3 -2
View File
@@ -22,7 +22,6 @@ object SuspendTypeConversions : ParameterTypeConversion {
if (argument !is SimpleKotlinCallArgument) return true
val argumentType = argument.receiver.stableType
if (!argumentType.isFunctionType) return true
if (argumentType.isSuspendFunctionType) return true
if (!expectedParameterType.isSuspendFunctionType) return true
@@ -30,7 +29,9 @@ object SuspendTypeConversions : ParameterTypeConversion {
return false
}
override fun conversionIsNeededBeforeSubtypingCheck(argument: KotlinCallArgument): Boolean = true
override fun conversionIsNeededBeforeSubtypingCheck(argument: KotlinCallArgument): Boolean =
argument is SimpleKotlinCallArgument && argument.receiver.stableType.isFunctionType
override fun conversionIsNeededAfterSubtypingCheck(argument: KotlinCallArgument): Boolean =
argument is SimpleKotlinCallArgument && argument.receiver.stableType.isFunctionTypeOrSubtype