From ca0832e58e27da862ba7e745ddfa663b72a635bf Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Sat, 20 Jul 2013 16:41:46 -0700
Subject: [PATCH] Include folds in DisplayBuffer deserialization

---
 spec/app/display-buffer-spec.coffee | 4 +++-
 src/app/display-buffer.coffee       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/app/display-buffer-spec.coffee b/spec/app/display-buffer-spec.coffee
index b68bed630..6f9d7678c 100644
--- a/spec/app/display-buffer-spec.coffee
+++ b/spec/app/display-buffer-spec.coffee
@@ -17,13 +17,15 @@ describe "DisplayBuffer", ->
     buffer.release()
 
   describe "@deserialize(state)", ->
-    it "constructs a display buffer with the same buffer, softWrapColumn, and tabLength", ->
+    it "constructs a display buffer with the same buffer, folds, softWrapColumn, and tabLength", ->
       displayBuffer.setTabLength(4)
       displayBuffer.setSoftWrapColumn(64)
+      displayBuffer.createFold(2, 4)
       displayBuffer2 = deserialize(displayBuffer.serialize())
       expect(displayBuffer2.id).toBe displayBuffer.id
       expect(displayBuffer2.buffer).toBe displayBuffer.buffer
       expect(displayBuffer2.tokenizedBuffer.buffer).toBe displayBuffer.tokenizedBuffer.buffer
+      expect(displayBuffer2.isFoldedAtBufferRow(2)).toBeTruthy()
       expect(displayBuffer2.getSoftWrapColumn()).toBe displayBuffer.getSoftWrapColumn()
       expect(displayBuffer2.getTabLength()).toBe displayBuffer.getTabLength()
 
diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index f913f5a4e..5742c926f 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -43,6 +43,7 @@ class DisplayBuffer
     @markers = {}
     @foldsByMarkerId = {}
     @updateAllScreenLines()
+    @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
     @tokenizedBuffer.on 'grammar-changed', (grammar) => @trigger 'grammar-changed', grammar
     @tokenizedBuffer.on 'changed', @handleTokenizedBufferChange
     @subscribe @buffer, 'markers-updated', @handleBufferMarkersUpdated