github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Include folds in DisplayBuffer deserialization

Browse Source
This commit is contained in:
Nathan Sobo
2013-07-20 16:41:46 -07:00
parent 503629fdcb
commit ca0832e58e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/app/display-buffer-spec.coffee
View File

@@ -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()

1
src/app/display-buffer.coffee
View File

@@ -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