From 1b1006ac1d49cf8c5fa3e0541755e4de3ccb9772 Mon Sep 17 00:00:00 2001
From: Jonathan McPherson <jonathan@rstudio.com>
Date: Tue, 10 Mar 2015 14:17:17 -0700
Subject: [PATCH] prevent vim ex commandline from obscuring search results
 (fixes #2384)

---
 lib/ace/keyboard/vim.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/ace/keyboard/vim.js b/lib/ace/keyboard/vim.js
index 0641897f..4b3b246e 100644
--- a/lib/ace/keyboard/vim.js
+++ b/lib/ace/keyboard/vim.js
@@ -489,8 +489,12 @@ define(function(require, exports, module) {
   };
   this.scrollInfo = function() { return 0; };
   this.scrollIntoView = function(pos, margin) {
-    if (pos)
-      this.ace.renderer.scrollCursorIntoView(toAcePos(pos), null, margin);
+    if (pos) {
+      var renderer = this.ace.renderer;
+      var viewMargin = { "top": 0, "bottom": margin };
+      renderer.scrollCursorIntoView(toAcePos(pos),
+        (renderer.lineHeight * 2) / renderer.$size.scrollerHeight, viewMargin);
+    }
   };
   this.getLine = function(row) { return this.ace.session.getLine(row) };
   this.getRange = function(s, e) {