From 2de95dae36b674a2481aba3062e6d65bc6a1ef01 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 19 Apr 2016 14:23:39 +0200 Subject: [PATCH] check for sudden dumb mode in on-the-fly import (IDEA-154934) --- .../daemon/impl/DefaultHighlightInfoProcessor.java | 7 +++++-- .../codeInsight/daemon/impl/ShowAutoImportPass.java | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightInfoProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightInfoProcessor.java index 0c3b88741e06..10d387268e71 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightInfoProcessor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightInfoProcessor.java @@ -25,6 +25,7 @@ import com.intellij.openapi.editor.ex.MarkupModelEx; import com.intellij.openapi.editor.impl.DocumentMarkupModel; import com.intellij.openapi.editor.impl.EditorMarkupModelImpl; import com.intellij.openapi.editor.markup.MarkupModel; +import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ProperTextRange; import com.intellij.openapi.util.TextRange; @@ -67,8 +68,10 @@ public class DefaultHighlightInfoProcessor extends HighlightInfoProcessor { } if (editor != null && !editor.isDisposed()) { // usability: show auto import popup as soon as possible - new ShowAutoImportPass(project, psiFile, editor).addImports(); - + if (!DumbService.isDumb(project)) { + new ShowAutoImportPass(project, psiFile, editor).addImports(); + } + DaemonListeners.repaintErrorStripeRenderer(editor, project); } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java index 84588369bd9a..5db40f31ab5f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java @@ -78,8 +78,6 @@ public class ShowAutoImportPass extends TextEditorHighlightingPass { } public void addImports() { - if (!isValid()) return; - Application application = ApplicationManager.getApplication(); application.assertIsDispatchThread(); if (!application.isUnitTestMode() && !myEditor.getContentComponent().hasFocus()) return;