MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't run highlighting passes when psi has changed even if there were no document changes (EA-78650 - PIEAE: PsiUtilCore.ensureValid)

Browse Source
This commit is contained in:
peter
2016-02-09 17:38:25 +01:00
parent 587335822f
commit 85814a6f30
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
+10 -3
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
@@ -40,7 +41,8 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
@Nullable protected final Document myDocument;
@NotNull protected final Project myProject;
private final boolean myRunIntentionPassAfter;
private final long myInitialStamp;
private final long myInitialDocStamp;
private final long myInitialPsiStamp;
private volatile int[] myCompletionPredecessorIds = ArrayUtil.EMPTY_INT_ARRAY;
private volatile int[] myStartingPredecessorIds = ArrayUtil.EMPTY_INT_ARRAY;
private volatile int myId;
@@ -51,7 +53,8 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
myDocument = document;
myProject = project;
myRunIntentionPassAfter = runIntentionPassAfter;
myInitialStamp = document == null ? 0 : document.getModificationStamp();
myInitialDocStamp = document == null ? 0 : document.getModificationStamp();
myInitialPsiStamp = PsiModificationTracker.SERVICE.getInstance(myProject).getModificationCount();
}
protected TextEditorHighlightingPass(@NotNull final Project project, @Nullable final Document document) {
this(project, document, true);
@@ -85,8 +88,12 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
return false;
}
if (myDocument != null && myDocument.getModificationStamp() != myInitialStamp) return false;
if (PsiModificationTracker.SERVICE.getInstance(myProject).getModificationCount() != myInitialPsiStamp) {
return false;
}
if (myDocument != null) {
if (myDocument.getModificationStamp() != myInitialDocStamp) return false;
PsiFile file = PsiDocumentManager.getInstance(myProject).getPsiFile(myDocument);
if (file == null || !file.isValid()) return false;
}