From e01c19e6b7c138d9cd42901cc52c33dc7bb5dbb2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 2 Dec 2013 19:00:13 -0800
Subject: [PATCH] Use buffer positions when calculating char widths

Previously the editor width cache was being accessed using
screen columns which could cause incorrect position left values
for wrapped lines.

Closes #1096
---
 src/editor-view.coffee | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 11350cc8b..bada6e987 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -1587,36 +1587,39 @@ class EditorView extends View
       @renderedLines[0].removeChild(lineElement)
     { top: row * @lineHeight, left }
 
-  positionLeftForLineAndColumn: (lineElement, screenRow, column) ->
-    return 0 if column == 0
+  positionLeftForLineAndColumn: (lineElement, screenRow, screenColumn) ->
+    return 0 if screenColumn == 0
 
     bufferRow = @bufferRowsForScreenRows(screenRow, screenRow)[0] ? screenRow
+    bufferColumn = @bufferPositionForScreenPosition([screenRow, screenColumn]).column
     tokenizedLine = @editor.displayBuffer.tokenizedBuffer.tokenizedLines[bufferRow]
 
     left = 0
     index = 0
+    startIndex = @bufferPositionForScreenPosition([screenRow, 0]).column
     for token in tokenizedLine.tokens
       for char in token.value
-        return left if index >= column
+        return left if index >= bufferColumn
 
-        val = @getCharacterWidthCache(token.scopes, char)
-        if val?
-          left += val
-        else
-          return @measureToColumn(lineElement, tokenizedLine, column)
+        if index >= startIndex
+          val = @getCharacterWidthCache(token.scopes, char)
+          if val?
+            left += val
+          else
+            return @measureToColumn(lineElement, tokenizedLine, screenColumn, startIndex)
 
         index++
     left
 
-  scopesForColumn: (tokenizedLine, column) ->
+  scopesForColumn: (tokenizedLine, bufferColumn) ->
     index = 0
     for token in tokenizedLine.tokens
       for char in token.value
-        return token.scopes if index == column
+        return token.scopes if index == bufferColumn
         index++
     null
 
-  measureToColumn: (lineElement, tokenizedLine, column) ->
+  measureToColumn: (lineElement, tokenizedLine, screenColumn, lineStartBufferColumn) ->
     left = oldLeft = index = 0
     iterator = document.createNodeIterator(lineElement, NodeFilter.SHOW_TEXT, TextNodeFilter)
 
@@ -1630,13 +1633,13 @@ class EditorView extends View
 
       for char, i in content
         # Don't continue caching long lines :racehorse:
-        break if index > LongLineLength and column < index
+        break if index > LongLineLength and screenColumn < index
 
         # Dont return right away, finish caching the whole line
-        returnLeft = left if index == column
+        returnLeft = left if index == screenColumn
         oldLeft = left
 
-        scopes = @scopesForColumn(tokenizedLine, index)
+        scopes = @scopesForColumn(tokenizedLine, lineStartBufferColumn + index)
         cachedCharWidth = @getCharacterWidthCache(scopes, char)
 
         if cachedCharWidth?
@@ -1655,7 +1658,7 @@ class EditorView extends View
 
         # Assume all the characters are the same width when dealing with long
         # lines :racehorse:
-        return column * cachedCharWidth if index > LongLineLength
+        return screenColumn * cachedCharWidth if index > LongLineLength
 
         index++