If the cursor is at any buffer position inside a fold, backspace dele…

…tes the folded text
dannguyen · Jun 15, 2012 · 95622dc · 95622dc
1 parent 8d516fe
commit 95622dc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/spec/app/edit-session-spec.coffee b/spec/app/edit-session-spec.coffee
@@ -794,8 +794,8 @@ describe "EditSession", ->
 
         describe "when the cursor is on a folded screen line", ->
           it "deletes all of the folded lines along with the fold", ->
-            editSession.toggleFoldAtBufferRow(1)
-            editSession.setCursorScreenPosition([1, 0])
+            editSession.setCursorBufferPosition([3, 0])
+            editSession.toggleFold()
             editSession.backspace()
             expect(buffer.lineForRow(1)).toBe ""
             expect(buffer.lineForRow(2)).toBe "  return sort(Array.apply(this, arguments));"

diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
@@ -129,6 +129,13 @@ class DisplayBuffer
   largestFoldStartingAtScreenRow: (screenRow) ->
     @largestFoldStartingAtBufferRow(@bufferRowForScreenRow(screenRow))
 
+  largestFoldContainingBufferRow: (bufferRow) ->
+    largestFold = null
+    for currentBufferRow in [bufferRow..0]
+      if fold = @largestFoldStartingAtBufferRow(currentBufferRow)
+        largestFold = fold if fold.endRow >= bufferRow
+    largestFold
+
   screenLineRangeForBufferRange: (bufferRange) ->
     @expandScreenRangeToLineEnds(
       @lineMap.screenRangeForBufferRange(

diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
@@ -207,6 +207,9 @@ class EditSession
   largestFoldStartingAtBufferRow: (bufferRow) ->
     @displayBuffer.largestFoldStartingAtBufferRow(bufferRow)
 
+  largestFoldContainingBufferRow: (bufferRow) ->
+    @displayBuffer.largestFoldContainingBufferRow(bufferRow)
+
   largestFoldStartingAtScreenRow: (screenRow) ->
     @displayBuffer.largestFoldStartingAtScreenRow(screenRow)
 

diff --git a/src/app/selection.coffee b/src/app/selection.coffee
@@ -145,21 +145,23 @@ class Selection
     @deleteSelectedText()
 
   delete: ->
+    deleteNewlinesAfterFolds = true
     if @isEmpty()
       if @cursor.isAtEndOfLine() and fold = @editSession.largestFoldStartingAtScreenRow(@cursor.getCurrentScreenRow() + 1)
         @selectToBufferPosition(fold.getBufferRange().end)
+        deleteNewlinesAfterFolds = false
       else
         @selectRight()
-    @deleteSelectedText()
+    @deleteSelectedText({ deleteNewlinesAfterFolds })
 
   deleteToEndOfWord: ->
     @selectToEndOfWord() if @isEmpty()
     @deleteSelectedText()
 
-  deleteSelectedText: ->
+  deleteSelectedText: (options = {}) ->
     bufferRange = @getBufferRange()
-    if fold = @editSession.largestFoldStartingAtBufferRow(bufferRange.end.row)
-      bufferRange = bufferRange.union(fold.getBufferRange(includeNewline: true))
+    if fold = @editSession.largestFoldContainingBufferRow(bufferRange.end.row)
+      bufferRange = bufferRange.union(fold.getBufferRange(includeNewline: options.deleteNewlinesAfterFolds ? true))
 
     @editSession.buffer.delete(bufferRange) unless bufferRange.isEmpty()
     if @cursor