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

FIR IDE: Check stability of smartcast expressions in

Browse Source 
KtFirExpressionTypeProvider.getDefiniteNullability().
This commit is contained in:
Mark Punzalan
2021-07-29 07:11:58 +00:00
committed by teamcityserver
parent 5283f7b7c6
commit 0627dbcb78
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirExpressionTypeProvider.kt
+16 -14
View File
@@ -142,21 +142,23 @@ internal class KtFirExpressionTypeProvider(
getDefiniteNullability(expression) == DefiniteNullability.DEFINITELY_NOT_NULL
private fun getDefiniteNullability(expression: KtExpression): DefiniteNullability = withValidityAssertion {
// TODO: Check stability of smartcast (pending PR 4382)
return when (val fir = expression.getOrBuildFir(analysisSession.firResolveState)) {
is FirExpressionWithSmartcastToNull -> DefiniteNullability.DEFINITELY_NULL
is FirExpression -> {
// Note: This includes FirExpressionWithSmartcast
with(analysisSession.rootModuleSession.typeContext) {
if (!fir.typeRef.coneType.isNullableType()) {
DefiniteNullability.DEFINITELY_NOT_NULL
} else {
DefiniteNullability.UNKNOWN
}
}
}
else -> DefiniteNullability.UNKNOWN
fun FirExpression.isNotNullable() = with(analysisSession.rootModuleSession.typeContext) {
!typeRef.coneType.isNullableType()
}
when (val fir = expression.getOrBuildFir(analysisSession.firResolveState)) {
is FirExpressionWithSmartcastToNull -> if (fir.isStable) {
return DefiniteNullability.DEFINITELY_NULL
}
is FirExpressionWithSmartcast -> if (fir.isStable && fir.isNotNullable()) {
return DefiniteNullability.DEFINITELY_NOT_NULL
}
is FirExpression -> if (fir.isNotNullable()) {
return DefiniteNullability.DEFINITELY_NOT_NULL
}
}
return DefiniteNullability.UNKNOWN
}
}