github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

LineWrapper handles changes that remove lines.

Browse Source
This commit is contained in:
Nathan Sobo
2012-02-09 22:27:14 -07:00
parent 06e71bb42f
commit 672dc5a3c0
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spec/atom/line-wrapper-spec.coffee
View File

@@ -65,7 +65,7 @@ fdescribe "LineWrapper", ->
expect(event.newRange).toEqual([[7, 0], [7, 47]])
describe "when buffer lines are inserted", ->
fit "re-wraps existing and new screen lines and emits a change event", ->
it "re-wraps existing and new screen lines and emits a change event", ->
buffer.insert([6, 21], '1234567890 abcdefghij 1234567890\nabcdefghij')
expect(tokensText(wrapper.tokensForScreenRow(7))).toBe ' current < pivot1234567890 abcdefghij '
expect(tokensText(wrapper.tokensForScreenRow(8))).toBe '1234567890'
@@ -78,6 +78,17 @@ fdescribe "LineWrapper", ->
expect(event.newRange).toEqual([[7, 0], [10, 20]])
describe "when buffer lines are removed", ->
it "removes screen lines and emits a change event", ->
buffer.change(new Range([3, 21], [7, 5]), ';')
expect(tokensText(wrapper.tokensForScreenRow(3))).toBe ' var pivot = items;'
expect(tokensText(wrapper.tokensForScreenRow(4))).toBe ' return '
expect(tokensText(wrapper.tokensForScreenRow(5))).toBe 'sort(left).concat(pivot).concat(sort(right));'
expect(tokensText(wrapper.tokensForScreenRow(6))).toBe ' };'
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
expect(event.oldRange).toEqual([[3, 0], [11, 45]])
expect(event.newRange).toEqual([[3, 0], [5, 45]])
describe ".screenPositionFromBufferPosition(point, allowEOL=false)", ->
it "translates the given buffer position to a screen position, accounting for wrapped lines", ->

9
src/atom/line-wrapper.coffee
View File

@@ -12,9 +12,9 @@ class LineWrapper
oldRange = new Range
bufferRow = e.oldRange.start.row
oldRange.start.row = @firstScreenRowForBufferRow(bufferRow)
oldRange.end.row = @lastScreenRowForBufferRow(bufferRow)
oldRange.end.column = _.last(@wrappedLines[bufferRow].screenLines).textLength
oldRange.start.row = @firstScreenRowForBufferRow(e.oldRange.start.row)
oldRange.end.row = @lastScreenRowForBufferRow(e.oldRange.end.row)
oldRange.end.column = _.last(@wrappedLines[e.oldRange.end.row].screenLines).textLength
@wrappedLines[e.oldRange.start.row..e.oldRange.end.row] = @buildWrappedLinesForBufferRows(e.newRange.start.row, e.newRange.end.row)
@@ -28,7 +28,8 @@ class LineWrapper
@screenPositionFromBufferPosition([bufferRow, 0]).row
lastScreenRowForBufferRow: (bufferRow) ->
@screenPositionFromBufferPosition([bufferRow, @buffer.getLine(bufferRow).length]).row
startRow = @screenPositionFromBufferPosition([bufferRow, 0]).row
startRow + (@wrappedLines[bufferRow].screenLines.length - 1)
setMaxLength: (@maxLength) ->
@buildWrappedLines()