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

Render correct classes on leading/trailing whitespace spans

Browse Source
This commit is contained in:
Nathan Sobo
2014-08-11 14:39:04 -06:00
parent 2daf70f0e5
commit 052f9580f2
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tokenized-line.coffee
View File

@@ -138,15 +138,17 @@ class TokenizedLine
outputTokens
markLeadingAndTrailingWhitespaceTokens: ->
firstNonWhitespacePosition = @text.search(NonWhitespaceRegex)
firstTrailingWhitespacePosition = @text.search(TrailingWhitespaceRegex)
lineIsWhitespaceOnly = firstTrailingWhitespacePosition is 0
position = 0
for token, i in @tokens
token.hasLeadingWhitespace = position < firstNonWhitespacePosition
firstNonWhitespaceIndex = @text.search(NonWhitespaceRegex)
firstTrailingWhitespaceIndex = @text.search(TrailingWhitespaceRegex)
lineIsWhitespaceOnly = firstTrailingWhitespaceIndex is 0
index = 0
for token in @tokens
if token.hasLeadingWhitespace = index < firstNonWhitespaceIndex
token.firstNonWhitespaceIndex = firstNonWhitespaceIndex - index
# Only the *last* segment of a soft-wrapped line can have trailing whitespace
token.hasTrailingWhitespace = @lineEnding? and (position + token.value.length > firstTrailingWhitespacePosition)
position += token.value.length
if token.hasTrailingWhitespace = @lineEnding? and (index + token.value.length > firstTrailingWhitespaceIndex)
token.firstTrailingWhitespaceIndex = Math.max(0, firstTrailingWhitespaceIndex - index)
index += token.value.length
substituteInvisibleCharacters: ->
invisibles = @invisibles