From b8beec6f55e9411121e8f4980332eb420389e523 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Nathan Sobo <cj+nathan@github.com>
Date: Tue, 6 Nov 2012 11:41:48 -0800
Subject: [PATCH] Remove foldable from ScreenLine

---
 spec/app/display-buffer-spec.coffee | 15 ---------------
 src/app/display-buffer.coffee       |  1 -
 src/app/screen-line.coffee          |  6 ++----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/spec/app/display-buffer-spec.coffee b/spec/app/display-buffer-spec.coffee
index 261960e67..d3db0b6f0 100644
--- a/spec/app/display-buffer-spec.coffee
+++ b/spec/app/display-buffer-spec.coffee
@@ -145,21 +145,6 @@ describe "DisplayBuffer", ->
         expect(event.lineNumbersChanged).toBeTruthy()
 
   describe "structural folding", ->
-    describe "the foldable flag on screen lines", ->
-      it "sets 'foldable' to true for screen lines that start a foldable region", ->
-        expect(displayBuffer.lineForRow(0).foldable).toBeTruthy()
-        expect(displayBuffer.lineForRow(1).foldable).toBeTruthy()
-        expect(displayBuffer.lineForRow(2).foldable).toBeFalsy()
-        expect(displayBuffer.lineForRow(3).foldable).toBeFalsy()
-
-      describe "when a foldable line is wrapped", ->
-        it "only marks the first screen line as foldable", ->
-          displayBuffer.setSoftWrapColumn(20)
-          expect(displayBuffer.lineForRow(0).foldable).toBeTruthy()
-          expect(displayBuffer.lineForRow(1).foldable).toBeFalsy()
-          expect(displayBuffer.lineForRow(2).foldable).toBeTruthy()
-          expect(displayBuffer.lineForRow(3).foldable).toBeFalsy()
-
     describe ".unfoldAll()", ->
       it "unfolds every folded line", ->
         displayBuffer.foldBufferRow(0)
diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index 2f2a6191f..b4f07877f 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -222,7 +222,6 @@ class DisplayBuffer
     startBufferColumn = 0
     while currentBufferRow <= endBufferRow
       screenLine = @tokenizedBuffer.lineForScreenRow(currentBufferRow)
-      screenLine.foldable = @languageMode.doesBufferRowStartFold(currentBufferRow)
 
       if fold = @largestFoldStartingAtBufferRow(currentBufferRow)
         screenLine = screenLine.copy()
diff --git a/src/app/screen-line.coffee b/src/app/screen-line.coffee
index b9227ef1c..cb48d4291 100644
--- a/src/app/screen-line.coffee
+++ b/src/app/screen-line.coffee
@@ -2,14 +2,13 @@ _ = require 'underscore'
 
 module.exports =
 class ScreenLine
-  constructor: ({@tokens, @ruleStack, @bufferRows, @startBufferColumn, @fold, @foldable}) ->
+  constructor: ({@tokens, @ruleStack, @bufferRows, @startBufferColumn, @fold}) ->
     @bufferRows ?= 1
     @startBufferColumn ?= 0
-    @foldable ?= false
     @text = _.pluck(@tokens, 'value').join('')
 
   copy: ->
-    new ScreenLine({@tokens, @ruleStack, @bufferRows, @startBufferColumn, @fold, @foldable})
+    new ScreenLine({@tokens, @ruleStack, @bufferRows, @startBufferColumn, @fold})
 
   clipScreenColumn: (column, options={}) ->
     { skipAtomicTokens } = options
@@ -74,7 +73,6 @@ class ScreenLine
       bufferRows: 0
       startBufferColumn: @startBufferColumn
       ruleStack: @ruleStack
-      foldable: @foldable
     )
     rightFragment = new ScreenLine(
       tokens: rightTokens