From df411b59cd80658a950bf8b1e87a602651d18a0e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 11 Apr 2011 17:13:30 +0200
Subject: [PATCH] EA-26819 (fix + support for multi-scoped elements)

---
 .../VariableInIncompleteCodeSearcher.java     | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java
index e26b1f2a58d1..2dd838819ab3 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java
@@ -18,9 +18,9 @@ package com.intellij.psi.impl.search;
 import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.psi.*;
 import com.intellij.psi.search.LocalSearchScope;
+import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.psi.util.PsiElementFilter;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
@@ -38,24 +38,26 @@ public class VariableInIncompleteCodeSearcher extends QueryExecutorBase<PsiRefer
     final PsiElement refElement = p.getElementToSearch();
     if (!(refElement instanceof PsiLocalVariable || refElement instanceof PsiParameter)) return;
 
+    final String name = ((PsiVariable)refElement).getName();
+    if (name == null) return;
+
     final SearchScope scope = refElement.getUseScope();
-    if (scope instanceof LocalSearchScope) {
-      final PsiElement[] scopeElements = ((LocalSearchScope)scope).getScope();
-      if (scopeElements.length == 1) {
-        final String name = ((PsiVariable)refElement).getName();
-        PsiTreeUtil.collectElements(scopeElements[0], new PsiElementFilter() {
-          @Override
-          public boolean isAccepted(final PsiElement element) {
-            if (element instanceof PsiJavaCodeReferenceElement) {
-              final PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element;
-              if (name.equals(ref.getCanonicalText()) && ref.resolve() == null && ref.advancedResolve(true).getElement() == refElement) {
-                consumer.process(ref);
-              }
+    if (!(scope instanceof LocalSearchScope)) return;
+
+    final PsiElement[] scopeElements = ((LocalSearchScope)scope).getScope();
+    for (PsiElement scopeElement : scopeElements) {
+      PsiTreeUtil.processElements(scopeElement, new PsiElementProcessor() {
+        @Override
+        public boolean execute(final PsiElement element) {
+          if (element instanceof PsiJavaCodeReferenceElement) {
+            final PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element;
+            if (name.equals(ref.getCanonicalText()) && ref.resolve() == null && ref.advancedResolve(true).getElement() == refElement) {
+              consumer.process(ref);
             }
-            return false;
           }
-        });
-      }
+          return true;
+        }
+      });
     }
   }
 }