From 0583e244b0c97df2d5eed6a8ed301ce1c90cf767 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 30 Mar 2017 15:37:38 +0200 Subject: [PATCH] check if env is outdated when showing Add Import hint "later" (EA-97609 - TDDE: TraceableDisposable.throwDisposalError) --- .../intellij/codeInsight/daemon/impl/ShowAutoImportPass.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 a4751bfa57fa..9dc01f965b3f 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 @@ -23,6 +23,7 @@ import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings; import com.intellij.codeInsight.daemon.ReferenceImporter; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.HintAction; +import com.intellij.injected.editor.EditorWindow; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.IdeActions; @@ -80,7 +81,9 @@ public class ShowAutoImportPass extends TextEditorHighlightingPass { Application application = ApplicationManager.getApplication(); application.assertIsDispatchThread(); if (!application.isUnitTestMode() && !myEditor.getContentComponent().hasFocus()) return; - if (DumbService.isDumb(myProject)) return; + if (DumbService.isDumb(myProject) || !myFile.isValid()) return; + if (myEditor.isDisposed() || myEditor instanceof EditorWindow && !((EditorWindow)myEditor).isValid()) return; + int caretOffset = myEditor.getCaretModel().getOffset(); importUnambiguousImports(caretOffset); List visibleHighlights = getVisibleHighlights(myStartOffset, myEndOffset, myProject, myEditor);