diff --git a/spec/text-editor-presenter-spec.coffee b/spec/text-editor-presenter-spec.coffee
index de2dd780d..40dae08cc 100644
--- a/spec/text-editor-presenter-spec.coffee
+++ b/spec/text-editor-presenter-spec.coffee
@@ -670,7 +670,11 @@ describe "TextEditorPresenter", ->
           expectValues lineStateForScreenRow(presenter, 4), {
             screenRow: 4
             text: line4.text
-            tokens: line4.tokens
+            tags: line4.tags
+            specialTokens: line4.specialTokens
+            firstNonWhitespaceIndex: line4.firstNonWhitespaceIndex
+            firstTrailingWhitespaceIndex: line4.firstTrailingWhitespaceIndex
+            invisibles: line4.invisibles
             top: 10 * 4
           }
 
@@ -678,7 +682,11 @@ describe "TextEditorPresenter", ->
           expectValues lineStateForScreenRow(presenter, 5), {
             screenRow: 5
             text: line5.text
-            tokens: line5.tokens
+            tags: line5.tags
+            specialTokens: line5.specialTokens
+            firstNonWhitespaceIndex: line5.firstNonWhitespaceIndex
+            firstTrailingWhitespaceIndex: line5.firstTrailingWhitespaceIndex
+            invisibles: line5.invisibles
             top: 10 * 5
           }
 
@@ -686,7 +694,11 @@ describe "TextEditorPresenter", ->
           expectValues lineStateForScreenRow(presenter, 6), {
             screenRow: 6
             text: line6.text
-            tokens: line6.tokens
+            tags: line6.tags
+            specialTokens: line6.specialTokens
+            firstNonWhitespaceIndex: line6.firstNonWhitespaceIndex
+            firstTrailingWhitespaceIndex: line6.firstTrailingWhitespaceIndex
+            invisibles: line6.invisibles
             top: 10 * 6
           }
 
@@ -694,7 +706,11 @@ describe "TextEditorPresenter", ->
           expectValues lineStateForScreenRow(presenter, 7), {
             screenRow: 7
             text: line7.text
-            tokens: line7.tokens
+            tags: line7.tags
+            specialTokens: line7.specialTokens
+            firstNonWhitespaceIndex: line7.firstNonWhitespaceIndex
+            firstTrailingWhitespaceIndex: line7.firstTrailingWhitespaceIndex
+            invisibles: line7.invisibles
             top: 10 * 7
           }
 
@@ -702,7 +718,11 @@ describe "TextEditorPresenter", ->
           expectValues lineStateForScreenRow(presenter, 8), {
             screenRow: 8
             text: line8.text
-            tokens: line8.tokens
+            tags: line8.tags
+            specialTokens: line8.specialTokens
+            firstNonWhitespaceIndex: line8.firstNonWhitespaceIndex
+            firstTrailingWhitespaceIndex: line8.firstTrailingWhitespaceIndex
+            invisibles: line8.invisibles
             top: 10 * 8
           }
 
@@ -797,19 +817,19 @@ describe "TextEditorPresenter", ->
           line1 = editor.tokenizedLineForScreenRow(1)
           expectValues lineStateForScreenRow(presenter, 1), {
             text: line1.text
-            tokens: line1.tokens
+            tags: line1.tags
           }
 
           line2 = editor.tokenizedLineForScreenRow(2)
           expectValues lineStateForScreenRow(presenter, 2), {
             text: line2.text
-            tokens: line2.tokens
+            tags: line2.tags
           }
 
           line3 = editor.tokenizedLineForScreenRow(3)
           expectValues lineStateForScreenRow(presenter, 3), {
             text: line3.text
-            tokens: line3.tokens
+            tags: line3.tags
           }
 
         it "does not remove out-of-view lines corresponding to ::mouseWheelScreenRow until ::stoppedScrollingDelay elapses", ->
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 9be8e9bc0..7fb742bae 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -342,7 +342,6 @@ class TextEditorPresenter
       firstTrailingWhitespaceIndex: line.firstTrailingWhitespaceIndex
       invisibles: line.invisibles
       endOfLineInvisibles: line.endOfLineInvisibles
-      tokens: line.tokens
       isOnlyWhitespace: line.isOnlyWhitespace()
       indentLevel: line.indentLevel
       tabLength: line.tabLength