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

Don't use annotations after nullability was forced upon a platform type

Browse Source 
#KT-6762 Fixed
 #KT-6763 Fixed
This commit is contained in:
Andrey Breslav
2015-02-17 07:47:08 +03:00
parent 0217121814
commit ab93b530f1
8 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+1 -1
View File
@@ -159,7 +159,7 @@ public class JavaNullabilityWarningsChecker : AdditionalTypeChecker {
private fun JetType.mustNotBeNull(): NullabilityInformationSource? {
if (!isFlexible() && !TypeUtils.isNullableType(this)) return NullabilityInformationSource.KOTLIN
if (getAnnotations().isMarkedNotNull()) return NullabilityInformationSource.JAVA
if (!isMarkedNullable() && getAnnotations().isMarkedNotNull()) return NullabilityInformationSource.JAVA
return null
}