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

IDEA-CR-17604 TreeChangePreprocessorBase: restore original hasClasses() logic

Browse Source
This commit is contained in:
Gregory.Shrago
2017-01-24 18:00:31 +03:00
parent 42c3ae810c
commit e5627428a0
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaCodeBlockModificationListener.java
+20 -4
View File
@@ -15,8 +15,11 @@
*/
package com.intellij.psi.impl;
import com.intellij.openapi.util.Conditions;
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.PsiModificationTracker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -35,7 +38,7 @@ public class JavaCodeBlockModificationListener extends PsiTreeChangePreprocessor
protected boolean isOutOfCodeBlock(@NotNull PsiElement element) {
for (PsiElement e : SyntaxTraverser.psiApi().parents(element)) {
if (e instanceof PsiModifiableCodeBlock) {
if (hasClassesInside(e)) break;
// trigger OOCBM for final variables initialized in constructors & class initializers
if (!((PsiModifiableCodeBlock)e).shouldChangeModificationCount(element)) return false;
}
if (e instanceof PsiClass) break;
@@ -53,8 +56,20 @@ public class JavaCodeBlockModificationListener extends PsiTreeChangePreprocessor
}
@Override
protected boolean isOutOfCodeBlockInvalid(@NotNull PsiElement element) {
return hasClassesInside(element);
protected void onTreeChanged(@NotNull PsiTreeChangeEventImpl event) {
PsiModificationTracker tracker = myPsiManager.getModificationTracker();
long cur = tracker.getOutOfCodeBlockModificationCount();
super.onTreeChanged(event);
if (cur == tracker.getOutOfCodeBlockModificationCount()) {
PsiEventType code = event.getCode();
if (code == PsiEventType.CHILD_ADDED || code == PsiEventType.CHILD_REMOVED || code == PsiEventType.CHILD_REPLACED) {
if (hasClassesInside(event.getOldChild()) ||
event.getOldChild() != event.getChild() && hasClassesInside(event.getChild())) {
onOutOfCodeBlockModification(event);
doIncOutOfCodeBlockCounter();
}
}
}
}
@Override
@@ -63,7 +78,8 @@ public class JavaCodeBlockModificationListener extends PsiTreeChangePreprocessor
}
private static boolean hasClassesInside(@Nullable PsiElement element) {
return !SyntaxTraverser.psiTraverser(element).filter(PsiClass.class).isEmpty();
return !SyntaxTraverser.psiTraverser(element).traverse()
.filter(Conditions.instanceOf(PsiClass.class, PsiLambdaExpression.class)).isEmpty();
}
}
platform/core-impl/src/com/intellij/psi/impl/PsiTreeChangePreprocessorBase.java
+1 -6
View File
@@ -45,14 +45,9 @@ public abstract class PsiTreeChangePreprocessorBase implements PsiTreeChangePrep
return true;
}
protected boolean isOutOfCodeBlockInvalid(@NotNull PsiElement element) {
return false;
}
private boolean outOfCodeBlock(@Nullable PsiElement element) {
if (element == null) return false;
if (element == null || !element.isValid()) return false;
if (element instanceof PsiDirectory) return false; // handled by PsiModificationTrackerImpl#treeChanged()
if (!element.isValid()) return !(element instanceof PsiFileSystemItem) && isOutOfCodeBlockInvalid(element);
if (element instanceof PsiFileSystemItem) return isOutOfCodeBlock((PsiFileSystemItem)element);
return isOutOfCodeBlock(element);
}