Merge branch 'appcode10' into merge_appcode10

[idea/community.git] / platform / lang-impl / src / com / intellij / ide / util / scopeChooser / ScopeChooserCombo.java

diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
index 848db213eb0a5d1d4217f141ec56f35d27b84d13..da3c035e0e8e0e37fb223cae968f5b3af41698bd 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
@@ -42,6 +42,7 @@ import com.intellij.psi.search.scope.packageSet.NamedScopeManager;
 import com.intellij.psi.search.scope.packageSet.NamedScopesHolder;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilBase;
+import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.ui.ComboboxWithBrowseButton;
 import com.intellij.usages.Usage;
 import com.intellij.usages.UsageView;
@@ -240,12 +241,12 @@ public class ScopeChooserCombo extends ComboboxWithBrowseButton implements Dispo
                   final List<PsiElement> elements = new ArrayList<PsiElement>();
                   final PsiElement[] children = parent.getChildren();
                   for (PsiElement child : children) {
-                    if (!(child instanceof PsiWhiteSpace)) {
+                    if (!(child instanceof PsiWhiteSpace) && child.getContainingFile() != null) {
                       elements.add(child);
                     }
                   }
                   if (!elements.isEmpty()) {
-                    SearchScope local = new LocalSearchScope(PsiUtilBase.toPsiElementArray(elements), IdeBundle.message("scope.selection"));
+                    SearchScope local = new LocalSearchScope(PsiUtilCore.toPsiElementArray(elements), IdeBundle.message("scope.selection"));
                     result.add(local);
                   }
                 }