Handle only buffer coordinates in TokenIterator

src/token-iterator.coffee

@@ -1,72 +1,57 @@
 module.exports =
 class TokenIterator
-  constructor: ({@grammarRegistry}, line, enableScopes) ->
-    @reset(line, enableScopes) if line?
+  constructor: ({@grammarRegistry}, line) ->
+    @reset(line) if line?
 
-  reset: (@line, @enableScopes=true) ->
+  reset: (@line) ->
     @index = null
-    @bufferStart = @line.startBufferColumn
-    @bufferEnd = @bufferStart
-    @screenStart = 0
-    @screenEnd = 0
-    @resetScopes() if @enableScopes
+    @startColumn = 0
+    @endColumn = 0
+    @scopes = @line.openScopes.map (id) => @grammarRegistry.scopeForId(id)
+    @scopeStarts = @scopes.slice()
+    @scopeEnds = []
     this
 
   next: ->
     {tags} = @line
 
     if @index?
+      @startColumn = @endColumn
+      @scopeEnds.length = 0
+      @scopeStarts.length = 0
       @index++
-      @bufferStart = @bufferEnd
-      @screenStart = @screenEnd
-      @clearScopeStartsAndEnds() if @enableScopes
     else
       @index = 0
 
     while @index < tags.length
       tag = tags[@index]
       if tag < 0
-        @handleScopeForTag(tag) if @enableScopes
+        scope = @grammarRegistry.scopeForId(tag)
+        if tag % 2 is 0
+          if @scopeStarts[@scopeStarts.length - 1] is scope
+            @scopeStarts.pop()
+          else
+            @scopeEnds.push(scope)
+          @scopes.pop()
+        else
+          @scopeStarts.push(scope)
+          @scopes.push(scope)
         @index++
       else
-        @screenEnd = @screenStart + tag
-        @bufferEnd = @bufferStart + tag
-
-        @text = @line.text.substring(@screenStart, @screenEnd)
+        @endColumn += tag
+        @text = @line.text.substring(@startColumn, @endColumn)
         return true
 
     false
 
-  resetScopes: ->
-    @scopes = @line.openScopes.map (id) => @grammarRegistry.scopeForId(id)
-    @scopeStarts = @scopes.slice()
-    @scopeEnds = []
-
-  clearScopeStartsAndEnds: ->
-    @scopeEnds.length = 0
-    @scopeStarts.length = 0
-
-  handleScopeForTag: (tag) ->
-    scope = @grammarRegistry.scopeForId(tag)
-    if tag % 2 is 0
-      if @scopeStarts[@scopeStarts.length - 1] is scope
-        @scopeStarts.pop()
-      else
-        @scopeEnds.push(scope)
-      @scopes.pop()
-    else
-      @scopeStarts.push(scope)
-      @scopes.push(scope)
-
-  getBufferStart: -> @bufferStart
-  getBufferEnd: -> @bufferEnd
-
-  getScreenStart: -> @screenStart
-  getScreenEnd: -> @screenEnd
-
-  getScopeStarts: -> @scopeStarts
-  getScopeEnds: -> @scopeEnds
-
   getScopes: -> @scopes
 
+  getScopeStarts: -> @scopeStarts
+
+  getScopeEnds: -> @scopeEnds
+
   getText: -> @text
+
+  getBufferStart: -> @startColumn
+
+  getBufferEnd: -> @endColumn