From 4c8f43f41b37361e92f158cbad05553225dcad74 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 16 Mar 2016 15:15:48 +0100
Subject: [PATCH] Use new APIs in FakeLinesYardstick

---
 spec/fake-lines-yardstick.coffee | 38 ++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/spec/fake-lines-yardstick.coffee b/spec/fake-lines-yardstick.coffee
index 38716ab3e..288032d84 100644
--- a/spec/fake-lines-yardstick.coffee
+++ b/spec/fake-lines-yardstick.coffee
@@ -1,8 +1,10 @@
 {Point} = require 'text-buffer'
+{isPairedCharacter} = require '../src/text-utils'
 
 module.exports =
 class FakeLinesYardstick
   constructor: (@model, @lineTopIndex) ->
+    {@displayLayer} = @model
     @characterWidthsByScope = {}
 
   getScopedCharacterWidth: (scopeNames, char) ->
@@ -30,25 +32,27 @@ class FakeLinesYardstick
     left = 0
     column = 0
 
-    iterator = @model.tokenizedLineForScreenRow(targetRow).getTokenIterator()
-    while iterator.next()
-      characterWidths = @getScopedCharacterWidths(iterator.getScopes())
+    for {tokens} in @displayLayer.getScreenLines(targetRow, targetRow + 1)[0]
+      scopes = []
+      for {text, closeTags, openTags} in tokens
+        scopes.splice(scopes.lastIndexOf(closeTag), 1) for closeTag in closeTags
+        scopes.push(openTag) for openTag in openTags
 
-      valueIndex = 0
-      text = iterator.getText()
-      while valueIndex < text.length
-        if iterator.isPairedCharacter()
-          char = text
-          charLength = 2
-          valueIndex += 2
-        else
-          char = text[valueIndex]
-          charLength = 1
-          valueIndex++
+        characterWidths = @getScopedCharacterWidths(iterator.getScopes())
+        valueIndex = 0
+        while valueIndex < text.length
+          if isPairedCharacter(text, valueIndex)
+            char = text[valueIndex...valueIndex + 2]
+            charLength = 2
+            valueIndex += 2
+          else
+            char = text[valueIndex]
+            charLength = 1
+            valueIndex++
 
-        break if column is targetColumn
+          break if column is targetColumn
 
-        left += characterWidths[char] ? baseCharacterWidth unless char is '\0'
-        column += charLength
+          left += characterWidths[char] ? baseCharacterWidth unless char is '\0'
+          column += charLength
 
     {top, left}