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

Minor. Merge TypeUsage::MEMBER_SIGNATURE_INVARIANT and COMMON

Browse Source 
Their usages are effectively the same
This commit is contained in:
Denis Zharkov
2017-06-06 16:17:56 +03:00
parent 69e70575f9
commit 5ca3459a0f
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java
-1
View File
@@ -23,7 +23,6 @@ package org.jetbrains.kotlin.load.java.components;
public enum TypeUsage { public enum TypeUsage {
MEMBER_SIGNATURE_COVARIANT, MEMBER_SIGNATURE_COVARIANT,
MEMBER_SIGNATURE_CONTRAVARIANT, MEMBER_SIGNATURE_CONTRAVARIANT,
MEMBER_SIGNATURE_INVARIANT,
SUPERTYPE, SUPERTYPE,
COMMON COMMON
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+1 -1
View File
@@ -132,7 +132,7 @@ class LazyJavaAnnotationDescriptor(
// Class type is never nullable in 'Foo.class' in Java // Class type is never nullable in 'Foo.class' in Java
val type = TypeUtils.makeNotNullable(c.typeResolver.transformJavaType( val type = TypeUtils.makeNotNullable(c.typeResolver.transformJavaType(
javaType, javaType,
TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes(allowFlexible = false)) TypeUsage.COMMON.toAttributes(allowFlexible = false))
) )
val jlClass = c.module.resolveTopLevelClass(FqName("java.lang.Class"), NoLookupLocation.FOR_NON_TRACKED_SCOPE) ?: return null val jlClass = c.module.resolveTopLevelClass(FqName("java.lang.Class"), NoLookupLocation.FOR_NON_TRACKED_SCOPE) ?: return null
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+1 -1
View File
@@ -561,7 +561,7 @@ class LazyJavaClassMemberScope(
val methods = jClass.methods val methods = jClass.methods
val result = ArrayList<ValueParameterDescriptor>(methods.size) val result = ArrayList<ValueParameterDescriptor>(methods.size)
val attr = TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes(allowFlexible = false, isForAnnotationParameter = true) val attr = TypeUsage.COMMON.toAttributes(allowFlexible = false, isForAnnotationParameter = true)
val (methodsNamedValue, otherMethods) = methods. val (methodsNamedValue, otherMethods) = methods.
partition { it.name == JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME } partition { it.name == JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME }
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
+1 -1
View File
@@ -286,7 +286,7 @@ abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : MemberS
val allowFlexible = !(field.isFinalStatic && field.hasConstantNotNullInitializer) val allowFlexible = !(field.isFinalStatic && field.hasConstantNotNullInitializer)
val propertyType = c.typeResolver.transformJavaType( val propertyType = c.typeResolver.transformJavaType(
field.type, field.type,
LazyJavaTypeAttributes(TypeUsage.MEMBER_SIGNATURE_INVARIANT, annotations, allowFlexible) LazyJavaTypeAttributes(TypeUsage.COMMON, annotations, allowFlexible)
) )
if (!allowFlexible) { if (!allowFlexible) {
return TypeUtils.makeNotNullable(propertyType) return TypeUtils.makeNotNullable(propertyType)
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt
+2 -2
View File
@@ -85,9 +85,9 @@ class RawTypeImpl(lowerBound: SimpleType, upperBound: SimpleType) : FlexibleType
internal object RawSubstitution : TypeSubstitution() { internal object RawSubstitution : TypeSubstitution() {
override fun get(key: KotlinType) = TypeProjectionImpl(eraseType(key)) override fun get(key: KotlinType) = TypeProjectionImpl(eraseType(key))
private val lowerTypeAttr = TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes() private val lowerTypeAttr = TypeUsage.COMMON.toAttributes()
.computeAttributes(allowFlexible = false, isRaw = true, forLower = true) .computeAttributes(allowFlexible = false, isRaw = true, forLower = true)
private val upperTypeAttr = TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes() private val upperTypeAttr = TypeUsage.COMMON.toAttributes()
.computeAttributes(allowFlexible = false, isRaw = true, forLower = false) .computeAttributes(allowFlexible = false, isRaw = true, forLower = false)
fun eraseType(type: KotlinType): KotlinType { fun eraseType(type: KotlinType): KotlinType {