Minor: remove unused method
This commit is contained in:
+4
-28
@@ -17,24 +17,21 @@
|
|||||||
package org.jetbrains.jet.lang.resolve.lazy.declarations;
|
package org.jetbrains.jet.lang.resolve.lazy.declarations;
|
||||||
|
|
||||||
import com.google.common.base.Predicate;
|
import com.google.common.base.Predicate;
|
||||||
import com.google.common.collect.*;
|
import com.google.common.collect.Collections2;
|
||||||
import com.intellij.psi.NavigatablePsiElement;
|
import com.google.common.collect.HashMultimap;
|
||||||
import com.intellij.util.Function;
|
import com.google.common.collect.Multimap;
|
||||||
import com.intellij.util.containers.ContainerUtil;
|
import com.google.common.collect.Sets;
|
||||||
import kotlin.Function0;
|
import kotlin.Function0;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
import org.jetbrains.jet.lang.psi.JetPackageDirective;
|
import org.jetbrains.jet.lang.psi.JetPackageDirective;
|
||||||
import org.jetbrains.jet.lang.psi.JetPsiUtil;
|
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
|
import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||||
import org.jetbrains.jet.lang.resolve.name.NamePackage;
|
|
||||||
import org.jetbrains.jet.storage.NotNullLazyValue;
|
import org.jetbrains.jet.storage.NotNullLazyValue;
|
||||||
import org.jetbrains.jet.storage.StorageManager;
|
import org.jetbrains.jet.storage.StorageManager;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory {
|
public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory {
|
||||||
@@ -94,27 +91,6 @@ public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProv
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/*package*/ Collection<NavigatablePsiElement> getPackageDeclarations(@NotNull final FqName fqName) {
|
|
||||||
if (fqName.isRoot()) {
|
|
||||||
return Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
Collection<NavigatablePsiElement> resultElements = Lists.newArrayList();
|
|
||||||
for (FqName declaredPackage : index.invoke().filesByPackage.keys()) {
|
|
||||||
if (NamePackage.isSubpackageOf(declaredPackage, fqName)) {
|
|
||||||
Collection<JetFile> files = index.invoke().filesByPackage.get(declaredPackage);
|
|
||||||
resultElements.addAll(ContainerUtil.map(files, new Function<JetFile, NavigatablePsiElement>() {
|
|
||||||
@Override
|
|
||||||
public NavigatablePsiElement fun(JetFile file) {
|
|
||||||
return JetPsiUtil.getPackageReference(file, NamePackage.numberOfSegments(fqName) - 1);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return resultElements;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
protected PackageMemberDeclarationProvider createPackageMemberDeclarationProvider(@NotNull FqName packageFqName) {
|
protected PackageMemberDeclarationProvider createPackageMemberDeclarationProvider(@NotNull FqName packageFqName) {
|
||||||
|
|||||||
-7
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.lang.resolve.lazy.declarations;
|
package org.jetbrains.jet.lang.resolve.lazy.declarations;
|
||||||
|
|
||||||
import com.intellij.psi.NavigatablePsiElement;
|
|
||||||
import kotlin.Function0;
|
import kotlin.Function0;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.jet.lang.psi.JetDeclaration;
|
import org.jetbrains.jet.lang.psi.JetDeclaration;
|
||||||
@@ -69,12 +68,6 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
|
|||||||
return allDeclaredSubPackages.invoke();
|
return allDeclaredSubPackages.invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public Collection<NavigatablePsiElement> getPackageDeclarations(@NotNull FqName fqName) {
|
|
||||||
return factory.getPackageDeclarations(fqName);
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public Collection<JetFile> getPackageFiles() {
|
public Collection<JetFile> getPackageFiles() {
|
||||||
|
|||||||
-5
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.lang.resolve.lazy.declarations;
|
package org.jetbrains.jet.lang.resolve.lazy.declarations;
|
||||||
|
|
||||||
import com.intellij.psi.NavigatablePsiElement;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.ReadOnly;
|
import org.jetbrains.annotations.ReadOnly;
|
||||||
import org.jetbrains.jet.lang.psi.JetFile;
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
@@ -30,10 +29,6 @@ public interface PackageMemberDeclarationProvider extends DeclarationProvider {
|
|||||||
@NotNull
|
@NotNull
|
||||||
Collection<FqName> getAllDeclaredSubPackages();
|
Collection<FqName> getAllDeclaredSubPackages();
|
||||||
|
|
||||||
@ReadOnly
|
|
||||||
@NotNull
|
|
||||||
Collection<NavigatablePsiElement> getPackageDeclarations(@NotNull FqName fqName);
|
|
||||||
|
|
||||||
@ReadOnly
|
@ReadOnly
|
||||||
@NotNull
|
@NotNull
|
||||||
Collection<JetFile> getPackageFiles();
|
Collection<JetFile> getPackageFiles();
|
||||||
|
|||||||
-6
@@ -16,18 +16,12 @@
|
|||||||
|
|
||||||
package org.jetbrains.jet.plugin.stubindex.resolve
|
package org.jetbrains.jet.plugin.stubindex.resolve
|
||||||
|
|
||||||
import com.intellij.psi.NavigatablePsiElement
|
|
||||||
import org.jetbrains.jet.lang.psi.*
|
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedPackageMemberDeclarationProvider
|
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
|
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName
|
|
||||||
import org.jetbrains.jet.lang.resolve.name.Name
|
import org.jetbrains.jet.lang.resolve.name.Name
|
||||||
|
|
||||||
public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
|
public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
|
||||||
override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
|
override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
|
||||||
|
|
||||||
override fun getPackageDeclarations(fqName: FqName) = providers.flatMap { it.getPackageDeclarations(fqName) }
|
|
||||||
|
|
||||||
override fun getPackageFiles() = providers.flatMap { it.getPackageFiles() }
|
override fun getPackageFiles() = providers.flatMap { it.getPackageFiles() }
|
||||||
|
|
||||||
override fun getAllDeclarations() = providers.flatMap { it.getAllDeclarations() }
|
override fun getAllDeclarations() = providers.flatMap { it.getAllDeclarations() }
|
||||||
|
|||||||
-17
@@ -17,20 +17,15 @@
|
|||||||
package org.jetbrains.jet.plugin.stubindex.resolve
|
package org.jetbrains.jet.plugin.stubindex.resolve
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.psi.NavigatablePsiElement
|
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
import com.intellij.psi.stubs.StringStubIndexExtension
|
import com.intellij.psi.stubs.StringStubIndexExtension
|
||||||
import org.jetbrains.jet.lang.psi.*
|
import org.jetbrains.jet.lang.psi.*
|
||||||
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
|
import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
|
||||||
import org.jetbrains.jet.lang.resolve.name.FqName
|
import org.jetbrains.jet.lang.resolve.name.FqName
|
||||||
import org.jetbrains.jet.lang.resolve.name.Name
|
import org.jetbrains.jet.lang.resolve.name.Name
|
||||||
import org.jetbrains.jet.plugin.stubindex.JetAllPackagesIndex
|
|
||||||
import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex
|
import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex
|
||||||
import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionsFqnNameIndex
|
import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionsFqnNameIndex
|
||||||
import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertiesFqnNameIndex
|
import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertiesFqnNameIndex
|
||||||
import java.util.*
|
|
||||||
import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope.kotlinSources
|
|
||||||
import org.jetbrains.jet.lang.resolve.name.numberOfSegments
|
|
||||||
import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil
|
import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil
|
||||||
|
|
||||||
public class StubBasedPackageMemberDeclarationProvider(
|
public class StubBasedPackageMemberDeclarationProvider(
|
||||||
@@ -63,18 +58,6 @@ public class StubBasedPackageMemberDeclarationProvider(
|
|||||||
return PackageIndexUtil.getSubPackageFqNames(fqName, searchScope, project)
|
return PackageIndexUtil.getSubPackageFqNames(fqName, searchScope, project)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getPackageDeclarations(fqName: FqName): Collection<NavigatablePsiElement> {
|
|
||||||
if (fqName.isRoot()) {
|
|
||||||
return Collections.emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
val files = JetAllPackagesIndex.getInstance().get(fqName.asString(), project, searchScope)
|
|
||||||
return files.map {
|
|
||||||
file ->
|
|
||||||
JetPsiUtil.getPackageReference(file, fqName.numberOfSegments() - 1)
|
|
||||||
}.filterNotNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getPackageFiles(): Collection<JetFile> {
|
override fun getPackageFiles(): Collection<JetFile> {
|
||||||
return PackageIndexUtil.findFilesWithExactPackage(fqName, searchScope, project)
|
return PackageIndexUtil.findFilesWithExactPackage(fqName, searchScope, project)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,16 +81,4 @@ public class JetStubResolveTest extends LightCodeInsightFixtureTestCase {
|
|||||||
assertSize(1, testProperties);
|
assertSize(1, testProperties);
|
||||||
assertEquals("val test = 12", testProperties.get(0).getText());
|
assertEquals("val test = 12", testProperties.get(0).getText());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testGetPackageByIntermediatePartition() {
|
|
||||||
myFixture.configureByText(JetFileType.INSTANCE, "package first.second.third");
|
|
||||||
|
|
||||||
StubBasedPackageMemberDeclarationProvider provider = new StubBasedPackageMemberDeclarationProvider(
|
|
||||||
new FqName("first.second"), getProject(), GlobalSearchScope.projectScope(getProject()));
|
|
||||||
|
|
||||||
Collection<NavigatablePsiElement> packageDeclarations = provider.getPackageDeclarations(new FqName("first.second"));
|
|
||||||
|
|
||||||
assertSize(1, packageDeclarations);
|
|
||||||
assertEquals("second", packageDeclarations.iterator().next().getText());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user