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 insert lines

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-02-09 18:21:17 -07:00
parent 8338d37dde
commit 0ec6b452ad
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ describe "LineWrapper", ->
changeHandler = jasmine.createSpy('changeHandler')
wrapper.on 'change', changeHandler
fdescribe "when a single buffer line is updated", ->
describe "when a single buffer line is updated", ->
describe "when the number of screen lines remains the same for the changed buffer line", ->
it "re-wraps the existing lines and emits a change event for all its screen lines", ->
buffer.insert([6, 28], '1234567')
@@ -76,7 +76,18 @@ describe "LineWrapper", ->
expect(event.oldRange).toEqual([[7, 0], [8, 20]])
expect(event.newRange).toEqual([[7, 0], [7, 47]])
describe "when buffer lines are inserted", ->
describe "when buffer lines are updated and inserted", ->
fit "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'
expect(tokensText(wrapper.tokensForScreenRow(9))).toBe 'abcdefghij ? left.push(current) : '
expect(tokensText(wrapper.tokensForScreenRow(10))).toBe 'right.push(current);'
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
expect(event.oldRange).toEqual([[7, 0], [8, 20]])
expect(event.newRange).toEqual([[7, 0], [10, 20]])
describe "when buffer lines are removed", ->

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

@@ -16,11 +16,11 @@ class LineWrapper
oldRange.end.row = @lastScreenRowForBufferRow(bufferRow)
oldRange.end.column = _.last(@wrappedLines[bufferRow].screenLines).textLength
@wrappedLines[e.oldRange.start.row] = @buildWrappedLineForBufferRow(e.newRange.start.row)
@wrappedLines[e.oldRange.start.row..e.oldRange.end.row] = @buildWrappedLinesForBufferRows(e.newRange.start.row, e.newRange.end.row)
newRange = oldRange.copy()
newRange.end.row = @lastScreenRowForBufferRow(bufferRow)
newRange.end.column = _.last(@wrappedLines[bufferRow].screenLines).textLength
newRange.end.row = @lastScreenRowForBufferRow(e.newRange.end.row)
newRange.end.column = _.last(@wrappedLines[e.newRange.end.row].screenLines).textLength
@trigger 'change', { oldRange, newRange }