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

Minor. Logic clarified

Browse Source
This commit is contained in:
Andrey Breslav
2015-02-06 15:37:27 +03:00
parent fcb6055913
commit 0b41136c7c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+3 -2
View File
@@ -173,8 +173,9 @@ public class JavaNullabilityWarningsChecker : AdditionalTypeChecker {
if (TypeUtils.noExpectedType(expectedType)) return if (TypeUtils.noExpectedType(expectedType)) return
val expectedMustNotBeNull = expectedType.mustNotBeNull() val expectedMustNotBeNull = expectedType.mustNotBeNull()
val actualNullabilityInKotlin = dataFlowInfo.getNullability(dataFlowValue) if (dataFlowInfo.getNullability(dataFlowValue) == Nullability.NOT_NULL) return
val actualMayBeNull = if (actualNullabilityInKotlin == Nullability.NOT_NULL) null else expressionType.mayBeNull()
val actualMayBeNull = expressionType.mayBeNull()
if (expectedMustNotBeNull == NullabilityInformationSource.KOTLIN && actualMayBeNull == NullabilityInformationSource.KOTLIN) { if (expectedMustNotBeNull == NullabilityInformationSource.KOTLIN && actualMayBeNull == NullabilityInformationSource.KOTLIN) {
// a type mismatch error will be reported elsewhere // a type mismatch error will be reported elsewhere