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

Cone (FIR) context: provide proper types instead of todo's

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-17 18:05:31 +03:00
committed by Mikhail Glukhikh
parent dae5822986
commit a3806a6e2e
1 changed files with 14 additions and 3 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
+14 -3
View File
@@ -6,6 +6,10 @@
package org.jetbrains.kotlin.fir.resolve.calls package org.jetbrains.kotlin.fir.resolve.calls
import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
import org.jetbrains.kotlin.fir.resolve.constructType
import org.jetbrains.kotlin.fir.service
import org.jetbrains.kotlin.fir.symbols.StandardClassIds
import org.jetbrains.kotlin.fir.symbols.invoke
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilder import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilder
import org.jetbrains.kotlin.resolve.calls.model.PostponedResolvedAtomMarker import org.jetbrains.kotlin.resolve.calls.model.PostponedResolvedAtomMarker
@@ -115,7 +119,10 @@ private fun extraLambdaInfo(
?: expectedType?.typeArguments?.singleOrNull()?.safeAs<ConeTypedProjection>()?.type?.takeIf { isFunctionSupertype } ?: expectedType?.typeArguments?.singleOrNull()?.safeAs<ConeTypedProjection>()?.type?.takeIf { isFunctionSupertype }
?: typeVariable.defaultType ?: typeVariable.defaultType
val parameters = argument.valueParameters?.map { it.returnTypeRef.coneTypeSafe<ConeKotlinType>() ?: TODO("!nothing") } ?: emptyList() val nothingType = StandardClassIds.Nothing(argument.session.service()).constructType(emptyArray(), false)
val parameters = argument.valueParameters?.map {
it.returnTypeRef.coneTypeSafe<ConeKotlinType>() ?: nothingType
} ?: emptyList()
val newTypeVariableUsed = returnType == typeVariable.defaultType val newTypeVariableUsed = returnType == typeVariable.defaultType
if (newTypeVariableUsed) csBuilder.registerVariable(typeVariable) if (newTypeVariableUsed) csBuilder.registerVariable(typeVariable)
@@ -148,12 +155,16 @@ private fun extractLambdaInfoFromFunctionalType(
private fun extractLambdaParameters(expectedType: ConeKotlinType, argument: FirAnonymousFunction): List<ConeKotlinType> { private fun extractLambdaParameters(expectedType: ConeKotlinType, argument: FirAnonymousFunction): List<ConeKotlinType> {
val parameters = argument.valueParameters val parameters = argument.valueParameters
val expectedParameters = expectedType.valueParameterTypes val expectedParameters = expectedType.valueParameterTypes
val nullableAnyType = StandardClassIds.Any(argument.session.service()).constructType(emptyArray(), true)
if (parameters.isEmpty()) { if (parameters.isEmpty()) {
return expectedParameters.map { it?.type ?: TODO("any?") } return expectedParameters.map { it?.type ?: nullableAnyType }
} }
return parameters.mapIndexed { index, parameter -> return parameters.mapIndexed { index, parameter ->
parameter.returnTypeRef.coneTypeSafe() ?: expectedParameters.getOrNull(index) ?: TODO("any?")//expectedType.builtIns.nullableAnyType parameter.returnTypeRef.coneTypeSafe() ?: expectedParameters.getOrNull(index) ?: nullableAnyType
//expectedType.builtIns.nullableAnyType
} }
} }