From 38118b66cbfbfec97aef4968714e6cfc35f576e7 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 16 Feb 2015 15:47:17 +0100 Subject: [PATCH] Do not rely on text anymore, check phantom tokens instead --- src/display-buffer.coffee | 4 ++-- src/tokenized-line.coffee | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee index 8b30851fd..89026ed67 100644 --- a/src/display-buffer.coffee +++ b/src/display-buffer.coffee @@ -867,7 +867,7 @@ class DisplayBuffer extends Model if /\s/.test(line.text[softWrapColumn]) # search forward for the start of a word past the boundary - for column in [softWrapColumn..line.text.length] when line.isOutsidePhantomToken(column) + for column in [softWrapColumn..line.text.length] return column if /\S/.test(line.text[column]) return line.text.length @@ -1164,7 +1164,7 @@ class DisplayBuffer extends Model softWraps = 0 while wrapScreenColumn = @findWrapColumn(tokenizedLine) [wrappedLine, tokenizedLine] = tokenizedLine.softWrapAt(wrapScreenColumn) - break if wrappedLine.text == tokenizedLine.text + break if wrappedLine.hasOnlyPhantomTokens() screenLines.push(wrappedLine) softWraps++ screenLines.push(tokenizedLine) diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee index 446556e0e..d88610ef7 100644 --- a/src/tokenized-line.coffee +++ b/src/tokenized-line.coffee @@ -130,6 +130,9 @@ class TokenizedLine isInsidePhantomToken: (column) -> @tokens[0].isPhantom && column < @tokens[0].screenDelta + hasOnlyPhantomTokens: -> + @tokens.length == 1 && @tokens[0].isPhantom + tokenAtBufferColumn: (bufferColumn) -> @tokens[@tokenIndexAtBufferColumn(bufferColumn)]