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

If all supertypes are errors, do not leave the supertype list empty

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-07 18:49:17 +04:00
parent 6915773150
commit b16b9c58e1
1 changed files with 4 additions and 1 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/descriptors/LazyJavaClassDescriptor.kt
+4 -1
View File
@@ -146,7 +146,7 @@ class LazyJavaClassDescriptor(
else { else {
val jlObject = innerC.javaClassResolver.resolveClassByFqName(JavaSupertypeResolver.OBJECT_FQ_NAME)?.getDefaultType() val jlObject = innerC.javaClassResolver.resolveClassByFqName(JavaSupertypeResolver.OBJECT_FQ_NAME)?.getDefaultType()
// If java.lang.Object is not found, we simply use Any to recover // If java.lang.Object is not found, we simply use Any to recover
emptyOrSingletonList(jlObject ?: KotlinBuiltIns.getInstance().getAnyType()) listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType())
} }
else else
supertypes.iterator() supertypes.iterator()
@@ -156,6 +156,9 @@ class LazyJavaClassDescriptor(
} }
.filter { supertype -> !supertype.isError() } .filter { supertype -> !supertype.isError() }
.toList() .toList()
.ifEmpty {
listOf(KotlinBuiltIns.getInstance().getAnyType())
}
} }
override fun getSupertypes(): Collection<JetType> = _supertypes() override fun getSupertypes(): Collection<JetType> = _supertypes()