From 79b0bc2bad17f3a14fc8cafaada75630216867c3 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 5 Jun 2015 16:11:37 +0200
Subject: [PATCH] :art: Use `pixelPositionForScreenPositionInTile`

---
 src/text-editor-presenter.coffee | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 5d447edaa..d8322d061 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -1042,7 +1042,14 @@ class TextEditorPresenter
   hasPixelPositionRequirements: ->
     @lineHeight? and @baseCharacterWidth?
 
-  pixelPositionForScreenPosition: (screenPosition, clip=true, foo) ->
+  pixelPositionForScreenPositionInTile: (tileStartRow, screenPosition, clip) ->
+    position = @pixelPositionForScreenPosition(screenPosition, clip)
+    position.top -= tileStartRow * @lineHeight
+    position.top += @scrollTop
+    position.left += @scrollLeft
+    position
+
+  pixelPositionForScreenPosition: (screenPosition, clip=true) ->
     screenPosition = Point.fromObject(screenPosition)
     screenPosition = @model.clipScreenPosition(screenPosition) if clip
 
@@ -1051,7 +1058,6 @@ class TextEditorPresenter
     baseCharacterWidth = @baseCharacterWidth
 
     top = targetRow * @lineHeight
-    top -= foo * @lineHeight if foo?
     left = 0
     column = 0
 
@@ -1076,8 +1082,8 @@ class TextEditorPresenter
         left += characterWidths[char] ? baseCharacterWidth unless char is '\0'
         column += charLength
 
-    top -= @scrollTop unless foo?
-    left -= @scrollLeft unless foo?
+    top -= @scrollTop
+    left -= @scrollLeft
     {top, left}
 
   hasPixelRectRequirements: ->
@@ -1302,8 +1308,8 @@ class TextEditorPresenter
 
   buildHighlightRegions: (tileStartRow, screenRange) ->
     lineHeightInPixels = @lineHeight
-    startPixelPosition = @pixelPositionForScreenPosition(screenRange.start, true, tileStartRow)
-    endPixelPosition = @pixelPositionForScreenPosition(screenRange.end, true, tileStartRow)
+    startPixelPosition = @pixelPositionForScreenPositionInTile(tileStartRow, screenRange.start, true)
+    endPixelPosition = @pixelPositionForScreenPositionInTile(tileStartRow, screenRange.end, true)
     spannedRows = screenRange.end.row - screenRange.start.row + 1
 
     if spannedRows is 1