From 2039075ee029034537c170d173faabacefe655ee Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 30 May 2013 16:55:27 +0400
Subject: [PATCH] cleanup

---
 .../psi/impl/search/LowLevelSearchUtil.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
index fbf027c42b48..7082b0edfd9e 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
@@ -20,6 +20,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
@@ -48,9 +49,9 @@ public class LowLevelSearchUtil {
   private static Boolean processInjectedFile(PsiElement element,
                                              final TextOccurenceProcessor processor,
                                              final StringSearcher searcher,
-                                             ProgressIndicator progress) {
+                                             ProgressIndicator progress,
+                                             InjectedLanguageManager injectedLanguageManager) {
     if (!(element instanceof PsiLanguageInjectionHost)) return null;
-    InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(element.getProject());
     if (injectedLanguageManager == null) return null;
     List<Pair<PsiElement,TextRange>> list = injectedLanguageManager.getInjectedPsiFiles(element);
     if (list == null) return null;
@@ -61,7 +62,8 @@ public class LowLevelSearchUtil {
     return Boolean.TRUE;
   }
 
-  private static boolean processTreeUp(@NotNull TextOccurenceProcessor processor,
+  private static boolean processTreeUp(@NotNull Project project,
+                                       @NotNull TextOccurenceProcessor processor,
                                        @NotNull PsiElement scope,
                                        @NotNull StringSearcher searcher,
                                        final int offset,
@@ -93,13 +95,13 @@ public class LowLevelSearchUtil {
       start = offset - leafElement.getTextRange().getStartOffset() + scopeStartOffset;
     }
     if (start < 0) {
-      LOG.error("offset=" + offset + " scopeStartOffset=" + scopeStartOffset + " leafElement=" + leafElement + " " +
-                                  " scope=" + scope.toString());
+      LOG.error("offset=" + offset + " scopeStartOffset=" + scopeStartOffset + " leafElement=" + leafElement + "  scope=" + scope);
     }
     boolean contains = false;
     PsiElement prev = null;
     TreeElement prevNode = null;
     PsiElement run = null;
+    InjectedLanguageManager injectedLanguageManager = InjectedLanguageManager.getInstance(project);
     while (run != scope) {
       if (progress != null) progress.checkCanceled();
       if (useTree) {
@@ -115,7 +117,7 @@ public class LowLevelSearchUtil {
       if (!contains) contains = run.getTextLength() - start >= patternLength;  //do not compute if already contains
       if (contains) {
         if (processInjectedPsi) {
-          Boolean result = processInjectedFile(run, processor, searcher, progress);
+          Boolean result = processInjectedFile(run, processor, searcher, progress, injectedLanguageManager);
           if (result != null) {
             return result.booleanValue();
           }
@@ -139,7 +141,7 @@ public class LowLevelSearchUtil {
   }
   //@RequiresReadAction
   public static boolean processElementsContainingWordInElement(@NotNull TextOccurenceProcessor processor,
-                                                               @NotNull PsiElement scope,
+                                                               @NotNull final PsiElement scope,
                                                                @NotNull StringSearcher searcher,
                                                                final boolean processInjectedPsi,
                                                                ProgressIndicator progress) {
@@ -162,13 +164,14 @@ public class LowLevelSearchUtil {
 
     final char[] bufferArray = CharArrayUtil.fromSequenceWithoutCopying(buffer);
 
+    Project project = file.getProject();
     do {
       if (progress != null) progress.checkCanceled();
       startOffset  = searchWord(buffer, bufferArray, startOffset, endOffset, searcher, progress);
       if (startOffset < 0) {
         return true;
       }
-      if (!processTreeUp(processor, scope, searcher, startOffset - scopeStart, processInjectedPsi, progress)) return false;
+      if (!processTreeUp(project, processor, scope, searcher, startOffset - scopeStart, processInjectedPsi, progress)) return false;
 
       startOffset++;
     }