From ee0ae51110969fc25c2338e8f632f041838bf75a Mon Sep 17 00:00:00 2001
From: Gregory Shrago <Gregory.Shrago@jetbrains.com>
Date: Wed, 30 Jun 2010 20:45:15 +0400
Subject: [PATCH] ref search optimization

---
 .../PropertyReferenceViaLastWordSearcher.java | 63 +++++++------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/plugins/properties/src/com/intellij/psi/impl/search/PropertyReferenceViaLastWordSearcher.java b/plugins/properties/src/com/intellij/psi/impl/search/PropertyReferenceViaLastWordSearcher.java
index 34dea465eb47..54dd87a04e46 100644
--- a/plugins/properties/src/com/intellij/psi/impl/search/PropertyReferenceViaLastWordSearcher.java
+++ b/plugins/properties/src/com/intellij/psi/impl/search/PropertyReferenceViaLastWordSearcher.java
@@ -16,66 +16,45 @@
 package com.intellij.psi.impl.search;
 
 import com.intellij.lang.properties.psi.Property;
-import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiReference;
-import com.intellij.psi.ReferenceRange;
-import com.intellij.psi.search.*;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.SearchScope;
+import com.intellij.psi.search.UsageSearchContext;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.Processor;
-import com.intellij.util.QueryExecutor;
 
 import java.util.List;
 
 /**
  * @author ven
  */
-public class PropertyReferenceViaLastWordSearcher implements QueryExecutor<PsiReference, ReferencesSearch.SearchParameters> {
+public class PropertyReferenceViaLastWordSearcher extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> {
+  public PropertyReferenceViaLastWordSearcher() {
+    super(true);
+  }
+
   // add to the search results occurences in JSPs of the last word in the property name, since this stuff is possible:
   // <bla:bla ref.key="lastWord> (can reference to xxx.lastWord property)
 
-  public boolean execute(final ReferencesSearch.SearchParameters queryParameters, final Processor<PsiReference> consumer) {
+  @Override
+  public void processQuery(ReferencesSearch.SearchParameters queryParameters, Processor<PsiReference> consumer) {
     final PsiElement refElement = queryParameters.getElementToSearch();
-    if (refElement instanceof Property) {
-      final String name = ((Property)refElement).getName();
-      if (name == null) return true;
-      final List<String> words = StringUtil.getWordsIn(name);
-      if (words.isEmpty()) return true;
-      final String lastWord = words.get(words.size() - 1);
+    if (!(refElement instanceof Property)) return;
 
-      SearchScope searchScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
-        public SearchScope compute() {
-          return queryParameters.getEffectiveSearchScope();
-        }
-      });
-      if (searchScope instanceof GlobalSearchScope) {
-        searchScope = GlobalSearchScope.getScopeRestrictedByFileTypes((GlobalSearchScope)searchScope, StdFileTypes.JSP, StdFileTypes.JSPX);
-      }
-      final PsiSearchHelper helper = PsiManager.getInstance(refElement.getProject()).getSearchHelper();
-      final TextOccurenceProcessor processor = new TextOccurenceProcessor() {
-        public boolean execute(PsiElement element, int offsetInElement) {
-          ProgressManager.checkCanceled();
-          final PsiReference[] refs = element.getReferences();
-          for (PsiReference ref : refs) {
-            if (ReferenceRange.containsOffsetInElement(ref, offsetInElement) && ref.isReferenceTo(refElement)) {
-              return consumer.process(ref);
-            }
-            ProgressManager.checkCanceled();
-          }
-          return true;
-        }
-      };
+    final String name = ((Property)refElement).getName();
+    if (name == null) return;
+    final List<String> words = StringUtil.getWordsIn(name);
+    if (words.isEmpty()) return;
+    final String lastWord = words.get(words.size() - 1);
 
-      if (!helper.processElementsWithWord(processor, searchScope, lastWord, UsageSearchContext.IN_FOREIGN_LANGUAGES, false)) {
-        return false;
-      }
+    SearchScope searchScope = queryParameters.getEffectiveSearchScope();
+    if (searchScope instanceof GlobalSearchScope) {
+      searchScope = GlobalSearchScope.getScopeRestrictedByFileTypes((GlobalSearchScope)searchScope, StdFileTypes.JSP, StdFileTypes.JSPX);
     }
-
-    return true;
+    queryParameters.getOptimizer().searchWord(lastWord, searchScope, UsageSearchContext.IN_FOREIGN_LANGUAGES, false, refElement);
   }
 }