hide "add import" popup when dumb mode starts (EA-97319 - INRE: FileBasedIndexImpl.handleDumbMode)

java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java

@@ -24,6 +24,7 @@ import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.codeInsight.hint.QuestionAction;
+import com.intellij.codeInsight.navigation.NavigationUtil;
 import com.intellij.ide.util.DefaultPsiElementCellRenderer;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
@@ -159,6 +160,7 @@ public class AddImportAction implements QuestionAction {
       }
     };
     popup.showInBestPositionFor(myEditor);
+    NavigationUtil.hidePopupIfDumbModeStarts(popup, myProject);
   }
 
   @Nullable

platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java

@@ -144,7 +144,12 @@ public final class NavigationUtil {
     builder.getScrollPane().setBorder(null);
     builder.getScrollPane().setViewportBorder(null);
 
-    Project project = elements[0].getProject();
+    hidePopupIfDumbModeStarts(popup, elements[0].getProject());
+
+    return popup;
+  }
+
+  public static void hidePopupIfDumbModeStarts(@NotNull JBPopup popup, @NotNull Project project) {
     if (!DumbService.isDumb(project)) {
       project.getMessageBus().connect(popup).subscribe(DumbService.DUMB_MODE, new DumbService.DumbModeListener() {
         @Override
@@ -153,8 +158,6 @@ public final class NavigationUtil {
         }
       });
     }
-
-    return popup;
   }
 
   public static boolean activateFileWithPsiElement(@NotNull PsiElement elt) {