Merge pull request #4339 from adobe/jeff/fix-find-result-centering-rebased

Fix find first result centering

Author: jasonsanjose

src/editor/Editor.js

@@ -892,6 +892,21 @@ define(function (require, exports, module) {
         return this._codeMirror.lineCount();
     };
 
+    /**
+     * Deterines if line is fully visible.
+     * @param {number} zero-based index of the line to test
+     * @return {boolean} true if the line is fully visible, false otherwise
+     */
+    Editor.prototype.isLineVisible = function (line) {
+        var coords = this._codeMirror.charCoords({line: line, ch: 0}, "local"),
+            scrollInfo = this._codeMirror.getScrollInfo(),
+            top = scrollInfo.top,
+            bottom = scrollInfo.top + scrollInfo.clientHeight;
+
+        // Check top and bottom and return false for partially visible lines.
+        return (coords.top >= top && coords.bottom <= bottom);
+    };
+    
     /**
      * Gets the number of the first visible line in the editor.
      * @returns {number} The 0-based index of the first visible line.

src/search/FindReplace.js

@@ -105,7 +105,13 @@ define(function (require, exports, module) {
                 }
             }
 
-            var centerOptions = (isFindFirst) ? Editor.BOUNDARY_IGNORE_TOP : Editor.BOUNDARY_CHECK_NORMAL;
+            var resultVisible = editor.isLineVisible(cursor.from().line),
+                centerOptions = Editor.BOUNDARY_CHECK_NORMAL;
+            
+            if (isFindFirst && resultVisible) {
+                // no need to scroll if the line with the match is in view
+                centerOptions = Editor.BOUNDARY_IGNORE_TOP;
+            }
             editor.setSelection(cursor.from(), cursor.to(), true, centerOptions);
             state.posFrom = cursor.from();
             state.posTo = cursor.to();