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

NPE (IDEA-109927)

Browse Source
This commit is contained in:
anna
2013-07-03 12:10:29 +02:00
parent 7136890f21
commit 58e173056e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/psi/search/scope/packageSet/PatternPackageSet.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class PatternPackageSet extends PatternBasedPackageSet {
@Override
public boolean contains(VirtualFile file, @NotNull Project project, @Nullable NamedScopesHolder holder) {
ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
return matchesScope(file, holder.getProject(), fileIndex) && (myPattern == null || myPattern.matcher(getPackageName(file, fileIndex)).matches());
return matchesScope(file, project, fileIndex) && (myPattern == null || myPattern.matcher(getPackageName(file, fileIndex)).matches());
}
private boolean matchesScope(VirtualFile file, Project project, ProjectFileIndex fileIndex) {
platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class FilePatternPackageSet extends PatternBasedPackageSet {
@Override
public boolean contains(VirtualFile file, @NotNull Project project, @Nullable NamedScopesHolder holder) {
ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
return file != null && fileMatcher(file, fileIndex, holder.getProjectBaseDir()) &&
return file != null && fileMatcher(file, fileIndex, holder != null ? holder.getProjectBaseDir() : project.getBaseDir()) &&
matchesModule(myModuleGroupPattern, myModulePattern, file, fileIndex);
}