Pass TokenIterator reference instead of using global singleton

Adds an extra reference to each tokenized line but is also more sane.

/cc @maxbrunsfeld
This commit is contained in:
Nathan Sobo
2015-05-20 19:12:22 +02:00
parent a109b3811c
commit 2beb6c0fe0
7 changed files with 29 additions and 30 deletions

View File

@@ -2,7 +2,6 @@
_ = require 'underscore-plus'
{OnigRegExp} = require 'oniguruma'
ScopeDescriptor = require './scope-descriptor'
TokenIterator = require './token-iterator'
module.exports =
class LanguageMode
@@ -243,7 +242,7 @@ class LanguageMode
@suggestedIndentForTokenizedLineAtBufferRow(bufferRow, tokenizedLine, options)
suggestedIndentForTokenizedLineAtBufferRow: (bufferRow, tokenizedLine, options) ->
iterator = TokenIterator.instance.reset(tokenizedLine)
iterator = tokenizedLine.getTokenIterator()
iterator.next()
scopeDescriptor = new ScopeDescriptor(scopes: iterator.getScopes())