sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#721: Non-roots in NodeModelBuilder#replaceAndTransferLookAhead()

Browse source 
Allows to use NodeModelBuilder#replaceAndTransferLookAhead() to replace
nodes other than the root node.

TODO: Add tests.

Signed-off-by: Knut Wannheden <knut.wannheden@paranor.ch>
This commit is contained in:
Knut Wannheden 2018-06-22 17:40:49 +02:00
parent d3099cbede
commit 26821df8f3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/impl/NodeModelBuilder.java
View file

@ -21,6 +21,7 @@ import org.eclipse.xtext.nodemodel.ILeafNode;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.nodemodel.SyntaxErrorMessage;
import com.google.common.base.Preconditions;
import com.google.common.collect.Interner;
import com.google.common.collect.Maps;
@ -338,6 +339,9 @@ public class NodeModelBuilder {
}
public void replaceAndTransferLookAhead(INode oldNode, INode newRootNode) {
if (!(oldNode instanceof RootNode)) {
Preconditions.checkArgument(newRootNode.getTotalLength() == oldNode.getTotalLength(), "Length of new node doesn't match old node");
}
AbstractNode newNode = ((CompositeNode) newRootNode).basicGetFirstChild();
replaceWithoutChildren((AbstractNode) oldNode, newNode);
if (oldNode instanceof ICompositeNode && newNode instanceof CompositeNode) {
@ -346,7 +350,7 @@ public class NodeModelBuilder {
}
ICompositeNode root = newNode.getRootNode();
BidiTreeIterator<AbstractNode> iterator = ((AbstractNode) root).basicIterator();
int offset = 0;
int offset = oldNode.getTotalOffset();
while(iterator.hasNext()) {
AbstractNode node = iterator.next();
if (node instanceof LeafNode) {