Merge pull request #363 from eclipse/CHE-95

CHE-95. Fix wrong scrolling in editor at using code assistant
eclipse-che · Feb 17, 2016 · c77e5ac · c77e5ac
2 parents 20dc116 + 8cb6e27
commit c77e5ac
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...gin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionDocument.java b/...gin-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionDocument.java
@@ -12,7 +12,6 @@
 
 import com.google.web.bindery.event.shared.HandlerRegistration;
 
-import org.eclipse.che.ide.api.text.Region;
 import org.eclipse.che.ide.editor.orion.client.jso.ModelChangedEventOverlay;
 import org.eclipse.che.ide.editor.orion.client.jso.OrionEditorOverlay;
 import org.eclipse.che.ide.editor.orion.client.jso.OrionPixelPositionOverlay;
@@ -36,6 +35,9 @@
  */
 public class OrionDocument extends AbstractEmbeddedDocument {
 
+    /** The maximum number of lines that may be visible at the top of the text view after setting selection range. */
+    private final static int MARGIN_TOP = 15;
+
     private final OrionTextViewOverlay      textViewOverlay;
     private final OrionPositionConverter    positionConverter;
     private final HasCursorActivityHandlers hasCursorActivityHandlers;
@@ -243,5 +245,12 @@ public LinearRange getSelectedLinearRange() {
     public void setSelectedRange(LinearRange range, boolean show) {
         int startOffset = range.getStartOffset();
         editorOverlay.setSelection(startOffset, startOffset + range.getLength(), show);
+
+        TextPosition position = getPositionFromIndex(startOffset);
+        if (show && position != null) {
+            int lineNumber = position.getLine();
+            int topIndex = lineNumber - MARGIN_TOP;
+            editorOverlay.getTextView().setTopIndex(topIndex > 0 ? topIndex : 0);
+        }
     }
 }