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

Do not force calculation of lower and upper bounds in java flexible type.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-04-22 22:02:14 +03:00
parent 45ac1d2cb5
commit f9130ae133
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+2 -2
View File
@@ -306,8 +306,8 @@ class LazyJavaTypeResolver(
return super.getCapability(capabilityClass) return super.getCapability(capabilityClass)
} }
override val isTypeVariable: Boolean = lowerBound.constructor == upperBound.constructor override val isTypeVariable: Boolean get() = lowerBound.constructor.declarationDescriptor is TypeParameterDescriptor
&& lowerBound.constructor.declarationDescriptor is TypeParameterDescriptor && lowerBound.constructor == upperBound.constructor
override fun substitutionResult(replacement: KotlinType): KotlinType { override fun substitutionResult(replacement: KotlinType): KotlinType {
return if (replacement.isFlexible()) replacement return if (replacement.isFlexible()) replacement