MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

speed up PackageScope.contains

Browse Source
This commit is contained in:
peter
2016-04-04 14:38:39 +02:00
parent 4142ca0e32
commit d32d32fbc1
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/search/PackageScope.java
+14 -10
View File
@@ -22,19 +22,18 @@ package com.intellij.psi.search;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.PackageIndex;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClassOwner;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiPackage;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Set;
public class PackageScope extends GlobalSearchScope {
private final Collection<VirtualFile> myDirs;
private final Set<VirtualFile> myDirs;
private final PsiPackage myPackage;
private final boolean myIncludeSubpackages;
private final boolean myIncludeLibraries;
@@ -49,7 +48,8 @@ public class PackageScope extends GlobalSearchScope {
Project project = myPackage.getProject();
myPackageQualifiedName = myPackage.getQualifiedName();
myDirs = PackageIndex.getInstance(project).getDirsByPackageName(myPackageQualifiedName, true).findAll();
myDirs = ContainerUtil.newHashSet(
PackageIndex.getInstance(project).getDirsByPackageName(myPackageQualifiedName, true).findAll());
myIncludeLibraries = includeLibraries;
myPartOfPackagePrefix = JavaPsiFacade.getInstance(getProject()).isPartOfPackagePrefix(myPackageQualifiedName);
@@ -58,12 +58,16 @@ public class PackageScope extends GlobalSearchScope {
@Override
public boolean contains(@NotNull VirtualFile file) {
for (VirtualFile scopeDir : myDirs) {
boolean inDir = myIncludeSubpackages
? VfsUtilCore.isAncestor(scopeDir, file, false)
: Comparing.equal(file.getParent(), scopeDir);
if (inDir) return true;
VirtualFile parent = file.getParent();
if (!myIncludeSubpackages) {
if (myDirs.contains(parent)) return true;
} else {
while (parent != null) {
if (myDirs.contains(parent)) return true;
parent = parent.getParent();
}
}
if (myPartOfPackagePrefix && myIncludeSubpackages) {
final PsiFile psiFile = myPackage.getManager().findFile(file);
if (psiFile instanceof PsiClassOwner) {