Rename Buffer, TokenizedBuffer, and Selection events

This commit is contained in:
Nathan Sobo 2013-01-04 13:59:11 -07:00
parent 1762ae2744
commit 0a08d03c68
10 changed files with 24 additions and 24 deletions

View File

@ -88,7 +88,7 @@ describe 'Buffer', ->
it "does not trigger a change event when Atom modifies the file", ->
buffer.insert([0,0], "HELLO!")
changeHandler = jasmine.createSpy("buffer changed")
buffer.on "change", changeHandler
buffer.on "changed", changeHandler
buffer.save()
waits 30
@ -96,9 +96,9 @@ describe 'Buffer', ->
expect(changeHandler).not.toHaveBeenCalled()
describe "when the buffer is in an unmodified state before the on-disk change", ->
it "changes the memory contents of the buffer to match the new disk contents and triggers a 'change' event", ->
it "changes the memory contents of the buffer to match the new disk contents and triggers a 'changed' event", ->
changeHandler = jasmine.createSpy('changeHandler')
buffer.on 'change', changeHandler
buffer.on 'changed', changeHandler
fs.write(path, "second")
expect(changeHandler.callCount).toBe 0
@ -158,7 +158,7 @@ describe 'Buffer', ->
fs.write(path, 'moo')
waitsFor 'change event', (done) ->
bufferToDelete.one 'change', done
bufferToDelete.one 'changed', done
describe ".isModified()", ->
it "returns true when user changes buffer", ->
@ -202,7 +202,7 @@ describe 'Buffer', ->
beforeEach ->
changeHandler = jasmine.createSpy('changeHandler')
buffer.on 'change', changeHandler
buffer.on 'changed', changeHandler
describe "when used to insert (called with an empty range and a non-empty string)", ->
describe "when the given string has no newlines", ->
@ -301,8 +301,8 @@ describe 'Buffer', ->
expect(event.oldText).toBe oldText
expect(event.newText).toBe "foo\nbar"
it "allows a 'change' event handler to safely undo the change", ->
buffer.on 'change', -> buffer.undo()
it "allows a 'changed' event handler to safely undo the change", ->
buffer.on 'changed', -> buffer.undo()
buffer.change([0, 0], "hello")
expect(buffer.lineForRow(0)).toBe "var quicksort = function () {"
@ -311,7 +311,7 @@ describe 'Buffer', ->
lastRow = buffer.getLastRow()
expectedPreRange = [[0,0], [lastRow, buffer.lineForRow(lastRow).length]]
changeHandler = jasmine.createSpy('changeHandler')
buffer.on 'change', changeHandler
buffer.on 'changed', changeHandler
newText = "I know you are.\nBut what am I?"
buffer.setText(newText)
@ -411,7 +411,7 @@ describe 'Buffer', ->
saveAsBuffer = new Buffer(originalPath).retain()
changeHandler = jasmine.createSpy('changeHandler')
saveAsBuffer.on 'change', changeHandler
saveAsBuffer.on 'changed', changeHandler
saveAsBuffer.saveAs(newPath)
expect(changeHandler).not.toHaveBeenCalled()

View File

@ -935,7 +935,7 @@ describe "EditSession", ->
beforeEach ->
selection = editSession.getLastSelection()
changeScreenRangeHandler = jasmine.createSpy('changeScreenRangeHandler')
selection.on 'change-screen-range', changeScreenRangeHandler
selection.on 'screen-range-changed', changeScreenRangeHandler
describe "when the cursor is on the middle of the line", ->
it "removes the character before the cursor", ->

View File

@ -59,10 +59,10 @@ describe "Selection", ->
expect(selection.isReversed()).toBeFalsy()
describe "when only the selection's anchor is moved (regression)", ->
it "emits the 'change-screen-range' event", ->
it "emits the 'screen-range-changed' event", ->
selection.setBufferRange([[2, 0], [2, 10]], reverse: true)
changeScreenRangeHandler = jasmine.createSpy('changeScreenRangeHandler')
selection.on 'change-screen-range', changeScreenRangeHandler
selection.on 'screen-range-changed', changeScreenRangeHandler
buffer.insert([2, 5], 'abc')
expect(changeScreenRangeHandler).toHaveBeenCalled()

View File

@ -23,7 +23,7 @@ describe "TokenizedBuffer", ->
tokenizedBuffer = editSession.displayBuffer.tokenizedBuffer
editSession.setVisible(true)
changeHandler = jasmine.createSpy('changeHandler')
tokenizedBuffer.on "change", changeHandler
tokenizedBuffer.on "changed", changeHandler
afterEach ->
editSession.destroy()

View File

@ -40,7 +40,7 @@ class BufferChangeOperation
@buffer.replaceLines(oldRange.start.row, oldRange.end.row, newTextLines)
event = { oldRange, newRange, oldText, newText }
@buffer.trigger 'change', event
@buffer.trigger 'changed', event
@buffer.scheduleStoppedChangingEvent()
@buffer.updateAnchors(event)
@buffer.trigger 'update-anchors-after-change'

View File

@ -25,7 +25,7 @@ class DisplayBuffer
@activeFolds = {}
@foldsById = {}
@buildLineMap()
@tokenizedBuffer.on 'change', (e) => @handleTokenizedBufferChange(e)
@tokenizedBuffer.on 'changed', (e) => @handleTokenizedBufferChange(e)
setVisible: (visible) -> @tokenizedBuffer.setVisible(visible)

View File

@ -22,7 +22,7 @@ class SelectList extends View
initialize: ->
requireStylesheet 'select-list.css'
@miniEditor.getBuffer().on 'change', => @schedulePopulateList()
@miniEditor.getBuffer().on 'changed', => @schedulePopulateList()
@miniEditor.on 'focusout', => @cancel() unless @cancelling
@on 'core:move-up', => @selectPreviousItem()
@on 'core:move-down', => @selectNextItem()

View File

@ -13,8 +13,8 @@ class SelectionView extends View
initialize: ({@editor, @selection} = {}) ->
@regions = []
@selection.on 'change-screen-range', => @editor.requestDisplayUpdate()
@selection.on 'destroy', =>
@selection.on 'screen-range-changed', => @editor.requestDisplayUpdate()
@selection.on 'destroyed', =>
@destroyed = true
@editor.requestDisplayUpdate()

View File

@ -25,7 +25,7 @@ class Selection
@cursor.destroy()
@anchor?.destroy()
@editSession.removeSelection(this)
@trigger 'destroy'
@trigger 'destroyed'
finalize: ->
@initialScreenRange = null unless @initialScreenRange?.isEqual(@getScreenRange())
@ -83,7 +83,7 @@ class Selection
screenRangeChanged: ->
screenRange = @getScreenRange()
@trigger 'change-screen-range', screenRange
@trigger 'screen-range-changed', screenRange
@cursor?.setVisible(screenRange.isEmpty())
getText: ->

View File

@ -24,7 +24,7 @@ class TokenizedBuffer
@screenLines = @buildPlaceholderScreenLinesForRows(0, @buffer.getLastRow())
@invalidRows = []
@invalidateRow(0)
@buffer.on "change.tokenized-buffer#{@id}", (e) => @handleBufferChange(e)
@buffer.on "changed.tokenized-buffer#{@id}", (e) => @handleBufferChange(e)
setVisible: (@visible) ->
@tokenizeInBackground() if @visible
@ -36,7 +36,7 @@ class TokenizedBuffer
lastRow = @buffer.getLastRow()
@screenLines = @buildPlaceholderScreenLinesForRows(0, lastRow)
@invalidateRow(0)
@trigger "change", { start: 0, end: lastRow, delta: 0 }
@trigger "changed", { start: 0, end: lastRow, delta: 0 }
tokenizeInBackground: ->
return if not @visible or @pendingChunk
@ -67,7 +67,7 @@ class TokenizedBuffer
@validateRow(row)
@invalidateRow(row + 1) unless filledRegion
@trigger "change", { start: invalidRow, end: row, delta: 0 }
@trigger "changed", { start: invalidRow, end: row, delta: 0 }
@tokenizeInBackground() if @firstInvalidRow()?
@ -105,7 +105,7 @@ class TokenizedBuffer
if newEndStack and not _.isEqual(newEndStack, previousEndStack)
@invalidateRow(end + delta + 1)
@trigger "change", { start, end, delta, bufferChange: e }
@trigger "changed", { start, end, delta, bufferChange: e }
buildScreenLinesForRows: (startRow, endRow, startingStack) ->
ruleStack = startingStack