Remove JavaClass.getAllMethods()/getAllFields()
Their behavior is different in PSI and reflection (two things that this interface is supposed to unify), so there's no point in making it interface methods, rather we should just walk supertype hierarchy manually Also make JavaClassImpl.getSupertypes() invoke PsiClass.getSuperTypes(), because it also contains java.lang.Object for interfaces, which makes equals/hashCode/toString appear in interfaces' getAllMethods() as well
This commit is contained in:
+1
-1
@@ -161,7 +161,7 @@ class LazyJavaClassDescriptor(
|
||||
supertype ->
|
||||
c.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes())
|
||||
}
|
||||
.filter { supertype -> !supertype.isError() }
|
||||
.filter { supertype -> !supertype.isError() && !KotlinBuiltIns.getInstance().isAnyOrNullableAny(supertype) }
|
||||
.toList()
|
||||
.ifEmpty {
|
||||
listOf(KotlinBuiltIns.getInstance().getAnyType())
|
||||
|
||||
+29
-6
@@ -17,12 +17,10 @@
|
||||
package org.jetbrains.jet.lang.resolve.java.lazy.descriptors
|
||||
|
||||
import org.jetbrains.jet.lang.resolve.name.Name
|
||||
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod
|
||||
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
|
||||
import org.jetbrains.jet.lang.resolve.java.structure.*
|
||||
import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils
|
||||
import org.jetbrains.jet.lang.resolve.java.structure.JavaField
|
||||
import org.jetbrains.jet.lang.resolve.java.structure.JavaMember
|
||||
import org.jetbrains.jet.utils.valuesToMap
|
||||
import java.util.HashSet
|
||||
|
||||
trait MemberIndex {
|
||||
fun findMethodsByName(name: Name): Collection<JavaMethod>
|
||||
@@ -50,8 +48,33 @@ open class ClassMemberIndex(val jClass: JavaClass, val memberFilter: (JavaMember
|
||||
private val fields = jClass.getFields().stream().filter(memberFilter).valuesToMap { m -> m.getName() }
|
||||
|
||||
override fun findMethodsByName(name: Name): Collection<JavaMethod> = methods[name] ?: listOf()
|
||||
override fun getAllMethodNames(): Collection<Name> = jClass.getAllMethods().stream().filter(methodFilter).map { m -> m.getName() }.toList()
|
||||
override fun getAllMethodNames(): Collection<Name> = jClass.getAllMemberNames(methodFilter) { getMethods() }
|
||||
|
||||
override fun findFieldByName(name: Name): JavaField? = fields[name]
|
||||
override fun getAllFieldNames() = jClass.getAllFields().stream().filter(memberFilter).map { m -> m.getName() }.toList()
|
||||
override fun getAllFieldNames(): Collection<Name> = jClass.getAllMemberNames(memberFilter) { getFields() }
|
||||
}
|
||||
|
||||
private fun <M : JavaMember> JavaClass.getAllMemberNames(filter: (M) -> Boolean, getMembers: JavaClass.() -> Collection<M>): Set<Name> {
|
||||
val result = HashSet<Name>()
|
||||
val visitedSuperClasses = HashSet<JavaClass>()
|
||||
|
||||
fun JavaClass.visit(): Unit {
|
||||
if (!visitedSuperClasses.add(this)) return
|
||||
|
||||
for (member in getMembers()) {
|
||||
if (filter(member)) {
|
||||
result.add(member.getName())
|
||||
}
|
||||
}
|
||||
|
||||
for (supertype in getSupertypes()) {
|
||||
val classifier = supertype.getClassifier()
|
||||
if (classifier is JavaClass) {
|
||||
classifier.visit()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.visit()
|
||||
return result
|
||||
}
|
||||
|
||||
-6
@@ -44,15 +44,9 @@ public interface JavaClass extends JavaClassifier, JavaTypeParameterListOwner, J
|
||||
@NotNull
|
||||
Collection<JavaMethod> getMethods();
|
||||
|
||||
@NotNull
|
||||
Collection<JavaMethod> getAllMethods();
|
||||
|
||||
@NotNull
|
||||
Collection<JavaField> getFields();
|
||||
|
||||
@NotNull
|
||||
Collection<JavaField> getAllFields();
|
||||
|
||||
@NotNull
|
||||
Collection<JavaConstructor> getConstructors();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user