Fix notification of display layers and decoration layers when reloading

Author: maxbrunsfeld

spec/text-buffer-io-spec.js

@@ -159,6 +159,27 @@ describe('TextBuffer IO', () => {
       })
     })
 
+    it('notifies decoration layers and display layers of the change', (done) => {
+      fs.writeFileSync(filePath, 'abcdefghijk', 'utf8')
+
+      const events = []
+
+      const displayLayer = buffer.addDisplayLayer()
+      displayLayer.onDidChangeSync((event) => events.push(['display-layer', event]))
+
+      buffer.registerTextDecorationLayer({
+        bufferDidChange ({oldRange, newRange}) { events.push(['decoration-layer', {oldRange, newRange}]) }
+      })
+
+      buffer.reload().then(() => {
+        expect(events).toEqual([
+          ['decoration-layer', {oldRange: Range(Point(0, 7), Point(0, 7)), newRange: Range(Point(0, 7), Point(0, 11))}],
+          ['display-layer', [{start: Point(0, 0), oldExtent: Point(1, 0), newExtent: Point(1, 0)}]]
+        ])
+        done()
+      })
+    })
+
     it('clears the contents of the buffer when the file doesn\t exist', (done) => {
       buffer.delete([[0, 0], [0, 2]])
 

src/helpers.js

@@ -105,22 +105,36 @@ class TextChange {
 }
 
 Object.defineProperty(TextChange.prototype, 'start', {
-  get: function () {
-    return this.newRange.start
-  },
+  get () { return this.newRange.start },
+  enumerable: false
+})
+
+Object.defineProperty(TextChange.prototype, 'oldStart', {
+  get () { return this.oldRange.start },
+  enumerable: false
+})
+
+Object.defineProperty(TextChange.prototype, 'newStart', {
+  get () { return this.newRange.start },
+  enumerable: false
+})
+
+Object.defineProperty(TextChange.prototype, 'oldEnd', {
+  get () { return this.oldRange.end },
+  enumerable: false
+})
+
+Object.defineProperty(TextChange.prototype, 'newEnd', {
+  get () { return this.newRange.end },
   enumerable: false
 })
 
 Object.defineProperty(TextChange.prototype, 'oldExtent', {
-  get: function () {
-    return this.oldRange.getExtent()
-  },
+  get () { return this.oldRange.getExtent() },
   enumerable: false
 })
 
 Object.defineProperty(TextChange.prototype, 'newExtent', {
-  get: function () {
-    return this.newRange.getExtent()
-  },
+  get () { return this.newRange.getExtent() },
   enumerable: false
 })

src/text-buffer.coffee

@@ -24,9 +24,9 @@ class ChangeEvent
   constructor: (buffer, changes) ->
     @changes = changes
 
-    start = changes[0].oldRange.start
-    oldEnd = changes[changes.length - 1].oldRange.end
-    newEnd = changes[changes.length - 1].newRange.end
+    start = changes[0].oldStart
+    oldEnd = changes[changes.length - 1].oldEnd
+    newEnd = changes[changes.length - 1].newEnd
     @oldRange = new Range(start, oldEnd).freeze()
     @newRange = new Range(start, newEnd).freeze()
 
@@ -1792,6 +1792,7 @@ class TextBuffer
       markersSnapshot = @createMarkerSnapshot()
       @historyProvider.groupChangesSinceCheckpoint(checkpoint, {markers: markersSnapshot, deleteCheckpoint: true})
 
+      @emitDidChangeEvent(new ChangeEvent(this, changes))
       @emitDidChangeTextEvent()
       @emitMarkerChangeEvents(markersSnapshot)
       @emitModifiedStatusChanged(@isModified())