Don't emit events after MarkerTextDecorationLayer has been destroyed

atom · May 2, 2017 · 7cf95b2 · 7cf95b2
1 parent c869372
commit 7cf95b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/spec/marker-text-decoration-layer-spec.js b/spec/marker-text-decoration-layer-spec.js
@@ -122,5 +122,11 @@ describe('MarkerTextDecorationLayer', () => {
     expect(rangeInvalidationEvents).toEqual([])
     textDecorationLayer.clearInvalidatedRanges()
     expect(textDecorationLayer.getInvalidatedRanges()).toEqual([])
+
+    rangeInvalidationEvents = []
+    textDecorationLayer.destroy()
+    marker2.setRange(Range(Point(2, 1), Point(2, 7)))
+    expect(textDecorationLayer.getInvalidatedRanges()).toEqual([])
+    expect(rangeInvalidationEvents).toEqual([])
   })
 })
diff --git a/src/marker-layer.coffee b/src/marker-layer.coffee
@@ -410,6 +410,9 @@ class MarkerLayer
   registerMarkerTextDecorationLayer: (markerTextDecorationLayer) ->
     @markerTextDecorationLayers.add(markerTextDecorationLayer)
 
+  unregisterMarkerTextDecorationLayer: (markerTextDecorationLayer) ->
+    @markerTextDecorationLayers.delete(markerTextDecorationLayer)
+
 filterSet = (set1, set2) ->
   if set1
     intersectSet(set1, set2)

diff --git a/src/marker-text-decoration-layer.js b/src/marker-text-decoration-layer.js
@@ -13,6 +13,10 @@ class MarkerTextDecorationLayer {
     this.inlineStyleForScopeId = inlineStyleForMarkerId || NOOP
   }
 
+  destroy () {
+    this.markerLayer.unregisterMarkerTextDecorationLayer(this)
+  }
+
   buildIterator () {
     return new MarkerTextDecorationLayerIterator(this)
   }