Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work whenv20130228-095449

triggered after Undo

1 files changed, 13 insertions, 4 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 727a07943..28ee9c1b9 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2986,9 +2986,9 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 	 * Implements IDocumentListener.
 	 */
 	private void documentChanged(DocumentEvent e, boolean dirty) {
-		
-		IDocument doc= e.getDocument();
-		
+
+		final IDocument doc = e.getDocument();
+
 		if (doc == fLeft.getSourceViewer().getDocument()) {
 			setLeftDirty(dirty);
 		} else if (doc == fRight.getSourceViewer().getDocument()) {
@@ -2997,7 +2997,16 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 		if (!isLeftDirty() && !isRightDirty()) {
 			fRedoDiff = false;
 		}
-		updateLines(doc);
+
+		new UIJob(CompareMessages.DocumentMerger_0) {
+			public IStatus runInUIThread(IProgressMonitor monitor) {
+				doDiff();
+				invalidateLines();
+				updateLines(doc);
+				return Status.OK_STATUS;
+			}
+		}.schedule();
+
 	}
 	
 	/*