DisplayBuffer.destroyFoldsContainingBufferRow destroys all folds containing buffer row (instead of just folds starting at buffer row)

spec/app/display-buffer-spec.coffee

@@ -530,14 +530,22 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.bufferPositionForScreenPosition([9, 2])).toEqual [12, 2]
 
     describe ".destroyFoldsContainingBufferRow(row)", ->
-      describe "when two folds start on the given buffer row", ->
-        it "destroys both folds", ->
+      it "destroys all folds containing the given row", ->
           displayBuffer.createFold(2, 4)
           displayBuffer.createFold(2, 6)
+          displayBuffer.createFold(7, 8)
+          displayBuffer.createFold(1, 9)
+          displayBuffer.createFold(11, 12)
+
+          expect(displayBuffer.lineForRow(1).text).toBe '1'
+          expect(displayBuffer.lineForRow(2).text).toBe '10'
 
-          expect(displayBuffer.lineForRow(3).text).toBe '7'
           displayBuffer.destroyFoldsContainingBufferRow(2)
-          expect(displayBuffer.lineForRow(3).text).toBe '3'
+          expect(displayBuffer.lineForRow(1).text).toBe '1'
+          expect(displayBuffer.lineForRow(2).text).toBe '2'
+          expect(displayBuffer.lineForRow(7).fold).toBeDefined()
+          expect(displayBuffer.lineForRow(8).text).toMatch /^9-+/
+          expect(displayBuffer.lineForRow(10).fold).toBeDefined()
 
   describe ".clipScreenPosition(screenPosition, wrapBeyondNewlines: false, wrapAtSoftNewlines: false, skipAtomicTokens: false)", ->
     beforeEach ->

src/app/display-buffer.coffee

@@ -108,8 +108,9 @@ class DisplayBuffer
       @trigger 'change', oldRange: oldScreenRange, newRange: newScreenRange, lineNumbersChanged: true
 
   destroyFoldsContainingBufferRow: (bufferRow) ->
-    folds = @activeFolds[bufferRow] ? []
-    fold.destroy() for fold in new Array(folds...)
+    for row, folds of @activeFolds
+      for fold in new Array(folds...)
+        fold.destroy() if fold.getBufferRange().containsRow(bufferRow)
 
   registerFold: (fold) ->
     @activeFolds[fold.startRow] ?= []

src/app/range.coffee

@@ -50,6 +50,9 @@ class Range
     point = Point.fromObject(point)
     point.isGreaterThanOrEqual(@start) and point.isLessThanOrEqual(@end)
 
+  containsRow: (row) ->
+    @start.row <= row <= @end.row
+
   union: (otherRange) ->
     start = if @start.isLessThan(otherRange.start) then @start else otherRange.start
     end = if @end.isGreaterThan(otherRange.end) then @end else otherRange.end