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

[NI] Substitute lambda return type with current substitutor

Browse Source 
We should do this because return type even it still not proper
can contain fixed type variables
This commit is contained in:
Stanislav Erokhin
2017-05-22 16:32:59 +03:00
committed by Mikhail Zarechenskiy
parent 89ac3bd5cf
commit 30f7396803
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt
+1 -13
View File
@@ -257,20 +257,8 @@ class KotlinCallCompleter(
for (innerCall in lambda.resultArguments) {
// todo strange code -- why top-level kotlinCall? may be it isn't right outer call
CheckArguments.checkArgument(topLevelCallContext, topLevelCall, c.getBuilder(), innerCall, lambda.returnType)
CheckArguments.checkArgument(topLevelCallContext, topLevelCall, c.getBuilder(), innerCall, lambda.returnType.let(::substitute))
}
// when (innerCall) {
// is ResolvedKotlinCall.CompletedResolvedKotlinCall -> {
// val returnType = innerCall.completedCall.lastCall.resultingDescriptor.returnTypeOrNothing
// constraintInjector.addInitialSubtypeConstraint(injectorContext, returnType, lambda.returnType, position)
// }
// is ResolvedKotlinCall.OnlyResolvedKotlinCall -> {
// // todo register call
// val returnType = innerCall.candidate.lastCall.descriptorWithFreshTypes.returnTypeOrNothing
// c.addInnerCall(innerCall)
// constraintInjector.addInitialSubtypeConstraint(injectorContext, returnType, lambda.returnType, position)
// }
// }
}
private fun canWeAnalyzeIt(c: Context, lambda: ResolvedLambdaArgument): Boolean {