From 293716021289a6c4187433f1965560dee062263c Mon Sep 17 00:00:00 2001
From: Darin Wright
Date: Fri, 24 Aug 2007 19:38:53 +0000
Subject: Bug 176508 - [console] IOConsole Updater error with long output lines

---
 .../eclipse/ui/internal/console/ConsoleDocumentAdapter.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'org.eclipse.ui.console')

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocumentAdapter.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocumentAdapter.java
index e58e518f1..456e834cc 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocumentAdapter.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDocumentAdapter.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocument;
@@ -25,8 +26,6 @@ import org.eclipse.swt.custom.TextChangeListener;
 import org.eclipse.swt.custom.TextChangedEvent;
 import org.eclipse.swt.custom.TextChangingEvent;
 
-import org.eclipse.core.runtime.Assert;
-
 /**
  * Adapts a Console's document to the viewer StyledText widget. Allows proper line
  * wrapping of fixed width consoles without having to add line delimiters to the StyledText.
@@ -320,12 +319,14 @@ public class ConsoleDocumentAdapter implements IDocumentAdapter, IDocumentListen
 		// work around to
 		// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4994840
 		// see bug 84641
-		if (string.endsWith("\r")) { //$NON-NLS-1$
-			int len = string.length();
-			int index = len >= 2 ? len - 2 : 0;
-			string = string.substring(0, index);
+		int offset = string.length() - 1;
+		while (string.charAt(offset) == '\r') {
+			offset--;
 			count++;
 		}
+		if (offset < (string.length() - 1)) {
+			string = string.substring(0, offset);
+		}
 		
 		int lastIndex = 0;
 		int index = 0;
-- 
cgit v1.2.3