Removed check to test if source and target edits belong to the same tree.
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
index 47b357f..cc01790 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
@@ -504,6 +504,7 @@
doUndoRedo(undo, "01aa23bb45cc67dd89");
}
+ /* Disabled due to a problem with this check in AST rewrite
public void testDifferentTree1() throws Exception {
MultiTextEdit root2= new MultiTextEdit();
MoveSourceEdit s1= new MoveSourceEdit(2, 2);
@@ -518,6 +519,7 @@
}
assertTrue(exception);
}
+ */
public void testMove1() throws Exception {
MoveSourceEdit s1= new MoveSourceEdit(2, 2);
diff --git a/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java
index a1ec618..a0bdf2b 100644
--- a/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java
+++ b/org.eclipse.text/src/org/eclipse/text/edits/CopySourceEdit.java
@@ -238,8 +238,10 @@
throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("CopySourceEdit.no_target")); //$NON-NLS-1$
if (fTarget.getSourceEdit() != this)
throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("CopySourceEdit.different_source")); //$NON-NLS-1$
+ /* causes ASTRewrite to fail
if (getRoot() != fTarget.getRoot())
throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("CopySourceEdit.different_tree")); //$NON-NLS-1$
+ */
}
//---- source computation -------------------------------------------------------
diff --git a/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java
index f032ce9..e95f9fa 100644
--- a/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java
+++ b/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java
@@ -207,8 +207,10 @@
throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("MoveSourceEdit.no_target")); //$NON-NLS-1$
if (fTarget.getSourceEdit() != this)
throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("MoveSourceEdit.different_source")); //$NON-NLS-1$
+ /* Causes AST rewrite to fail
if (getRoot() != fTarget.getRoot())
throw new MalformedTreeException(getParent(), this, TextEditMessages.getString("MoveSourceEdit.different_tree")); //$NON-NLS-1$
+ */
}
//---- source computation --------------------------------------------------------------
