From 98f8e9f6f0c78e40a2f7c540ff3d36045e42b675 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 16 May 2014 17:29:44 +0200 Subject: [PATCH] don't highlight if psi was invalidated (EA-56385 - PIEAE: PsiUtilCore.ensureValid) --- .../codeHighlighting/TextEditorHighlightingPass.java | 2 +- .../daemon/impl/ProgressableTextEditorHighlightingPass.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java index 77231dd883b8..741ba29c7583 100644 --- a/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java +++ b/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java @@ -74,7 +74,7 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass { return myDumb; } - private boolean isValid() { + protected boolean isValid() { if (isDumbMode() && !DumbService.isDumbAware(this)) { return false; } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java index f5a264403c78..e9d9d6a18808 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java @@ -72,6 +72,11 @@ public abstract class ProgressableTextEditorHighlightingPass extends TextEditorH return impl; } + @Override + protected boolean isValid() { + return super.isValid() && (myFile == null || myFile.isValid()); + } + private void sessionFinished() { advanceProgress(Math.max(1, myProgressLimit - myProgressCount.get())); }