github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-14 08:35:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Account for softWrapIndent when assigning indices on soft wrap line

Browse Source
This commit is contained in:
Nathan Sobo
2015-05-12 19:37:26 +02:00
parent d90d1f0ea7
commit 8ab9a9f9bb
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tokenized-line.coffee
View File

@@ -361,11 +361,12 @@ class TokenizedLine
softWrapIndent = @indentLevel * @tabLength + (hangingIndent ? 0)
rightText = ' ' + rightText for i in [0...softWrapIndent] by 1
while softWrapIndent > 0
indentToken = Math.min(softWrapIndent, @tabLength)
remainingSoftWrapIndent = softWrapIndent
while remainingSoftWrapIndent > 0
indentToken = Math.min(remainingSoftWrapIndent, @tabLength)
rightSpecialTokens[rightTags.length] = SoftWrapIndent
rightTags.push(indentToken)
softWrapIndent -= indentToken
remainingSoftWrapIndent -= indentToken
rightTags.push(rightPrefix) if rightPrefix > 0
@@ -421,8 +422,8 @@ class TokenizedLine
rightFragment.indentLevel = @indentLevel
rightFragment.tabLength = @tabLength
rightFragment.endOfLineInvisibles = @endOfLineInvisibles
rightFragment.firstNonWhitespaceIndex = Math.max(0, @firstNonWhitespaceIndex - column)
rightFragment.firstTrailingWhitespaceIndex = Math.max(0, @firstTrailingWhitespaceIndex - column)
rightFragment.firstNonWhitespaceIndex = Math.max(softWrapIndent, @firstNonWhitespaceIndex - column + softWrapIndent)
rightFragment.firstTrailingWhitespaceIndex = Math.max(softWrapIndent, @firstTrailingWhitespaceIndex - column + softWrapIndent)
[leftFragment, rightFragment]