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 CHILD_ADDED case in java structure mod count (IDEA-CR-21897)

Browse Source
This commit is contained in:
peter
2017-06-16 14:12:10 +02:00
parent b7f01dd32a
commit b4acfa6de1
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java
+4 -5
View File
@@ -20,9 +20,8 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.PsiTreeChangeEventImpl.PsiEventType;
import com.intellij.psi.impl.source.jsp.jspXml.JspDirective;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.ContainerUtil;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.Set;
@@ -78,19 +77,19 @@ public class JavaCodeBlockModificationListener extends PsiTreeChangePreprocessor
}
}
private static boolean isWhiteSpaceOrComment(PsiElement e) {
private static boolean isWhiteSpaceOrComment(@NotNull PsiElement e) {
return e instanceof PsiWhiteSpace || PsiTreeUtil.getParentOfType(e, PsiComment.class, false) != null;
}
private static Set<PsiElement> getChangedChildren(@NotNull PsiTreeChangeEventImpl event) {
PsiEventType code = event.getCode();
if (code == PsiEventType.CHILD_ADDED || code == PsiEventType.CHILD_REMOVED || code == PsiEventType.CHILD_REPLACED) {
return ContainerUtil.newHashSet(event.getOldChild(), event.getChild());
return StreamEx.of(event.getOldChild(), event.getChild(), event.getNewChild()).nonNull().toSet();
}
return Collections.emptySet();
}
private static boolean hasClassesInside(@Nullable PsiElement element) {
private static boolean hasClassesInside(@NotNull PsiElement element) {
return !SyntaxTraverser.psiTraverser(element).traverse()
.filter(Conditions.instanceOf(PsiClass.class, PsiLambdaExpression.class)).isEmpty();
}
java/java-tests/testSrc/com/intellij/java/psi/PsiModificationTrackerTest.java
+13 -1
View File
@@ -484,4 +484,16 @@ public class PsiModificationTrackerTest extends CodeInsightTestCase {
assertEquals(javaCount, tracker.getJavaStructureModificationCount());
assertFalse(codeBlockCount == tracker.getOutOfCodeBlockModificationCount());
}
}
public void testJavaStructureModCountNotAdvancedOnAddingSpace() {
configureByText(JavaFileType.INSTANCE, "class A{ <selection></selection> }");
PsiModificationTracker tracker = PsiManager.getInstance(getProject()).getModificationTracker();
long javaCount = tracker.getJavaStructureModificationCount();
long codeBlockCount = tracker.getOutOfCodeBlockModificationCount();
WriteCommandAction.runWriteCommandAction(getProject(), () -> replaceSelection(" "));
assertEquals(javaCount, tracker.getJavaStructureModificationCount());
assertFalse(codeBlockCount == tracker.getOutOfCodeBlockModificationCount());
}}