From 8a908f16f35fc2ed98fbc9a4498e8bfec78633a3 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Thu, 3 Dec 2015 20:28:30 +0300
Subject: [PATCH] avoid flickering of editor search field background on text
 typing (regression after commit ef82524)

---
 .../lang-impl/src/com/intellij/find/EditorSearchSession.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java b/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java
index 813128c79b7e..d3c518acca7e 100644
--- a/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java
+++ b/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java
@@ -160,7 +160,7 @@ public class EditorSearchSession implements SearchSession,
           myFindModel.setWholeWordsOnly(false);
         }
         updateUIWithFindModel();
-        clearSearchResults();
+        mySearchResults.clear();
         updateResults(true);
         FindUtil.updateFindInFileModel(getProject(), myFindModel);
       }
@@ -236,6 +236,7 @@ public class EditorSearchSession implements SearchSession,
 
   @Override
   public void searchResultsUpdated(SearchResults sr) {
+    if (sr.getFindModel() == null) return;
     if (myComponent.getSearchTextComponent().getText().isEmpty()) {
       updateUIWithEmptyResults();
     } else {