diff --git a/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java b/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java index 9f32bbc32655..c8282195e3be 100644 --- a/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java @@ -101,10 +101,12 @@ public class PredefinedSearchScopeProviderImpl extends PredefinedSearchScopeProv result.add(module.getModuleScope()); } } - if (dataContextElement.getContainingFile() != null) { - result.add(new LocalSearchScope(dataContextElement, IdeBundle.message("scope.current.file"))); - } } + PsiElement[] currentFileScope = PsiElement.EMPTY_ARRAY; + if (dataContextElement != null && dataContextElement.getContainingFile() != null) { + currentFileScope = new PsiElement[]{dataContextElement}; + } + result.add(new LocalSearchScope(currentFileScope, IdeBundle.message("scope.current.file"))); } if (currentSelection) {