diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 7f244c5d4e98..e35e343c58da 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -632,6 +632,10 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { final ProjectFileIndex index = ProjectRootManager.getInstance(myManager.getProject()).getFileIndex(); final MultiMap result = new MultiMap(); for (Set key : singles.keySet()) { + if (key.isEmpty()) { + continue; + } + final Collection data = singles.get(key); GlobalSearchScope commonScope = uniteScopes(data); @@ -643,7 +647,8 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { if (first) { intersection = local; first = false; - } else { + } + else { for (VirtualFile file : local.keySet()) { if (intersection.containsKey(file)) { intersection.putValues(file, local.get(file));