github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-16 01:25:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pass TokenIterator reference instead of using global singleton

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

31
src/lines-component.coffee
View File

@@ -22,6 +22,7 @@ class LinesComponent
placeholderTextDiv: null
constructor: ({@presenter, @hostElement, @useShadowDOM, visible}) ->
@tokenIterator = new TokenIterator
@measuredLines = new Set
@lineNodesByLineId = {}
@screenRowsByLineId = {}
@@ -175,19 +176,19 @@ class LinesComponent
lineIsWhitespaceOnly = firstTrailingWhitespaceIndex is 0
innerHTML = ""
iterator = TokenIterator.instance.reset(lineState)
@tokenIterator.reset(lineState)
while iterator.next()
for scope in iterator.getScopeEnds()
while @tokenIterator.next()
for scope in @tokenIterator.getScopeEnds()
innerHTML += "</span>"
for scope in iterator.getScopeStarts()
for scope in @tokenIterator.getScopeStarts()
innerHTML += "<span class=\"#{scope.replace(/\.+/g, ' ')}\">"
tokenStart = iterator.getScreenStart()
tokenEnd = iterator.getScreenEnd()
tokenText = iterator.getText()
isHardTab = iterator.isHardTab()
tokenStart = @tokenIterator.getScreenStart()
tokenEnd = @tokenIterator.getScreenEnd()
tokenText = @tokenIterator.getText()
isHardTab = @tokenIterator.isHardTab()
if hasLeadingWhitespace = tokenStart < firstNonWhitespaceIndex
tokenFirstNonWhitespaceIndex = firstNonWhitespaceIndex - tokenStart
@@ -209,10 +210,10 @@ class LinesComponent
innerHTML += @buildTokenHTML(tokenText, isHardTab, tokenFirstNonWhitespaceIndex, tokenFirstTrailingWhitespaceIndex, hasIndentGuide, hasInvisibleCharacters)
for scope in iterator.getScopeEnds()
for scope in @tokenIterator.getScopeEnds()
innerHTML += "</span>"
for scope in iterator.getScopes()
for scope in @tokenIterator.getScopes()
innerHTML += "</span>"
innerHTML += @buildEndOfLineHTML(id)
@@ -353,15 +354,15 @@ class LinesComponent
iterator = null
charIndex = 0
tokenIterator = TokenIterator.instance.reset(tokenizedLine)
while tokenIterator.next()
scopes = tokenIterator.getScopes()
text = tokenIterator.getText()
@tokenIterator.reset(tokenizedLine)
while @tokenIterator.next()
scopes = @tokenIterator.getScopes()
text = @tokenIterator.getText()
charWidths = @presenter.getScopedCharacterWidths(scopes)
textIndex = 0
while textIndex < text.length
if tokenIterator.isPairedCharacter()
if @tokenIterator.isPairedCharacter()
char = text
charLength = 2
textIndex += 2