Bug 464602 - [Console] Console auto scrolls only after 2nd input

character

Change-Id: I7a6cf9958fc07726ecf5def8b53853f7f1fa3ae3

1 files changed, 26 insertions, 1 deletions

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsoleViewer.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsoleViewer.java
index 2ede958dc..65a0e8899 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsoleViewer.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsoleViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.jface.text.IRegion;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -100,6 +101,7 @@ public class IOConsoleViewer extends TextConsoleViewer {
             } else {
                 try {
                     doc.replace(length, 0, eventString);
+                    updateWidgetCaretLocation(length);
                 } catch (BadLocationException e1) {
                 }
                 e.doit = false;
@@ -110,6 +112,29 @@ public class IOConsoleViewer extends TextConsoleViewer {
         }
     }
 
+    /*
+     * Update the Text widget location to new location
+     */
+	private void updateWidgetCaretLocation(int documentCaret) {
+		int widgetCaret = modelOffset2WidgetOffset(documentCaret);
+		if (widgetCaret == -1) {
+			// try to move it to the closest spot
+			IRegion region = getModelCoverage();
+			if (region != null) {
+				if (documentCaret <= region.getOffset()) {
+					widgetCaret = 0;
+				} else if (documentCaret >= region.getOffset() + region.getLength()) {
+					widgetCaret = getVisibleRegion().getLength();
+				}
+			}
+		}
+		if (widgetCaret != -1) {
+			// there is a valid widget caret
+			getTextWidget().setCaretOffset(widgetCaret);
+			getTextWidget().showSelection();
+		}
+	}
+
     /**
      * makes the associated text widget uneditable.
      */