From 58e173056e507ba0aab796dce2e0143b01ca212e Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 3 Jul 2013 12:08:28 +0200 Subject: [PATCH] NPE (IDEA-109927) --- .../intellij/psi/search/scope/packageSet/PatternPackageSet.java | 2 +- .../psi/search/scope/packageSet/FilePatternPackageSet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/openapi/src/com/intellij/psi/search/scope/packageSet/PatternPackageSet.java b/java/openapi/src/com/intellij/psi/search/scope/packageSet/PatternPackageSet.java index ebefeef67853..7950e60f1a81 100644 --- a/java/openapi/src/com/intellij/psi/search/scope/packageSet/PatternPackageSet.java +++ b/java/openapi/src/com/intellij/psi/search/scope/packageSet/PatternPackageSet.java @@ -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) { diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java index b2d0d5bb51fe..89aee72d1115 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java @@ -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); }