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

Replace another allowFlexible=false with isNotNullable

Browse Source 
Having field initilized doesn't make it inflexible in a sense
of mutability
This commit is contained in:
Denis Zharkov
2017-06-06 17:48:57 +03:00
parent a0268d23bb
commit 507eccc4ec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
+3 -3
View File
@@ -283,12 +283,12 @@ abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : MemberS
private fun getPropertyType(field: JavaField, annotations: Annotations): KotlinType { private fun getPropertyType(field: JavaField, annotations: Annotations): KotlinType {
// Fields do not have their own generic parameters. // Fields do not have their own generic parameters.
// Simple static constants should not have flexible types. // Simple static constants should not have flexible types.
val allowFlexible = !(field.isFinalStatic && field.hasConstantNotNullInitializer) val isNotNullable = !(field.isFinalStatic && field.hasConstantNotNullInitializer)
val propertyType = c.typeResolver.transformJavaType( val propertyType = c.typeResolver.transformJavaType(
field.type, field.type,
LazyJavaTypeAttributes(TypeUsage.COMMON, annotations, allowFlexible) LazyJavaTypeAttributes(TypeUsage.COMMON, annotations)
) )
if (!allowFlexible) { if (!isNotNullable) {
return TypeUtils.makeNotNullable(propertyType) return TypeUtils.makeNotNullable(propertyType)
} }