github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust multiple mappings if needed when applying screen deltas

Browse Source 
If there are multiple mappings following the start row of the delta
that span fewer screen rows than the delta, we collapse mappings to 0
screen rows until we have removed the number of rows specified by the
delta.

Expanding positive deltas expands the first mapping following the
start row as it did previously.
This commit is contained in:
Nathan Sobo
2013-05-08 14:18:51 -06:00
parent c6ff7e8934
commit c17d6ba487
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spec/app/row-map-spec.coffee
View File

@@ -156,3 +156,26 @@ describe "RowMap", ->
expect(map.bufferRowRangeForScreenRow(11)).toEqual [15, 20]
expect(map.bufferRowRangeForScreenRow(5)).toEqual [5, 10]
expect(map.bufferRowRangeForScreenRow(21)).toEqual [25, 30]
describe ".applyScreenDelta(startScreenRow, delta)", ->
describe "when applying a positive delta", ->
it "can enlarge the screen side of existing mappings", ->
map.mapBufferRowRange(5, 6, 3) # wrapped line
map.applyScreenDelta(5, 2) # wrap it twice more
expect(map.screenRowRangeForBufferRow(5)).toEqual [5, 10]
describe "when applying a negative delta", ->
it "can collapse the screen side of multiple mappings to 0 until the entire delta has been applied", ->
map.mapBufferRowRange(5, 10, 1) # inner fold 1
map.mapBufferRowRange(11, 13, 1) # inner fold 2
map.mapBufferRowRange(15, 20, 1) # inner fold 3
map.mapBufferRowRange(22, 27, 1) # following fold
map.applyScreenDelta(6, -5)
expect(map.screenRowRangeForBufferRow(5)).toEqual [5, 6]
expect(map.screenRowRangeForBufferRow(9)).toEqual [5, 6]
expect(map.screenRowRangeForBufferRow(10)).toEqual [6, 6]
expect(map.screenRowRangeForBufferRow(19)).toEqual [6, 6]
expect(map.screenRowRangeForBufferRow(22)).toEqual [8, 9]
expect(map.screenRowRangeForBufferRow(26)).toEqual [8, 9]

15
src/app/row-map.coffee
View File

@@ -50,9 +50,18 @@ class RowMap
{ mapping } = @traverseToBufferRow(startBufferRow)
mapping?.bufferRows += delta
applyScreenDelta: (startBufferRow, delta) ->
{ mapping } = @traverseToScreenRow(startBufferRow)
mapping?.screenRows += delta
applyScreenDelta: (startScreenRow, delta) ->
{ index } = @traverseToScreenRow(startScreenRow)
until delta == 0
{ bufferRows, screenRows } = @mappings[index]
screenRows += delta
if screenRows < 0
delta = screenRows
screenRows = 0
else
delta = 0
@mappings[index] = { bufferRows, screenRows }
index++
traverseToBufferRow: (targetBufferRow) ->
bufferRow = 0