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

[FIR] Don't use implicit type as expected type of anonymous function

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-08-02 12:05:14 +03:00
parent 7861396246
commit e944119f71
1 changed files with 2 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/transformers/FirBodyResolveTransformer.kt
+2 -5
View File
@@ -334,11 +334,8 @@ open class FirBodyResolveTransformer(
fun transform(): FirAnonymousFunction { fun transform(): FirAnonymousFunction {
return withScopeCleanup(scopes) { return withScopeCleanup(scopes) {
scopes.addIfNotNull(receiverTypeRef?.coneTypeSafe<ConeKotlinType>()?.scope(session, scopeSession)) scopes.addIfNotNull(receiverTypeRef?.coneTypeSafe<ConeKotlinType>()?.scope(session, scopeSession))
val result = val expectedReturnType = lambdaResolution.expectedReturnTypeRef ?: anonymousFunction.returnTypeRef.takeUnless { it is FirImplicitTypeRef }
super.transformAnonymousFunction( val result = super.transformAnonymousFunction(anonymousFunction, expectedReturnType).single as FirAnonymousFunction
anonymousFunction,
lambdaResolution.expectedReturnTypeRef ?: anonymousFunction.returnTypeRef
).single as FirAnonymousFunction
val body = result.body val body = result.body
if (result.returnTypeRef is FirImplicitTypeRef && body != null) { if (result.returnTypeRef is FirImplicitTypeRef && body != null) {
result.transformReturnTypeRef(this, body.resultType) result.transformReturnTypeRef(this, body.resultType)