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

FIR: fix exception in ConeKotlinType.returnType

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-05-24 13:12:20 +03:00
parent 5c96fa0844
commit 963ed44ce1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/PostponedArguments.kt
+4 -5
View File
@@ -78,12 +78,11 @@ private fun isFunctionalTypeWithReceiver(typeRef: FirTypeRef) =
coneTypeSafe.lookupTag.classId.asString() == "kotlin/ExtensionFunctionType" coneTypeSafe.lookupTag.classId.asString() == "kotlin/ExtensionFunctionType"
} }
private val ConeKotlinType.returnType: ConeKotlinType private val ConeKotlinType.returnType: ConeKotlinType?
get() { get() {
require(this is ConeClassType) require(this is ConeClassType)
val projection = typeArguments.last() val projection = typeArguments.last()
require(projection is ConeTypedProjection) return (projection as? ConeTypedProjection)?.type
return projection.type
} }
private val ConeKotlinType.valueParameterTypes: List<ConeKotlinType?> private val ConeKotlinType.valueParameterTypes: List<ConeKotlinType?>
@@ -139,8 +138,8 @@ private fun extractLambdaInfoFromFunctionalType(
val parameters = extractLambdaParameters(expectedType, argument) val parameters = extractLambdaParameters(expectedType, argument)
val argumentAsFunctionExpression = argument//.safeAs<FunctionExpression>() val argumentAsFunctionExpression = argument//.safeAs<FunctionExpression>()
val receiverType = argumentAsFunctionExpression?.receiverType ?: expectedType.receiverType(expectedTypeRef) val receiverType = argumentAsFunctionExpression.receiverType ?: expectedType.receiverType(expectedTypeRef)
val returnType = argumentAsFunctionExpression?.returnType ?: expectedType.returnType val returnType = argumentAsFunctionExpression.returnType ?: expectedType.returnType ?: return null
return ResolvedLambdaAtom( return ResolvedLambdaAtom(
argument, argument,