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

No need for applyNullability()

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-24 19:50:02 +04:00
parent 4a15c6728d
commit 2f2332bfe2
1 changed files with 9 additions and 12 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
+9 -12
View File
@@ -44,8 +44,7 @@ class LazyJavaTypeResolver(
private val c: LazyJavaResolverContext, private val c: LazyJavaResolverContext,
private val typeParameterResolver: TypeParameterResolver private val typeParameterResolver: TypeParameterResolver
) { ) {
private val NOT_NULL_POSITIONS = setOf(TYPE_ARGUMENT, UPPER_BOUND, SUPERTYPE_ARGUMENT, SUPERTYPE)
public fun transformJavaType(javaType: JavaType, attr: JavaTypeAttributes): JetType { public fun transformJavaType(javaType: JavaType, attr: JavaTypeAttributes): JetType {
return when (javaType) { return when (javaType) {
is JavaPrimitiveType -> { is JavaPrimitiveType -> {
@@ -54,8 +53,8 @@ class LazyJavaTypeResolver(
assert(jetType != null, "Primitive type is not found: " + canonicalText) assert(jetType != null, "Primitive type is not found: " + canonicalText)
return jetType!! return jetType!!
} }
is JavaClassifierType -> LazyJavaClassifierType(javaType, attr).applyNullablility(attr) is JavaClassifierType -> LazyJavaClassifierType(javaType, attr)
is JavaArrayType -> transformArrayType(javaType, attr).applyNullablility(attr) is JavaArrayType -> transformArrayType(javaType, attr)
else -> throw UnsupportedOperationException("Unsupported type: " + javaType) else -> throw UnsupportedOperationException("Unsupported type: " + javaType)
} }
} }
@@ -74,13 +73,6 @@ class LazyJavaTypeResolver(
return TypeUtils.makeNullable(KotlinBuiltIns.getInstance().getArrayType(projectionKind, componentType)) return TypeUtils.makeNullable(KotlinBuiltIns.getInstance().getArrayType(projectionKind, componentType))
} }
private fun JetType.applyNullablility(attr: JavaTypeAttributes): JetType {
if (attr.howThisTypeIsUsed in NOT_NULL_POSITIONS) {
return TypeUtils.makeNotNullable(this)
}
return this
}
private fun transformToTypeProjection( private fun transformToTypeProjection(
javaType: JavaType, javaType: JavaType,
attr: JavaTypeAttributes, attr: JavaTypeAttributes,
@@ -174,7 +166,12 @@ class LazyJavaTypeResolver(
return (descriptor as ClassDescriptor).getMemberScope(getArguments()) return (descriptor as ClassDescriptor).getMemberScope(getArguments())
} }
private val _nullable = c.storageManager.createLazyValue { !attr.isMarkedNotNull } private val _nullable = c.storageManager.createLazyValue {
!attr.isMarkedNotNull &&
// '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
(attr.howThisTypeIsUsed !in setOf(TYPE_ARGUMENT, UPPER_BOUND, SUPERTYPE_ARGUMENT, SUPERTYPE))
}
override fun isNullable(): Boolean = _nullable() override fun isNullable(): Boolean = _nullable()
} }
} }