better vertical adjustment in scrollIntoView

Author: ddnexus

lib/codemirror.js

@@ -620,11 +620,11 @@ var CodeMirror = (function() {
       return scrollIntoView(cursor.x, cursor.y, cursor.x, cursor.yBot);
     }
     function scrollIntoView(x1, y1, x2, y2) {
-      var pl = paddingLeft(), pt = paddingTop();
+      var pl = paddingLeft(), pt = paddingTop(), lh = lineHeight();
       y1 += pt; y2 += pt; x1 += pl; x2 += pl;
       var screen = wrapper.clientHeight, screentop = wrapper.scrollTop, scrolled = false, result = true;
-      if (y1 < screentop) {wrapper.scrollTop = Math.max(0, y1 - 10); scrolled = true;}
-      else if (y2 > screentop + screen) {wrapper.scrollTop = y2 + 10 - screen; scrolled = true;}
+      if (y1 < screentop) {wrapper.scrollTop = Math.max(0, y1 - 2*lh); scrolled = true;}
+      else if (y2 > screentop + screen) {wrapper.scrollTop = y2 + lh - screen; scrolled = true;}
 
       var screenw = wrapper.clientWidth, screenleft = wrapper.scrollLeft;
       if (x1 < screenleft) {wrapper.scrollLeft = Math.max(0, x1 - 10); scrolled = true;}
@@ -1698,7 +1698,7 @@ var CodeMirror = (function() {
             mark = (markpos < marked.length) ? marked[markpos] : null;
           }
         }
-        nextMark();        
+        nextMark();
         while (pos < len) {
           var upto = len;
           var extraStyle = "";