From b0c670b80afe9c4034f8e9ff78a1b7f048324fc2 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 18 Feb 2015 09:52:23 +0100
Subject: [PATCH] Better naming

...thanks @nathansobo
---
 src/display-buffer.coffee | 4 ++--
 src/token.coffee          | 2 +-
 src/tokenized-line.coffee | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index 89026ed67..da86e5d2c 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -844,7 +844,7 @@ class DisplayBuffer extends Model
         column = @screenLines[row].clipScreenColumn(0)
       else
         column = screenLine.clipScreenColumn(maxScreenColumn - 1)
-    else if screenLine.isInsidePhantomToken(column)
+    else if screenLine.isColumnInsidePhantomToken(column)
       row--
       column = @screenLines[row].getMaxScreenColumn()
     else if wrapBeyondNewlines and column > maxScreenColumn and row < @getLastRow()
@@ -873,7 +873,7 @@ class DisplayBuffer extends Model
       return line.text.length
     else
       # search backward for the start of the word on the boundary
-      for column in [softWrapColumn..0] when line.isOutsidePhantomToken(column)
+      for column in [softWrapColumn..0] when line.isColumnOutsidePhantomToken(column)
         return column + 1 if /\s/.test(line.text[column])
 
       return softWrapColumn
diff --git a/src/token.coffee b/src/token.coffee
index 2c82fa23f..76386fb85 100644
--- a/src/token.coffee
+++ b/src/token.coffee
@@ -144,7 +144,7 @@ class Token
       isHardTab: isHardTab
     )
 
-  buildPhantomToken: (length) ->
+  buildPhantomTabToken: (length) ->
     new Token(
       value: _.multiplyString(" ", length),
       scopes: @scopes,
diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
index 3878cf181..d40352303 100644
--- a/src/tokenized-line.coffee
+++ b/src/tokenized-line.coffee
@@ -99,7 +99,7 @@ class TokenizedLine
       leftTextLength += nextToken.value.length
       leftTokens.push nextToken
 
-    tab = leftTokens[0].buildPhantomToken(@indentLevel * @tabLength)
+    phantomTab = leftTokens[0].buildPhantomTabToken(@indentLevel * @tabLength)
 
     leftFragment = new TokenizedLine(
       tokens: leftTokens
@@ -111,7 +111,7 @@ class TokenizedLine
       tabLength: @tabLength
     )
     rightFragment = new TokenizedLine(
-      tokens: [tab].concat(rightTokens)
+      tokens: [phantomTab].concat(rightTokens)
       startBufferColumn: @bufferColumnForScreenColumn(column)
       ruleStack: @ruleStack
       invisibles: @invisibles
@@ -124,12 +124,12 @@ class TokenizedLine
   isSoftWrapped: ->
     @lineEnding is null
 
-  isOutsidePhantomToken: (column) ->
+  isColumnOutsidePhantomToken: (column) ->
     return true unless @tokens[0].isPhantom
 
     column > @tokens[0].screenDelta
 
-  isInsidePhantomToken: (column) ->
+  isColumnInsidePhantomToken: (column) ->
     return false unless @tokens[0].isPhantom
 
     column < @tokens[0].screenDelta