🐎 Fetch scopes only if required

Shazzaam · Oct 16, 2015 · e843c2f · e843c2f
1 parent 3f53a72
commit e843c2f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
@@ -293,7 +293,7 @@ class DisplayBuffer extends Model
 
   getSoftWrapColumnForTokenizedLine: (tokenizedLine) ->
     lineMaxWidth = @getSoftWrapColumn() * @getDefaultCharWidth()
-    iterator = tokenizedLine.getTokenIterator()
+    iterator = tokenizedLine.getTokenIterator(false)
     column = 0
     currentWidth = 0
     while iterator.next()

diff --git a/src/lines-yardstick.coffee b/src/lines-yardstick.coffee
@@ -40,7 +40,7 @@ class LinesYardstick
     previousColumn = 0
     previousLeft = 0
 
-    @tokenIterator.reset(line)
+    @tokenIterator.reset(line, false)
     while @tokenIterator.next()
       text = @tokenIterator.getText()
       textIndex = 0
@@ -112,7 +112,7 @@ class LinesYardstick
     indexWithinTextNode = null
     charIndex = 0
 
-    @tokenIterator.reset(line)
+    @tokenIterator.reset(line, false)
     while @tokenIterator.next()
       break if foundIndexWithinTextNode?
 

diff --git a/src/token-iterator.coffee b/src/token-iterator.coffee
@@ -3,45 +3,33 @@
 
 module.exports =
 class TokenIterator
-  constructor: ({@grammarRegistry}, line) ->
-    @reset(line) if line?
+  constructor: ({@grammarRegistry}, line, enableScopes) ->
+    @reset(line, enableScopes) if line?
 
-  reset: (@line) ->
+  reset: (@line, @enableScopes=true) ->
     @index = null
     @bufferStart = @line.startBufferColumn
     @bufferEnd = @bufferStart
     @screenStart = 0
     @screenEnd = 0
-    @scopes = @line.openScopes.map (id) => @grammarRegistry.scopeForId(id)
-    @scopeStarts = @scopes.slice()
-    @scopeEnds = []
+    @resetScopes() if @enableScopes
     this
 
   next: ->
     {tags} = @line
 
     if @index?
       @index++
-      @scopeEnds.length = 0
-      @scopeStarts.length = 0
       @bufferStart = @bufferEnd
       @screenStart = @screenEnd
+      @clearScopeStartsAndEnds() if @enableScopes
     else
       @index = 0
 
     while @index < tags.length
       tag = tags[@index]
       if tag < 0
-        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)
+        @handleScopeForTag(tag) if @enableScopes
         @index++
       else
         if @isHardTab()
@@ -59,6 +47,27 @@ class TokenIterator
 
     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
 

diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
@@ -184,7 +184,7 @@ class TokenizedLine
       @lineIsWhitespaceOnly = true
       @firstTrailingWhitespaceIndex = 0
 
-  getTokenIterator: -> @tokenIterator.reset(this)
+  getTokenIterator: -> @tokenIterator.reset(this, arguments...)
 
   Object.defineProperty @prototype, 'tokens', get: ->
     iterator = @getTokenIterator()