github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support moving down folds around folds

Browse Source
This commit is contained in:
Kevin Sawicki
2014-02-11 11:29:47 -08:00
parent a93bfb5f8c
commit 04c59952d5
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/editor.coffee
View File

@@ -669,10 +669,12 @@ class Editor extends Model
rows.shift() unless @isFoldedAtBufferRow(selection.end.row)
# Move line around the fold that is directly below the selection
insertDelta = 1
if @isFoldedAtBufferRow(selection.end.row + 1)
foldRange = @languageMode.rowRangeForFoldAtBufferRow(selection.end.row + 1)
insertDelta += foldRange[1] - foldRange[0] if foldRange?
followingScreenRow = @screenPositionForBufferPosition([selection.end.row]).translate([1])
followingBufferRow = @bufferPositionForScreenPosition(followingScreenRow).row
if fold = @largestFoldContainingBufferRow(followingBufferRow)
insertDelta = fold.getBufferRange().getRowCount()
else
insertDelta = 1
for row in rows
screenRow = @screenPositionForBufferPosition([row]).row
@@ -680,7 +682,7 @@ class Editor extends Model
bufferRange = @bufferRangeForScreenRange([[screenRow], [screenRow + 1]])
startRow = bufferRange.start.row
endRow = bufferRange.end.row - 1
foldedRows.push(endRow + 1)
foldedRows.push(endRow + insertDelta)
else
startRow = row
endRow = row
@@ -697,9 +699,9 @@ class Editor extends Model
lines = "\n#{lines}"
# Make sure the inserted text doesn't go into an existing fold
if @isFoldedAtBufferRow(insertPosition.row)
if fold = @displayBuffer.largestFoldStartingAtBufferRow(insertPosition.row)
@destroyFoldsContainingBufferRow(insertPosition.row)
foldedRows.push(insertPosition.row + startRow - endRow + 1)
foldedRows.push(insertPosition.row + fold.getBufferRange().getRowCount())
@buffer.insert(insertPosition, lines)