From 4f1c8da1327e4c8e391c7b96ac44f3935ff98c7e Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 6 Mar 2012 19:24:14 -0700
Subject: [PATCH] Individual tokens no longer need an isAtomic property

---
 src/atom/renderer.coffee             |  2 +-
 src/atom/screen-line-fragment.coffee | 21 ++++-----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/atom/renderer.coffee b/src/atom/renderer.coffee
index e7ccd6492..5114da2da 100644
--- a/src/atom/renderer.coffee
+++ b/src/atom/renderer.coffee
@@ -192,7 +192,7 @@ class Renderer
     folds.sort (a, b) -> a.compare(b)
 
   buildFoldPlaceholder: (fold) ->
-    token = {value: '...', type: 'fold-placeholder', fold, isAtomic: true}
+    token = { value: '...', type: 'fold-placeholder', fold }
     new ScreenLineFragment([token], '...', [0, 3], fold.getRange().toDelta(), isAtomic: true)
 
   screenLineRangeForBufferRange: (bufferRange) ->
diff --git a/src/atom/screen-line-fragment.coffee b/src/atom/screen-line-fragment.coffee
index 30c546baa..be1314c4c 100644
--- a/src/atom/screen-line-fragment.coffee
+++ b/src/atom/screen-line-fragment.coffee
@@ -34,17 +34,10 @@ class ScreenLineFragment
     [leftFragment, rightFragment]
 
   splitTokenAt: (token, splitIndex) ->
-    if token.isAtomic
-      [@buildFillerToken(splitIndex), token]
-    else
-      { type, value } = token
-      value1 = value.substring(0, splitIndex)
-      value2 = value.substring(splitIndex)
-      [{value: value1, type }, {value: value2, type}]
-
-  buildFillerToken: (length) ->
-    text = (' ' for i in [0...length]).join('')
-    { value: text, type: 'text' }
+    { type, value } = token
+    value1 = value.substring(0, splitIndex)
+    value2 = value.substring(splitIndex)
+    [{value: value1, type }, {value: value2, type}]
 
   concat: (other) ->
     tokens = @tokens.concat(other.tokens)
@@ -53,12 +46,6 @@ class ScreenLineFragment
     bufferDelta = @bufferDelta.add(other.bufferDelta)
     new ScreenLineFragment(tokens, text, screenDelta, bufferDelta)
 
-  lengthForClipping: ->
-    if @isAtomic
-      0
-    else
-      @text.length
-
   isSoftWrapped: ->
     @screenDelta.row == 1 and @bufferDelta.row == 0