diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 12:53:10 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 12:53:10 -0700 |
commit | 02cf98d65c798d368fcec43ed64a001d513bdd4f (patch) | |
tree | e39e210ab20917b7e5ffdce14a42f5747506eed0 /platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-02cf98d65c798d368fcec43ed64a001d513bdd4f.tar.gz |
Snapshot idea/138.1503 from git://git.jetbrains.org/idea/community.git
Change-Id: Ie01af1d8710ec0ff51d90301bda1a18b0b5c0faf
Diffstat (limited to 'platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java')
-rw-r--r-- | platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java b/platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java index d41138043e95..386fb2dea0e9 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/text/DiffLog.java @@ -39,8 +39,7 @@ import java.util.List; * User: cdr */ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> { - public DiffLog() { - } + public DiffLog() { } private abstract static class LogEntry { protected LogEntry() { @@ -58,7 +57,6 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> { entry.doActualPsiChange(file, astDiffBuilder); } file.subtreeChanged(); - return astDiffBuilder.getEvent(); } @@ -83,7 +81,6 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> { @Override public void nodeDeleted(@NotNull ASTNode oldParent, @NotNull ASTNode oldNode) { myEntries.add(new DeleteEntry(oldParent, oldNode)); - } @Override @@ -126,14 +123,12 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> { astDiffBuilder.nodeReplaced(oldNode, newNode); - ///////////////// ((TreeElement)newNode).clearCaches(); if (!(newNode instanceof FileElement)) { ((CompositeElement)newNode.getTreeParent()).subtreeChanged(); } DebugUtil.checkTreeStructure(parent); - } } @@ -168,7 +163,6 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> { ((CompositeElement)parent).subtreeChanged(); DebugUtil.checkTreeStructure(parent); - } } @@ -222,7 +216,6 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> { DebugUtil.checkTreeStructure(myOldParent); } - } private static PsiElement getPsi(ASTNode node, PsiFile file) { |