azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take all responsibility for updating trackers, stop delegating it to Java-plugin code

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-20 20:35:47 +04:00
parent a988415e22
commit 565612bc19
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
+6 -3
View File
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetBlockExpression;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetModifiableBlockHelper;
public class JetCodeBlockModificationListener implements PsiTreeChangePreprocessor {
private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.asJava.JetCodeBlockModificationListener");
@@ -75,7 +76,7 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess
private void processChange(PsiElement parent, PsiElement child1, PsiElement child2) {
try {
if (!isInsideCodeBlock(parent)) {
if (parent != null && parent.getContainingFile() instanceof JetFile) {
if (parent.getContainingFile() instanceof JetFile) {
myModificationTracker.incCounter();
}
else {
@@ -84,7 +85,7 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess
return;
}
if (containsClassesInside(child1) || child2 != child1 && containsClassesInside(child2)) {
if (containsClassesInside(child1) || (child2 != child1 && containsClassesInside(child2))) {
myModificationTracker.incCounter();
}
} catch (PsiInvalidElementAccessException e) {
@@ -119,7 +120,9 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess
}
if (parent instanceof JetClass) return false; // anonymous or local class
if (parent instanceof JetBlockExpression) {
return true;
if (!JetModifiableBlockHelper.shouldChangeModificationCount(element)) {
return true;
}
}
parent = parent.getParent();
}