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

Minor. Drop unused property

Browse Source
This commit is contained in:
Denis Zharkov
2016-01-25 13:56:35 +03:00
parent 8e3bdd6a0f
commit 08dd675fcd
2 changed files with 0 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/lazy/types/LazyJavaTypeResolver.kt
-3
View File
@@ -275,9 +275,6 @@ class LazyJavaTypeResolver(
override val isTypeVariable: Boolean = lowerBound.getConstructor() == upperBound.getConstructor() override val isTypeVariable: Boolean = lowerBound.getConstructor() == upperBound.getConstructor()
&& lowerBound.getConstructor().getDeclarationDescriptor() is TypeParameterDescriptor && lowerBound.getConstructor().getDeclarationDescriptor() is TypeParameterDescriptor
override val typeParameterDescriptor: TypeParameterDescriptor? =
if (isTypeVariable) lowerBound.getConstructor().getDeclarationDescriptor() as TypeParameterDescriptor else null
override fun substitutionResult(replacement: KotlinType): KotlinType { override fun substitutionResult(replacement: KotlinType): KotlinType {
return if (replacement.isFlexible()) replacement return if (replacement.isFlexible()) replacement
else create(replacement, TypeUtils.makeNullable(replacement)) else create(replacement, TypeUtils.makeNullable(replacement))
core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt
-3
View File
@@ -66,9 +66,6 @@ fun oneMoreSpecificThanAnother(a: KotlinType, b: KotlinType) =
interface CustomTypeVariable : TypeCapability { interface CustomTypeVariable : TypeCapability {
val isTypeVariable: Boolean val isTypeVariable: Boolean
// If typeParameterDescriptor != null <=> isTypeVariable == true, this is not a type variable
val typeParameterDescriptor: TypeParameterDescriptor?
// Throws an exception when isTypeVariable == false // Throws an exception when isTypeVariable == false
fun substitutionResult(replacement: KotlinType): KotlinType fun substitutionResult(replacement: KotlinType): KotlinType
} }