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

Fix asymmetric reparse bug

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-04 22:58:27 +01:00
parent 34c86e2d79
commit 587d98f864
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/tree/ASTShallowComparator.java
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ public class ASTShallowComparator implements ShallowNodeComparator<ASTNode, ASTN
if (TreeUtil.isCollapsedChameleon(oldNode)) {
return ((TreeElement)newNode).textMatches(oldNode.getText()) ? ThreeState.YES : ThreeState.UNSURE;
}
if (TreeUtil.isCollapsedChameleon(newNode)) {
return ((TreeElement)oldNode).textMatches(newNode.getText()) ? ThreeState.YES : ThreeState.UNSURE;
}
@@ -42,6 +41,9 @@ public class ASTShallowComparator implements ShallowNodeComparator<ASTNode, ASTN
if (oldNode instanceof LeafElement) {
return ((LeafElement)oldNode).textMatches(newNode.getText()) ? ThreeState.YES : ThreeState.NO;
}
if (newNode instanceof LeafElement) {
return ((LeafElement)newNode).textMatches(oldNode.getText()) ? ThreeState.YES : ThreeState.NO;
}
if (oldNode instanceof PsiErrorElement && newNode instanceof PsiErrorElement) {
final PsiErrorElement e1 = (PsiErrorElement)oldNode;
@@ -69,5 +71,4 @@ public class ASTShallowComparator implements ShallowNodeComparator<ASTNode, ASTN
return ((TreeElement)n1).hc() == ((TreeElement)n2).hc();
}
}