From 5aba734a412e484d573f52daa4f7dc187a489dc3 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 18 Mar 2016 19:19:38 -0600
Subject: [PATCH] Remove specialTokens object from TokenizedLine

---
 src/token-iterator.coffee | 38 ++------------------------------------
 src/tokenized-line.coffee | 16 ----------------
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/src/token-iterator.coffee b/src/token-iterator.coffee
index 8f0fe202f..259bfd346 100644
--- a/src/token-iterator.coffee
+++ b/src/token-iterator.coffee
@@ -1,6 +1,3 @@
-{SoftTab, HardTab, PairedCharacter, SoftWrapIndent} = require './special-token-symbols'
-{isDoubleWidthCharacter, isHalfWidthCharacter, isKoreanCharacter} = require './text-utils'
-
 module.exports =
 class TokenIterator
   constructor: ({@grammarRegistry}, line, enableScopes) ->
@@ -32,15 +29,8 @@ class TokenIterator
         @handleScopeForTag(tag) if @enableScopes
         @index++
       else
-        if @isHardTab()
-          @screenEnd = @screenStart + tag
-          @bufferEnd = @bufferStart + 1
-        else if @isSoftWrapIndentation()
-          @screenEnd = @screenStart + tag
-          @bufferEnd = @bufferStart + 0
-        else
-          @screenEnd = @screenStart + tag
-          @bufferEnd = @bufferStart + tag
+        @screenEnd = @screenStart + tag
+        @bufferEnd = @bufferStart + tag
 
         @text = @line.text.substring(@screenStart, @screenEnd)
         return true
@@ -80,27 +70,3 @@ class TokenIterator
   getScopes: -> @scopes
 
   getText: -> @text
-
-  isSoftTab: ->
-    @line.specialTokens[@index] is SoftTab
-
-  isHardTab: ->
-    @line.specialTokens[@index] is HardTab
-
-  isSoftWrapIndentation: ->
-    @line.specialTokens[@index] is SoftWrapIndent
-
-  isPairedCharacter: ->
-    @line.specialTokens[@index] is PairedCharacter
-
-  hasDoubleWidthCharacterAt: (charIndex) ->
-    isDoubleWidthCharacter(@getText()[charIndex])
-
-  hasHalfWidthCharacterAt: (charIndex) ->
-    isHalfWidthCharacter(@getText()[charIndex])
-
-  hasKoreanCharacterAt: (charIndex) ->
-    isKoreanCharacter(@getText()[charIndex])
-
-  isAtomic: ->
-    @isSoftTab() or @isHardTab() or @isSoftWrapIndentation() or @isPairedCharacter()
diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
index 62dadc836..39a551586 100644
--- a/src/tokenized-line.coffee
+++ b/src/tokenized-line.coffee
@@ -1,22 +1,7 @@
 _ = require 'underscore-plus'
 {isPairedCharacter, isCJKCharacter} = require './text-utils'
 Token = require './token'
-{SoftTab, HardTab, PairedCharacter, SoftWrapIndent} = require './special-token-symbols'
-
-NonWhitespaceRegex = /\S/
-LeadingWhitespaceRegex = /^\s*/
-TrailingWhitespaceRegex = /\s*$/
-RepeatedSpaceRegex = /[ ]/g
 CommentScopeRegex = /(\b|\.)comment/
-TabCharCode = 9
-SpaceCharCode = 32
-SpaceString = ' '
-TabStringsByLength = {
-  1: ' '
-  2: '  '
-  3: '   '
-  4: '    '
-}
 
 idCounter = 1
 
@@ -31,7 +16,6 @@ class TokenizedLine
 
     return unless properties?
 
-    @specialTokens = {}
     {@openScopes, @text, @tags, @lineEnding, @ruleStack, @tokenIterator} = properties
     {@startBufferColumn, @fold, @tabLength, @invisibles} = properties