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

Change reporting policy for NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS

Browse Source 
If lower bound of flexible is nullable treat it like Kotlin nullable type
Anyway appropriate errors are reported outside JavaNullabilityWarningsChecker
This commit is contained in:
Denis Zharkov
2015-06-18 10:16:14 +03:00
parent 1469a0aa6f
commit 0375e45936
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+6
View File
@@ -217,12 +217,18 @@ private fun checkTypeParameterDescriptorsAreNotReified(
public class JavaNullabilityWarningsChecker : AdditionalTypeChecker { public class JavaNullabilityWarningsChecker : AdditionalTypeChecker {
private fun JetType.mayBeNull(): NullabilityInformationSource? { private fun JetType.mayBeNull(): NullabilityInformationSource? {
if (!isError() && !isFlexible() && TypeUtils.isNullableType(this)) return NullabilityInformationSource.KOTLIN if (!isError() && !isFlexible() && TypeUtils.isNullableType(this)) return NullabilityInformationSource.KOTLIN
if (isFlexible() && TypeUtils.isNullableType(flexibility().lowerBound)) return NullabilityInformationSource.KOTLIN
if (getAnnotations().isMarkedNullable()) return NullabilityInformationSource.JAVA if (getAnnotations().isMarkedNullable()) return NullabilityInformationSource.JAVA
return null return null
} }
private fun JetType.mustNotBeNull(): NullabilityInformationSource? { private fun JetType.mustNotBeNull(): NullabilityInformationSource? {
if (!isError() && !isFlexible() && !TypeUtils.isNullableType(this)) return NullabilityInformationSource.KOTLIN if (!isError() && !isFlexible() && !TypeUtils.isNullableType(this)) return NullabilityInformationSource.KOTLIN
if (isFlexible() && !TypeUtils.isNullableType(flexibility().upperBound)) return NullabilityInformationSource.KOTLIN
if (!isMarkedNullable() && getAnnotations().isMarkedNotNull()) return NullabilityInformationSource.JAVA if (!isMarkedNullable() && getAnnotations().isMarkedNotNull()) return NullabilityInformationSource.JAVA
return null return null
} }