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

handle pom transactions that change PSI outside their scope (IDEA-176673, IDEA-179233)

Browse Source 
by merging all nested transactions in the same file

otherwise PSI events with changed offsets were coming in wrong order
and disturbed psi->document synchronization
This commit is contained in:
peter
2017-11-07 14:17:00 +01:00
parent d103c296e3
commit 2ffef332bd
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/pom/core/impl/PomModelImpl.java
+1 -5
View File
@@ -19,7 +19,6 @@ import com.intellij.lang.ASTNode;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.EmptyProgressIndicator;
import com.intellij.openapi.progress.ProcessCanceledException;
@@ -66,7 +65,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class PomModelImpl extends UserDataHolderBase implements PomModel {
private static final Logger LOG = Logger.getInstance("#com.intellij.pom.core.impl.PomModelImpl");
private final Project myProject;
private final Map<Class<? extends PomModelAspect>, PomModelAspect> myAspects = new HashMap<>();
private final Map<PomModelAspect, List<PomModelAspect>> myIncidence = new HashMap<>();
@@ -230,9 +228,7 @@ public class PomModelImpl extends UserDataHolderBase implements PomModel {
while (blocksIterator.hasPrevious()) {
final Pair<PomModelAspect, PomTransaction> pair = blocksIterator.previous();
if (pomModelAspect == pair.getFirst() && // aspect dependence
PsiTreeUtil.isAncestor(pair.getSecond().getChangeScope(), transaction.getChangeScope(), false) &&
// target scope contain current
getContainingFileByTree(pair.getSecond().getChangeScope()) != null // target scope physical
PsiTreeUtil.isAncestor(getContainingFileByTree(pair.getSecond().getChangeScope()), transaction.getChangeScope(), false) // same file
) {
return pair;
}