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

Improve TokenizedLine#clipScreenColumn

Browse Source
This commit is contained in:
Antonio Scandurra
2015-02-16 12:53:09 +01:00
parent 5ce01118be
commit 469876161a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/display-buffer.coffee
View File

@@ -841,10 +841,7 @@ class DisplayBuffer extends Model
if screenLine.isSoftWrapped() and column >= maxScreenColumn
if wrapAtSoftNewlines
row++
column = if @screenLines[row].tokens[0].isPhantom
@screenLines[row].tokens[0].screenDelta
else
0
column = @screenLines[row].clipScreenColumn(0)
else
column = screenLine.clipScreenColumn(maxScreenColumn - 1)
else if screenLine.tokens[0].isPhantom and column < screenLine.tokens[0].screenDelta

4
src/tokenized-line.coffee
View File

@@ -48,7 +48,9 @@ class TokenizedLine
break if tokenStartColumn + token.screenDelta > column
tokenStartColumn += token.screenDelta
if token.isAtomic and tokenStartColumn < column
if token.isPhantom and tokenStartColumn <= column
tokenStartColumn + token.screenDelta
else if token.isAtomic and tokenStartColumn < column
if skipAtomicTokens
tokenStartColumn + token.screenDelta
else