diff options
Diffstat (limited to 'platform/indexing-api/src/com/intellij/psi/stubs/StubIndex.java')
| -rw-r--r-- | platform/indexing-api/src/com/intellij/psi/stubs/StubIndex.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/platform/indexing-api/src/com/intellij/psi/stubs/StubIndex.java b/platform/indexing-api/src/com/intellij/psi/stubs/StubIndex.java index ce12c57e10d9..11074f83781f 100644 --- a/platform/indexing-api/src/com/intellij/psi/stubs/StubIndex.java +++ b/platform/indexing-api/src/com/intellij/psi/stubs/StubIndex.java @@ -26,6 +26,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiUtilCore; +import com.intellij.util.ObjectUtils; import com.intellij.util.Processor; import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.IdFilter; @@ -51,7 +52,7 @@ public abstract class StubIndex { public abstract <Key, Psi extends PsiElement> Collection<Psi> get(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull Project project, - final GlobalSearchScope scope); + @Nullable final GlobalSearchScope scope); /** * @deprecated use {@link #getElements(StubIndexKey, Object, com.intellij.openapi.project.Project, com.intellij.psi.search.GlobalSearchScope, Class)} @@ -59,7 +60,7 @@ public abstract class StubIndex { public <Key, Psi extends PsiElement> Collection<Psi> get(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull Project project, - final GlobalSearchScope scope, + @Nullable final GlobalSearchScope scope, IdFilter filter) { return get(indexKey, key, project, scope); } @@ -70,7 +71,7 @@ public abstract class StubIndex { public <Key, Psi extends PsiElement> boolean process(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull Project project, - GlobalSearchScope scope, + @Nullable GlobalSearchScope scope, @NotNull Processor<? super Psi> processor) { return processElements(indexKey, key, project, scope, (Class<Psi>)PsiElement.class, processor); } @@ -78,7 +79,7 @@ public abstract class StubIndex { public abstract <Key, Psi extends PsiElement> boolean processElements(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull Project project, - GlobalSearchScope scope, + @Nullable GlobalSearchScope scope, Class<Psi> requiredClass, @NotNull Processor<? super Psi> processor); @@ -88,8 +89,8 @@ public abstract class StubIndex { public <Key, Psi extends PsiElement> boolean process(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull Project project, - GlobalSearchScope scope, - IdFilter idFilter, + @Nullable GlobalSearchScope scope, + @SuppressWarnings("UnusedParameters") IdFilter idFilter, @NotNull Processor<? super Psi> processor) { return process(indexKey, key, project, scope, processor); } @@ -97,9 +98,9 @@ public abstract class StubIndex { public <Key, Psi extends PsiElement> boolean processElements(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull Project project, - GlobalSearchScope scope, + @Nullable GlobalSearchScope scope, IdFilter idFilter, - Class<Psi> requiredClass, + @NotNull Class<Psi> requiredClass, @NotNull Processor<? super Psi> processor) { return process(indexKey, key, project, scope, processor); } @@ -109,8 +110,9 @@ public abstract class StubIndex { public abstract <K> boolean processAllKeys(@NotNull StubIndexKey<K, ?> indexKey, @NotNull Project project, Processor<K> processor); - public <K> boolean processAllKeys(@NotNull StubIndexKey<K, ?> indexKey, Processor<K> processor, GlobalSearchScope scope, @Nullable IdFilter idFilter) { - return processAllKeys(indexKey, scope.getProject(), processor); + public <K> boolean processAllKeys(@NotNull StubIndexKey<K, ?> indexKey, @NotNull Processor<K> processor, + @NotNull GlobalSearchScope scope, @Nullable IdFilter idFilter) { + return processAllKeys(indexKey, ObjectUtils.assertNotNull(scope.getProject()), processor); } /** @@ -127,7 +129,7 @@ public abstract class StubIndex { public static <Key, Psi extends PsiElement> Collection<Psi> getElements(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull final Project project, - final GlobalSearchScope scope, + @Nullable final GlobalSearchScope scope, @NotNull Class<Psi> requiredClass) { return getElements(indexKey, key, project, scope, null, requiredClass); } @@ -135,7 +137,7 @@ public abstract class StubIndex { public static <Key, Psi extends PsiElement> Collection<Psi> getElements(@NotNull StubIndexKey<Key, Psi> indexKey, @NotNull Key key, @NotNull final Project project, - final GlobalSearchScope scope, + @Nullable final GlobalSearchScope scope, @Nullable IdFilter idFilter, @NotNull Class<Psi> requiredClass) { //noinspection deprecation |