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

Added filtering in subpackages scope

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-01 12:59:34 +03:00
parent 8d02c58e0a
commit a8bd7caed1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt
+6 -2
View File
@@ -24,7 +24,6 @@ import org.jetbrains.jet.utils.*
import java.util.ArrayList import java.util.ArrayList
import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.jetbrains.jet.lang.resolve.scopes.JetScope.DescriptorKind
public class SubpackagesScope(private val containingDeclaration: PackageViewDescriptor) : JetScopeImpl() { public class SubpackagesScope(private val containingDeclaration: PackageViewDescriptor) : JetScopeImpl() {
override fun getContainingDeclaration(): DeclarationDescriptor { override fun getContainingDeclaration(): DeclarationDescriptor {
@@ -37,10 +36,15 @@ public class SubpackagesScope(private val containingDeclaration: PackageViewDesc
override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean, override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> { nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
if (!kindFilter(JetScope.DescriptorKind.PACKAGE)) return listOf()
val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName(), nameFilter) val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName(), nameFilter)
val result = ArrayList<DeclarationDescriptor>(subFqNames.size()) val result = ArrayList<DeclarationDescriptor>(subFqNames.size())
for (subFqName in subFqNames) { for (subFqName in subFqNames) {
result.addIfNotNull<DeclarationDescriptor>(getPackage(subFqName.shortName())) val shortName = subFqName.shortName()
if (nameFilter(shortName)) {
result.addIfNotNull(getPackage(shortName))
}
} }
return result return result
} }