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

Nullability fixed for upper bounds that are not type parameters

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-28 14:41:38 +04:00
parent 5c64ad93f8
commit c94b658462
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt
+8 -2
View File
@@ -89,8 +89,10 @@ class LazyJavaTypeResolver(
private val attr: JavaTypeAttributes private val attr: JavaTypeAttributes
) : LazyType(c.storageManager) { ) : LazyType(c.storageManager) {
private val classifier = c.storageManager.createNullableLazyValue { javaType.getClassifier() }
override fun computeTypeConstructor(): TypeConstructor { override fun computeTypeConstructor(): TypeConstructor {
val classifier = javaType.getClassifier() val classifier = classifier()
if (classifier == null) { if (classifier == null) {
return ErrorUtils.createErrorTypeConstructor("Unresolved java classifier: " + javaType.getPresentableText()) return ErrorUtils.createErrorTypeConstructor("Unresolved java classifier: " + javaType.getPresentableText())
} }
@@ -215,7 +217,11 @@ class LazyJavaTypeResolver(
!attr.isMarkedNotNull && !attr.isMarkedNotNull &&
// 'L extends List<T>' in Java is a List<T> in Kotlin, not a List<T?> // 'L extends List<T>' in Java is a List<T> in Kotlin, not a List<T?>
// nullability will be taken care of in individual member signatures // nullability will be taken care of in individual member signatures
(attr.howThisTypeIsUsed !in setOf(TYPE_ARGUMENT, UPPER_BOUND, SUPERTYPE_ARGUMENT, SUPERTYPE)) when (classifier()) {
is JavaClass -> attr.howThisTypeIsUsed !in setOf(TYPE_ARGUMENT, SUPERTYPE_ARGUMENT, SUPERTYPE)
is JavaTypeParameter -> attr.howThisTypeIsUsed !in setOf(TYPE_ARGUMENT, UPPER_BOUND, SUPERTYPE_ARGUMENT)
else -> true
}
} }
override fun isNullable(): Boolean = _nullable() override fun isNullable(): Boolean = _nullable()
} }