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

Take care of Java's constructor type parameters

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-24 19:56:57 +04:00
parent 2f2332bfe2
commit c13b77d94c
1 changed files with 18 additions and 2 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
+18 -2
View File
@@ -39,6 +39,9 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner
import org.jetbrains.jet.lang.resolve.java.lazy.* import org.jetbrains.jet.lang.resolve.java.lazy.*
import org.jetbrains.jet.storage.* import org.jetbrains.jet.storage.*
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod
import java.util.HashSet
import org.jetbrains.jet.lang.types.checker.JetTypeChecker
class LazyJavaTypeResolver( class LazyJavaTypeResolver(
private val c: LazyJavaResolverContext, private val c: LazyJavaResolverContext,
@@ -142,8 +145,21 @@ class LazyJavaTypeResolver(
?: ErrorUtils.createErrorTypeConstructor("Unresolved java classifier: " + javaType.getPresentableText()) ?: ErrorUtils.createErrorTypeConstructor("Unresolved java classifier: " + javaType.getPresentableText())
} }
is JavaTypeParameter -> { is JavaTypeParameter -> {
typeParameterResolver.resolveTypeParameter(classifier)?.getTypeConstructor() val owner = classifier.getOwner()
?: ErrorUtils.createErrorTypeConstructor("Unresolved Java type parameter: " + javaType.getPresentableText()) if (owner is JavaMethod && owner.isConstructor()) {
// If a Java-constructor declares its own type parameters, we have no way of directly expressing them in Kotlin,
// so we replace thwm by intersections of their upper bounds
var supertypesJet = HashSet<JetType>()
for (supertype in classifier.getUpperBounds()) {
supertypesJet.add(transformJavaType(supertype, UPPER_BOUND.toAttributes()))
}
TypeUtils.intersect(JetTypeChecker.INSTANCE, supertypesJet)?.getConstructor()
?: ErrorUtils.createErrorTypeConstructor("Can't intersect upper bounds of " + javaType.getPresentableText())
}
else {
typeParameterResolver.resolveTypeParameter(classifier)?.getTypeConstructor()
?: ErrorUtils.createErrorTypeConstructor("Unresolved Java type parameter: " + javaType.getPresentableText())
}
} }
else -> throw IllegalStateException("Unknown classifier kind: $classifier") else -> throw IllegalStateException("Unknown classifier kind: $classifier")
} }