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

Added name filter to PackageFragmentProvider.getSubPackagesOf but do not know how to use it actually

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-01 12:32:06 +03:00
parent d744575000
commit 8d02c58e0a
11 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+2 -1
View File
@@ -38,6 +38,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName
import org.jetbrains.jet.descriptors.serialization.PackageData
import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava
import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
import org.jetbrains.jet.lang.resolve.name.Name
public class IncrementalPackageFragmentProvider(
sourceFiles: Collection<JetFile>,
@@ -81,7 +82,7 @@ public class IncrementalPackageFragmentProvider(
fqNamesToLoad.forEach { createPackageFragment(it) }
}
override fun getSubPackagesOf(fqName: FqName): Collection<FqName> {
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> {
return fqNameToSubFqNames[fqName].orEmpty()
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor
import org.jetbrains.jet.lang.resolve.name.FqName
import java.util.HashMap
import org.jetbrains.jet.lang.resolve.name.Name
public class MutablePackageFragmentProvider(public val module: ModuleDescriptor) : PackageFragmentProvider {
@@ -37,7 +38,7 @@ public class MutablePackageFragmentProvider(public val module: ModuleDescriptor)
override fun getPackageFragments(fqName: FqName)
= ContainerUtil.createMaybeSingletonList<PackageFragmentDescriptor>(fqNameToPackage.get(fqName))
override fun getSubPackagesOf(fqName: FqName) = subPackages[fqName]
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = subPackages[fqName]
public fun getOrCreateFragment(fqName: FqName): MutablePackageFragmentDescriptor {
if (!fqNameToPackage.containsKey(fqName)) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+3 -2
View File
@@ -143,7 +143,8 @@ public class ResolveSession implements KotlinCodeAnalyzer {
@NotNull
@Override
public Collection<FqName> getSubPackagesOf(@NotNull FqName fqName) {
public Collection<FqName> getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1<? super Name, ? extends Boolean> nameFilter) {
LazyPackageDescriptor packageDescriptor = getPackageFragment(fqName);
if (packageDescriptor == null) {
return Collections.emptyList();
@@ -457,7 +458,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
@NotNull LazyPackageDescriptor current
) {
result.add(current);
for (FqName subPackage : packageFragmentProvider.getSubPackagesOf(current.getFqName())) {
for (FqName subPackage : packageFragmentProvider.getSubPackagesOf(current.getFqName(), JetScope.ALL_NAME_FILTER)) {
LazyPackageDescriptor fragment = getPackageFragment(subPackage);
assert fragment != null : "Couldn't find fragment for " + subPackage;
collectAllPackages(result, fragment);
compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+2 -1
View File
@@ -211,7 +211,8 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
@NotNull
@Override
public Collection<FqName> getSubPackagesOf(@NotNull FqName fqName) {
public Collection<FqName> getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1<? super Name, ? extends Boolean> nameFilter) {
return Collections.emptyList();
}
});
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.*
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass
import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
import org.jetbrains.jet.lang.resolve.name.Name
public class LazyJavaPackageFragmentProvider(
outerContext: GlobalJavaResolverContext,
@@ -78,7 +79,7 @@ public class LazyJavaPackageFragmentProvider(
override fun getPackageFragments(fqName: FqName) = getPackageFragment(fqName)?.let {listOf(it)}.orEmpty()
override fun getSubPackagesOf(fqName: FqName) = getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty()
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty()
fun resolveKotlinBinaryClass(kotlinClass: KotlinJvmBinaryClass) = c.deserializedDescriptorResolver.resolveClass(kotlinClass)
core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt
+2 -2
View File
@@ -16,8 +16,8 @@
package org.jetbrains.jet.lang.descriptors
import org.jetbrains.annotations.ReadOnly
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.name.Name
public trait PackageFragmentProvider {
public fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor>
@@ -25,5 +25,5 @@ public trait PackageFragmentProvider {
/**
* @return declared subpackages of {@code fqName}
*/
public fun getSubPackagesOf(fqName: FqName): Collection<FqName>
public fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName>
}
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt
+3 -4
View File
@@ -21,8 +21,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
import org.jetbrains.jet.lang.resolve.name.FqName
import java.util.*
import kotlin.List
import kotlin.Collection
import org.jetbrains.jet.lang.resolve.name.Name
public class CompositePackageFragmentProvider(// can be modified from outside
private val providers: List<PackageFragmentProvider>) : PackageFragmentProvider {
@@ -36,10 +35,10 @@ public class CompositePackageFragmentProvider(// can be modified from outside
return result
}
override fun getSubPackagesOf(fqName: FqName): Collection<FqName> {
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> {
val result = HashSet<FqName>()
for (provider in providers) {
result.addAll(provider.getSubPackagesOf(fqName))
result.addAll(provider.getSubPackagesOf(fqName, nameFilter))
}
return result
}
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt
+1 -1
View File
@@ -37,7 +37,7 @@ public class SubpackagesScope(private val containingDeclaration: PackageViewDesc
override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName())
val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName(), nameFilter)
val result = ArrayList<DeclarationDescriptor>(subFqNames.size())
for (subFqName in subFqNames) {
result.addIfNotNull<DeclarationDescriptor>(getPackage(subFqName.shortName()))
core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt
+1 -1
View File
@@ -95,7 +95,7 @@ class BuiltinsPackageFragment(storageManager: StorageManager, module: ModuleDesc
override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor>
= if (KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME == fqName) listOf(this@BuiltinsPackageFragment) else listOf()
override fun getSubPackagesOf(fqName: FqName): Collection<FqName>
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName>
= if (fqName.isRoot()) setOf(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) else listOf()
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
+1 -1
View File
@@ -127,7 +127,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
return listOf(createDummyPackageFragment(fqName))
}
override fun getSubPackagesOf(fqName: FqName): Collection<FqName> {
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> {
throw UnsupportedOperationException("This method is not supposed to be called.")
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt
+1 -1
View File
@@ -56,7 +56,7 @@ private class PackageFragmentProviderForMissingDependencies(val moduleDescriptor
override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
return listOf(PackageFragmentWithMissingDependencies(fqName, moduleDescriptor))
}
override fun getSubPackagesOf(fqName: FqName): Collection<FqName> {
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> {
throw UnsupportedOperationException("This method is not supposed to be called.")
}
}