From 6b0995996ffe9a232a3d5a26d68359ce96fd5f2c Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@github.com>
Date: Thu, 25 Feb 2016 09:10:53 -0800
Subject: [PATCH] Merge pull request #10967 from
 b6pzeusbc54tvhw5jgpyw8pwz2x6gs/change-getLineCount-to-getScreenLineCount

Fix a inconsistent getLineCount() use
---
 src/text-editor.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index a40efb151..d09fda92a 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -3202,7 +3202,7 @@ class TextEditor extends Model
   # top of the visible area.
   setFirstVisibleScreenRow: (screenRow, fromView) ->
     unless fromView
-      maxScreenRow = @getLineCount() - 1
+      maxScreenRow = @getScreenLineCount() - 1
       unless @config.get('editor.scrollPastEnd')
         height = @displayBuffer.getHeight()
         lineHeightInPixels = @displayBuffer.getLineHeightInPixels()
@@ -3220,7 +3220,7 @@ class TextEditor extends Model
     height = @displayBuffer.getHeight()
     lineHeightInPixels = @displayBuffer.getLineHeightInPixels()
     if height? and lineHeightInPixels?
-      Math.min(@firstVisibleScreenRow + Math.floor(height / lineHeightInPixels), @getLineCount() - 1)
+      Math.min(@firstVisibleScreenRow + Math.floor(height / lineHeightInPixels), @getScreenLineCount() - 1)
     else
       null