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

introduce per-language modification trackers: catch PIAE

Browse Source
This commit is contained in:
Gregory.Shrago
2017-08-16 02:25:43 +03:00
parent 1350350d1f
commit 34b4218d0d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/PsiModificationTrackerImpl.java
+11 -6
View File
@@ -25,11 +25,10 @@ import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.util.SimpleModificationTracker;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiTreeChangeEvent;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.containers.ConcurrentFactoryMap;
import com.intellij.util.messages.MessageBus;
import org.jetbrains.annotations.ApiStatus;
@@ -136,8 +135,14 @@ public class PsiModificationTrackerImpl implements PsiModificationTracker, PsiTr
}) {
PsiFile file = o instanceof PsiFile ? (PsiFile)o : null;
if (file == null) {
Language language = o == null ? null : o.getLanguage();
incLanguageModificationCount(language);
try {
IElementType type = PsiUtilCore.getElementType(o);
Language language = type != null ? type.getLanguage() : o != null ? o.getLanguage() : null;
incLanguageModificationCount(language);
}
catch (PsiInvalidElementAccessException e) {
PsiDocumentManagerBase.LOG.warn(e);
}
}
else {
for (Language language : file.getViewProvider().getLanguages()) {