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

package scope when package is inside package prefix should contain classes with "subnames" (IDEA-82937)

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-14 14:41:27 +04:00
parent 9d25d530fb
commit 4879868fef
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/search/PackageScope.java
+19 -1
View File
@@ -25,6 +25,9 @@ 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 org.jetbrains.annotations.NotNull;
@@ -35,6 +38,9 @@ public class PackageScope extends GlobalSearchScope {
private final PsiPackage myPackage;
private final boolean myIncludeSubpackages;
private final boolean myIncludeLibraries;
protected final boolean myPartOfPackagePrefix;
protected final String myPackageQualifiedName;
protected final String myPackageQNamePrefix;
public PackageScope(@NotNull PsiPackage aPackage, boolean includeSubpackages, final boolean includeLibraries) {
super(aPackage.getProject());
@@ -42,8 +48,12 @@ public class PackageScope extends GlobalSearchScope {
myIncludeSubpackages = includeSubpackages;
Project project = myPackage.getProject();
myDirs = PackageIndex.getInstance(project).getDirsByPackageName(myPackage.getQualifiedName(), true).findAll();
myPackageQualifiedName = myPackage.getQualifiedName();
myDirs = PackageIndex.getInstance(project).getDirsByPackageName(myPackageQualifiedName, true).findAll();
myIncludeLibraries = includeLibraries;
myPartOfPackagePrefix = JavaPsiFacade.getInstance(getProject()).isPartOfPackagePrefix(myPackageQualifiedName);
myPackageQNamePrefix = myPackageQualifiedName + ".";
}
@Override
@@ -54,6 +64,14 @@ public class PackageScope extends GlobalSearchScope {
: Comparing.equal(file.getParent(), scopeDir);
if (inDir) return true;
}
if (myPartOfPackagePrefix && myIncludeSubpackages) {
final PsiFile psiFile = myPackage.getManager().findFile(file);
if (psiFile instanceof PsiClassOwner) {
final String packageName = ((PsiClassOwner)psiFile).getPackageName();
if (myPackageQualifiedName.equals(packageName) ||
packageName.startsWith(myPackageQNamePrefix)) return true;
}
}
return false;
}