Minor: fix misleading method name

This commit is contained in:
Pavel V. Talanov
2014-03-18 17:21:23 +04:00
parent ece6c8ebfe
commit 97b4c57f0e
5 changed files with 8 additions and 9 deletions
@@ -154,7 +154,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
if (packageDescriptor == null) {
return Collections.emptyList();
}
return packageDescriptor.getDeclarationProvider().getAllDeclaredPackages();
return packageDescriptor.getDeclarationProvider().getAllDeclaredSubPackages();
}
};
@@ -32,7 +32,7 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
private final FqName fqName;
private final FileBasedDeclarationProviderFactory factory;
private final Collection<JetFile> packageFiles;
private final NotNullLazyValue<Collection<FqName>> allDeclaredPackages;
private final NotNullLazyValue<Collection<FqName>> allDeclaredSubPackages;
/*package*/ FileBasedPackageMemberDeclarationProvider(
@@ -45,7 +45,7 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
this.fqName = _fqName;
this.factory = _factory;
this.packageFiles = packageFiles;
this.allDeclaredPackages = storageManager.createLazyValue(new Function0<Collection<FqName>>() {
this.allDeclaredSubPackages = storageManager.createLazyValue(new Function0<Collection<FqName>>() {
@Override
public Collection<FqName> invoke() {
return factory.getAllDeclaredSubPackagesOf(fqName);
@@ -65,8 +65,8 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
@NotNull
@Override
public Collection<FqName> getAllDeclaredPackages() {
return allDeclaredPackages.invoke();
public Collection<FqName> getAllDeclaredSubPackages() {
return allDeclaredSubPackages.invoke();
}
@NotNull
@@ -26,10 +26,9 @@ import java.util.Collection;
public interface PackageMemberDeclarationProvider extends DeclarationProvider {
//TODO: method name
@ReadOnly
@NotNull
Collection<FqName> getAllDeclaredPackages();
Collection<FqName> getAllDeclaredSubPackages();
@ReadOnly
@NotNull
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.name.Name
public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
override fun getAllDeclaredPackages() = providers.flatMap { it.getAllDeclaredPackages() }
override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
override fun getPackageDeclarations(fqName: FqName) = providers.flatMap { it.getPackageDeclarations(fqName) }
@@ -58,7 +58,7 @@ public class StubBasedPackageMemberDeclarationProvider(
return JetTopLevelPropertiesFqnNameIndex.getInstance().get(childName(name), project, searchScope)
}
override fun getAllDeclaredPackages(): Collection<FqName> {
override fun getAllDeclaredSubPackages(): Collection<FqName> {
//TODO: duplication with light class generation support
val allPackagesInProject = JetAllPackagesIndex.getInstance().getAllKeys(project)
return allPackagesInProject.filter {