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

LazyPackageFragmentScopeForJavaPackage uses name filter in getDescriptors() for classes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-30 22:06:37 +03:00
parent 5059ae5182
commit b08e444aa0
6 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt
+8 -5
View File
@@ -16,20 +16,23 @@
package org.jetbrains.jet.lang.resolve.java.structure.impl
import com.intellij.openapi.util.Condition
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiPackage
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
public class JavaPackageImpl(psiPackage: PsiPackage) : JavaElementImpl<PsiPackage>(psiPackage), JavaPackage {
override fun getClasses() = classes(getPsi().getClasses().filter { it.getName() != null })
override fun getClasses(nameFilter: (String) -> Boolean): MutableCollection<JavaClass> {
val psiClasses = getPsi().getClasses().filter {
val name = it.getName()
name != null && nameFilter(name)
}
return classes(psiClasses)
}
override fun getSubPackages() = packages(getPsi().getSubPackages())