From 8205c4a8ba9890b42f0c931b4c77650261513dfd Mon Sep 17 00:00:00 2001
From: Nikolay Kuznetsov <Nikolay.Kuznetsov@jetbrains.com>
Date: Mon, 12 Feb 2018 16:54:31 +0100
Subject: [PATCH] Also wait for CalcThread termination when reopening search
 everywhere popup

(cherry picked from commit 9ba2c48 in Rider fork)
---
 .../src/com/intellij/ide/actions/SearchEverywhereAction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
index 1f8ae1be9e49..b8559edde183 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -2223,8 +2223,8 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
           myPopup = null;
           myHistoryIndex = 0;
           myPopupActualWidth = 0;
-          myCurrentWorker = ActionCallback.DONE;
           showAll.set(false);
+          myCurrentWorker = myCalcThread.cancel();
           myCalcThread = null;
           myEditor = null;
           myFileEditor = null;