From 614d5a60614ba5e02ecf93a9e838f6dbfd1e8b6a Mon Sep 17 00:00:00 2001
From: peter <peter.gromov@jetbrains.com>
Date: Sat, 26 Jun 2010 22:10:05 +0400
Subject: [PATCH] a better NPE fix

---
 .../java/stubs/index/JavaAnnotationIndex.java    |  2 +-
 .../JavaAnonymousClassBaseRefOccurenceIndex.java |  2 +-
 .../java/stubs/index/JavaFieldNameIndex.java     |  2 +-
 .../java/stubs/index/JavaFullClassNameIndex.java |  2 +-
 .../java/stubs/index/JavaMethodNameIndex.java    |  2 +-
 .../stubs/index/JavaShortClassNameIndex.java     |  2 +-
 .../search/JavaDirectInheritorsSearcher.java     |  3 ++-
 .../impl/search/JavaLikeSourceFilterScope.java   |  2 +-
 .../psi/impl/search/JavaSourceFilterScope.java   |  7 +++----
 .../psi/search/DelegatingGlobalSearchScope.java  |  5 ++---
 .../intellij/psi/search/GlobalSearchScope.java   |  2 +-
 .../MethodLateBoundReferencesSearcher.java       |  2 +-
 .../psi/impl/search/GrSourceFilterScope.java     |  7 +++----
 .../psi/stubs/index/GrFullClassNameIndex.java    |  2 +-
 .../psi/stubs/index/GrFullScriptNameIndex.java   |  2 +-
 .../groovy/lang/stubs/GroovyShortNamesCache.java | 16 ++++++++--------
 16 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnnotationIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnnotationIndex.java
index 6428cc7e84d0..2ce053ead3bc 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnnotationIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnnotationIndex.java
@@ -41,6 +41,6 @@ public class JavaAnnotationIndex extends StringStubIndexExtension<PsiAnnotation>
   }
 
   public Collection<PsiAnnotation> get(final String s, final Project project, final GlobalSearchScope scope) {
-    return super.get(s, project, new JavaSourceFilterScope(scope, project));
+    return super.get(s, project, new JavaSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java
index c6d35310964b..5fa30893ce37 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java
@@ -42,6 +42,6 @@ public class JavaAnonymousClassBaseRefOccurenceIndex extends StringStubIndexExte
   }
 
   public Collection<PsiAnonymousClass> get(final String s, final Project project, final GlobalSearchScope scope) {
-    return super.get(s, project, new JavaSourceFilterScope(scope, project));
+    return super.get(s, project, new JavaSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
index d11206f57bb4..d88f4c854411 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
@@ -41,6 +41,6 @@ public class JavaFieldNameIndex extends StringStubIndexExtension<PsiField> {
   }
 
   public Collection<PsiField> get(final String s, final Project project, final GlobalSearchScope scope) {
-    return super.get(s, project, new JavaSourceFilterScope(scope, project));
+    return super.get(s, project, new JavaSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
index aa6d5ef3f7c5..dafbbf73c826 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
@@ -41,6 +41,6 @@ public class JavaFullClassNameIndex extends IntStubIndexExtension<PsiClass> {
   }
 
   public Collection<PsiClass> get(final Integer integer, final Project project, final GlobalSearchScope scope) {
-    return super.get(integer, project, new JavaSourceFilterScope(scope, project));
+    return super.get(integer, project, new JavaSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
index 1d9c9825db6b..245cdf11ad2e 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
@@ -41,6 +41,6 @@ public class JavaMethodNameIndex extends StringStubIndexExtension<PsiMethod> {
   }
 
   public Collection<PsiMethod> get(final String s, final Project project, final GlobalSearchScope scope) {
-    return super.get(s, project, new JavaSourceFilterScope(scope, project));
+    return super.get(s, project, new JavaSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
index bda87a6fcbda..cdd7e62ddf3f 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
@@ -41,7 +41,7 @@ public class JavaShortClassNameIndex extends StringStubIndexExtension<PsiClass>
   }
 
   public Collection<PsiClass> get(final String s, final Project project, final GlobalSearchScope scope) {
-    return super.get(s, project, new JavaSourceFilterScope(scope, project));
+    return super.get(s, project, new JavaSourceFilterScope(scope));
   }
 
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
index ed00226744fb..5340828d80fe 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
@@ -12,6 +12,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiManagerImpl;
 import com.intellij.psi.impl.java.stubs.index.JavaAnonymousClassBaseRefOccurenceIndex;
 import com.intellij.psi.impl.java.stubs.index.JavaSuperClassNameOccurenceIndex;
+import com.intellij.psi.search.EverythingGlobalScope;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.searches.AllClassesSearch;
@@ -60,7 +61,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
       });
     }
 
-    final GlobalSearchScope scope = useScope instanceof GlobalSearchScope ? (GlobalSearchScope)useScope : null;
+    final GlobalSearchScope scope = useScope instanceof GlobalSearchScope ? (GlobalSearchScope)useScope : new EverythingGlobalScope(psiManager.getProject());
     final String searchKey = aClass.getName();
     if (StringUtil.isEmpty(searchKey)) {
       return true;
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaLikeSourceFilterScope.java b/java/java-impl/src/com/intellij/psi/impl/search/JavaLikeSourceFilterScope.java
index 2851806b46f5..402ed0d5cb6a 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaLikeSourceFilterScope.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/JavaLikeSourceFilterScope.java
@@ -34,7 +34,7 @@ public class JavaLikeSourceFilterScope extends JavaSourceFilterScope {
   private final ProjectFileIndex myIndex;
 
   public JavaLikeSourceFilterScope(final GlobalSearchScope delegate, final Project project) {
-    super(delegate, project);
+    super(delegate);
     myDelegate = delegate;
     myIndex = ProjectRootManager.getInstance(project).getFileIndex();
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java b/java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
index 86f72f7179b2..3b4b0195c707 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
@@ -21,7 +21,6 @@ package com.intellij.psi.impl.search;
 
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -31,9 +30,9 @@ import com.intellij.psi.search.GlobalSearchScope;
 public class JavaSourceFilterScope extends DelegatingGlobalSearchScope {
   private final ProjectFileIndex myIndex;
 
-  public JavaSourceFilterScope(final GlobalSearchScope delegate, final Project project) {
-    super(delegate, project);
-    myIndex = ProjectRootManager.getInstance(project).getFileIndex();
+  public JavaSourceFilterScope(final GlobalSearchScope delegate) {
+    super(delegate);
+    myIndex = ProjectRootManager.getInstance(getProject()).getFileIndex();
   }
 
   public boolean contains(final VirtualFile file) {
diff --git a/platform/lang-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java b/platform/lang-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
index 4d3479d953ab..20579a2fa4a8 100644
--- a/platform/lang-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
+++ b/platform/lang-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
@@ -1,7 +1,6 @@
 package com.intellij.psi.search;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,8 +10,8 @@ import org.jetbrains.annotations.NotNull;
 public class DelegatingGlobalSearchScope extends GlobalSearchScope {
   protected final GlobalSearchScope myBaseScope;
 
-  public DelegatingGlobalSearchScope(GlobalSearchScope baseScope, Project project) {
-    super(project);
+  public DelegatingGlobalSearchScope(@NotNull GlobalSearchScope baseScope) {
+    super(baseScope.getProject());
     myBaseScope = baseScope;
   }
 
diff --git a/platform/lang-api/src/com/intellij/psi/search/GlobalSearchScope.java b/platform/lang-api/src/com/intellij/psi/search/GlobalSearchScope.java
index fe8f70f39fa3..fee30d2568e2 100644
--- a/platform/lang-api/src/com/intellij/psi/search/GlobalSearchScope.java
+++ b/platform/lang-api/src/com/intellij/psi/search/GlobalSearchScope.java
@@ -534,7 +534,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
     private final FileType[] myFileTypes;
 
     private FileTypeRestrictionScope(@NotNull GlobalSearchScope scope, @NotNull FileType[] fileTypes) {
-      super(scope, scope.getProject());
+      super(scope);
       myFileTypes = fileTypes;
     }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
index eb495e907bcb..99e7eb839eeb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
@@ -62,7 +62,7 @@ public class MethodLateBoundReferencesSearcher extends QueryExecutorBase<PsiRefe
       final VirtualFile vfile = file.getOriginalFile().getVirtualFile();
       final Project project = method.getProject();
       if (vfile != null && ProjectRootManager.getInstance(project).getFileIndex().isInSource(vfile)) {
-        return new GrSourceFilterScope((GlobalSearchScope)scope, project);
+        return new GrSourceFilterScope((GlobalSearchScope)scope);
       }
     }
     return scope;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java
index 35f3d2a0ed83..b7b606ad84bb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.groovy.lang.psi.impl.search;
 
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -30,9 +29,9 @@ import org.jetbrains.plugins.groovy.GroovyFileType;
 public class GrSourceFilterScope extends DelegatingGlobalSearchScope {
   private final ProjectFileIndex myIndex;
 
-  public GrSourceFilterScope(@NotNull final GlobalSearchScope delegate, final Project project) {
-    super(delegate, project);
-    myIndex = ProjectRootManager.getInstance(project).getFileIndex();
+  public GrSourceFilterScope(@NotNull final GlobalSearchScope delegate) {
+    super(delegate);
+    myIndex = ProjectRootManager.getInstance(getProject()).getFileIndex();
   }
 
   public boolean contains(final VirtualFile file) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullClassNameIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullClassNameIndex.java
index 9a5bb3a35b98..c4022cd66acb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullClassNameIndex.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullClassNameIndex.java
@@ -40,6 +40,6 @@ public class GrFullClassNameIndex extends IntStubIndexExtension<PsiClass> {
   }
 
   public Collection<PsiClass> get(final Integer integer, final Project project, final GlobalSearchScope scope) {
-    return super.get(integer, project, new GrSourceFilterScope(scope, project));
+    return super.get(integer, project, new GrSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullScriptNameIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullScriptNameIndex.java
index c999da717cf9..ce802738f9bc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullScriptNameIndex.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/index/GrFullScriptNameIndex.java
@@ -40,6 +40,6 @@ public class GrFullScriptNameIndex extends IntStubIndexExtension<GroovyFile> {
   }
 
   public Collection<GroovyFile> get(final Integer integer, final Project project, final GlobalSearchScope scope) {
-    return super.get(integer, project, new GrSourceFilterScope(scope, project));
+    return super.get(integer, project, new GrSourceFilterScope(scope));
   }
 }
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java
index 4e250a68265f..16222a9ee4fc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java
@@ -52,7 +52,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
 
   @NotNull
   public PsiClass[] getClassesByName(@NotNull @NonNls String name, @NotNull GlobalSearchScope scope) {
-    final Collection<? extends PsiElement> plainClasses = StubIndex.getInstance().get(GrShortClassNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope, myProject));
+    final Collection<? extends PsiElement> plainClasses = StubIndex.getInstance().get(GrShortClassNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope));
     Collection<PsiClass> allClasses = getAllScriptClasses(name, scope);
     if (allClasses.isEmpty() && plainClasses.isEmpty()) return PsiClass.EMPTY_ARRAY;
 
@@ -65,7 +65,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
 
   @Nullable
   public PsiClass getClassByFQName(@NotNull @NonNls String name, @NotNull GlobalSearchScope scope) {
-    final Collection<PsiElement> classes = new ArrayList<PsiElement>(StubIndex.getInstance().get(GrFullClassNameIndex.KEY, name.hashCode(), myProject, new GrSourceFilterScope(scope, myProject)));
+    final Collection<PsiElement> classes = new ArrayList<PsiElement>(StubIndex.getInstance().get(GrFullClassNameIndex.KEY, name.hashCode(), myProject, new GrSourceFilterScope(scope)));
     final Collection<PsiClass> scriptClasses = getScriptClassesByFQName(name, scope);
     classes.addAll(scriptClasses);
     for (PsiElement clazz : classes) {
@@ -79,7 +79,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
   }
 
   public Collection<PsiClass> getScriptClassesByFQName(final String name, final GlobalSearchScope scope) {
-    Collection<GroovyFile> scripts = StubIndex.getInstance().get(GrFullScriptNameIndex.KEY, name.hashCode(), myProject, new GrSourceFilterScope(scope, myProject));
+    Collection<GroovyFile> scripts = StubIndex.getInstance().get(GrFullScriptNameIndex.KEY, name.hashCode(), myProject, new GrSourceFilterScope(scope));
     scripts = ContainerUtil.findAll(scripts, new Condition<GroovyFile>() {
       public boolean value(final GroovyFile groovyFile) {
         final PsiClass clazz = groovyFile.getScriptClass();
@@ -97,7 +97,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
   public PsiClass[] getClassesByFQName(@NotNull @NonNls String name, @NotNull GlobalSearchScope scope) {
     final Collection<PsiClass> result = getScriptClassesByFQName(name, scope);
 
-    final Collection<? extends PsiElement> classes = StubIndex.getInstance().get(GrFullClassNameIndex.KEY, name.hashCode(), myProject, new GrSourceFilterScope(scope, myProject));
+    final Collection<? extends PsiElement> classes = StubIndex.getInstance().get(GrFullClassNameIndex.KEY, name.hashCode(), myProject, new GrSourceFilterScope(scope));
     if (!classes.isEmpty()) {
       //hashcode doesn't guarantee equals
       for (PsiElement psiClass : classes) {
@@ -111,7 +111,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
   }
 
   private Collection<PsiClass> getAllScriptClasses(String name, GlobalSearchScope scope) {
-    Collection<GroovyFile> files = StubIndex.getInstance().get(GrScriptClassNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope, myProject));
+    Collection<GroovyFile> files = StubIndex.getInstance().get(GrScriptClassNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope));
     files = ContainerUtil.findAll(files, new Condition<GroovyFile>() {
       public boolean value(GroovyFile groovyFile) {
         return groovyFile.isScript();
@@ -143,8 +143,8 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
 
   @NotNull
   public PsiMethod[] getMethodsByName(@NonNls @NotNull String name, @NotNull GlobalSearchScope scope) {
-    final Collection<? extends PsiMethod> methods = StubIndex.getInstance().get(GrMethodNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope, myProject));
-    final Collection<? extends PsiMethod> annMethods = StubIndex.getInstance().get(GrAnnotationMethodNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope, myProject));
+    final Collection<? extends PsiMethod> methods = StubIndex.getInstance().get(GrMethodNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope));
+    final Collection<? extends PsiMethod> annMethods = StubIndex.getInstance().get(GrAnnotationMethodNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope));
     if (methods.isEmpty() && annMethods.isEmpty()) return PsiMethod.EMPTY_ARRAY;
     return ArrayUtil
         .mergeArrays(annMethods.toArray(new PsiMethod[annMethods.size()]), methods.toArray(new PsiMethod[methods.size()]), PsiMethod.class);
@@ -168,7 +168,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache {
 
   @NotNull
   public PsiField[] getFieldsByName(@NotNull @NonNls String name, @NotNull GlobalSearchScope scope) {
-    final Collection<? extends PsiField> fields = StubIndex.getInstance().get(GrFieldNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope, myProject));
+    final Collection<? extends PsiField> fields = StubIndex.getInstance().get(GrFieldNameIndex.KEY, name, myProject, new GrSourceFilterScope(scope));
     if (fields.isEmpty()) return PsiField.EMPTY_ARRAY;
     return fields.toArray(new PsiField[fields.size()]);
   }