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

[NI] Fix expected return type for function literals

Browse Source 
It should actually be Unit, as told in FunctionExpression comments
(was null, later defaulted to Any?).
This commit is contained in:
Dmitry Petrov
2017-06-06 17:56:52 +03:00
committed by Mikhail Zarechenskiy
parent 0136be3500
commit a303888e66
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt
+4 -2
View File
@@ -447,7 +447,8 @@ class PSICallResolver(
startDataFlowInfo: DataFlowInfo, startDataFlowInfo: DataFlowInfo,
valueArgument: ValueArgument valueArgument: ValueArgument
): PSIKotlinCallArgument { ): PSIKotlinCallArgument {
val parseErrorArgument = ParseErrorKotlinCallArgument(valueArgument, startDataFlowInfo, outerCallContext.scope.ownerDescriptor.builtIns) val builtIns = outerCallContext.scope.ownerDescriptor.builtIns
val parseErrorArgument = ParseErrorKotlinCallArgument(valueArgument, startDataFlowInfo, builtIns)
val ktExpression = KtPsiUtil.deparenthesize(valueArgument.getArgumentExpression()) ?: val ktExpression = KtPsiUtil.deparenthesize(valueArgument.getArgumentExpression()) ?:
return parseErrorArgument return parseErrorArgument
@@ -460,7 +461,8 @@ class PSICallResolver(
is KtNamedFunction -> { is KtNamedFunction -> {
val receiverType = resolveType(outerCallContext, ktExpression.receiverTypeReference) val receiverType = resolveType(outerCallContext, ktExpression.receiverTypeReference)
val parametersTypes = resolveParametersTypes(outerCallContext, ktExpression) ?: emptyArray() val parametersTypes = resolveParametersTypes(outerCallContext, ktExpression) ?: emptyArray()
val returnType = resolveType(outerCallContext, ktExpression.typeReference) val returnType = resolveType(outerCallContext, ktExpression.typeReference) ?:
if (ktExpression.hasBlockBody()) builtIns.unitType else null
FunctionExpressionImpl(outerCallContext, valueArgument, startDataFlowInfo, ktExpression, argumentName, receiverType, parametersTypes, returnType) FunctionExpressionImpl(outerCallContext, valueArgument, startDataFlowInfo, ktExpression, argumentName, receiverType, parametersTypes, returnType)
} }
else -> null else -> null