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

FIR resolve: set implicit Unit type for block without result expression

Browse Source 
This fixes most of "implicit error types"
This commit is contained in:
Mikhail Glukhikh
2019-05-23 13:35:50 +03:00
parent d2bdbd8978
commit 459dcb4f57
1 changed files with 5 additions and 1 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
+5 -1
View File
@@ -776,7 +776,11 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
is FirExpression -> statement is FirExpression -> statement
else -> null else -> null
} }
block.resultType = (resultExpression?.resultType as? FirResolvedTypeRef) ?: FirErrorTypeRefImpl(session, null, "No type for block") block.resultType = if (resultExpression == null) {
FirImplicitUnitTypeRef(session, block.psi)
} else {
(resultExpression.resultType as? FirResolvedTypeRef) ?: FirErrorTypeRefImpl(session, null, "No type for block")
}
return block.compose() return block.compose()
} }