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

Merge branch 'master' into as-tiled-rendering

Browse Source
This commit is contained in:
Antonio Scandurra
2015-05-20 17:16:45 +02:00
parent ffc73f3b7b 5ae0ae7f83
commit 329b5b4e02
5 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spec/display-buffer-spec.coffee
View File

@@ -1023,11 +1023,14 @@ describe "DisplayBuffer", ->
expect(markerChangedHandler).not.toHaveBeenCalled()
expect(marker2ChangedHandler).not.toHaveBeenCalled()
expect(marker3ChangedHandler).not.toHaveBeenCalled()
# but still updates the markers
# markers positions are updated based on the text change
expect(marker.getScreenRange()).toEqual [[5, 4], [5, 10]]
expect(marker.getHeadScreenPosition()).toEqual [5, 10]
expect(marker.getTailScreenPosition()).toEqual [5, 4]
expect(marker2.isValid()).toBeTruthy()
# but marker snapshots are not restored until the end of the undo.
expect(marker2.isValid()).toBeFalsy()
expect(marker3.isValid()).toBeFalsy()
buffer.undo()
@@ -1035,6 +1038,8 @@ describe "DisplayBuffer", ->
expect(markerChangedHandler).toHaveBeenCalled()
expect(marker2ChangedHandler).toHaveBeenCalled()
expect(marker3ChangedHandler).toHaveBeenCalled()
expect(marker2.isValid()).toBeTruthy()
expect(marker3.isValid()).toBeFalsy()
# Redo change ----
@@ -1048,18 +1053,23 @@ describe "DisplayBuffer", ->
expect(markerChangedHandler).not.toHaveBeenCalled()
expect(marker2ChangedHandler).not.toHaveBeenCalled()
expect(marker3ChangedHandler).not.toHaveBeenCalled()
# but still updates the markers
# markers positions are updated based on the text change
expect(marker.getScreenRange()).toEqual [[5, 7], [5, 13]]
expect(marker.getHeadScreenPosition()).toEqual [5, 13]
expect(marker.getTailScreenPosition()).toEqual [5, 7]
# but marker snapshots are not restored until the end of the undo.
expect(marker2.isValid()).toBeFalsy()
expect(marker3.isValid()).toBeTruthy()
expect(marker3.isValid()).toBeFalsy()
buffer.redo()
expect(changeHandler).toHaveBeenCalled()
expect(markerChangedHandler).toHaveBeenCalled()
expect(marker2ChangedHandler).toHaveBeenCalled()
expect(marker3ChangedHandler).toHaveBeenCalled()
expect(marker2.isValid()).toBeFalsy()
expect(marker3.isValid()).toBeTruthy()
it "updates the position of markers before emitting change events that aren't caused by a buffer change", ->
displayBuffer.onDidChange changeHandler = jasmine.createSpy("changeHandler").andCallFake ->
@@ -1075,6 +1085,21 @@ describe "DisplayBuffer", ->
expect(changeHandler).toHaveBeenCalled()
expect(markerChangedHandler).toHaveBeenCalled()
it "emits the correct events when markers are mutated inside event listeners", ->
marker.onDidChange ->
if marker.getHeadScreenPosition().isEqual([5, 9])
marker.setHeadScreenPosition([5, 8])
marker.setHeadScreenPosition([5, 9])
headChanges = for [event] in markerChangedHandler.argsForCall
{old: event.oldHeadScreenPosition, new: event.newHeadScreenPosition}
expect(headChanges).toEqual [
{old: [5, 10], new: [5, 9]}
{old: [5, 9], new: [5, 8]}
]
describe "::findMarkers(attributes)", ->
it "allows the startBufferRow and endBufferRow to be specified", ->
marker1 = displayBuffer.markBufferRange([[0, 0], [3, 0]], class: 'a')