Rename Anchor and Buffer events to passive-voice scheme

spec/app/buffer-spec.coffee

@@ -42,7 +42,7 @@ describe 'Buffer', ->
         buffer = new Buffer
         expect(buffer .getText()).toBe ""
 
-  describe "path-change event", ->
+  describe "path-changed event", ->
     [path, newPath, bufferToChange, eventHandler] = []
 
     beforeEach ->
@@ -51,18 +51,18 @@ describe 'Buffer', ->
       fs.write(path, "")
       bufferToChange = new Buffer(path)
       eventHandler = jasmine.createSpy('eventHandler')
-      bufferToChange.on 'path-change', eventHandler
+      bufferToChange.on 'path-changed', eventHandler
 
     afterEach ->
       bufferToChange.destroy()
       fs.remove(path) if fs.exists(path)
       fs.remove(newPath) if fs.exists(newPath)
 
-    it "triggers a `path-change` event when path is changed", ->
+    it "triggers a `path-changed` event when path is changed", ->
       bufferToChange.saveAs(newPath)
       expect(eventHandler).toHaveBeenCalledWith(bufferToChange)
 
-    it "triggers a `path-change` event when the file is moved", ->
+    it "triggers a `path-changed` event when the file is moved", ->
       fs.remove(newPath) if fs.exists(newPath)
       fs.move(path, newPath)
 
@@ -344,29 +344,29 @@ describe 'Buffer', ->
         saveBuffer.save()
         expect(fs.read(filePath)).toEqual 'Buffer contents!'
 
-      it "fires before-save and after-save events around the call to fs.write", ->
+      it "fires will-save and saved events around the call to fs.write", ->
         events = []
         beforeSave1 = -> events.push('beforeSave1')
         beforeSave2 = -> events.push('beforeSave2')
         afterSave1 = -> events.push('afterSave1')
         afterSave2 = -> events.push('afterSave2')
 
-        saveBuffer.on 'before-save', beforeSave1
-        saveBuffer.on 'before-save', beforeSave2
+        saveBuffer.on 'will-save', beforeSave1
+        saveBuffer.on 'will-save', beforeSave2
         spyOn(fs, 'write').andCallFake -> events.push 'fs.write'
-        saveBuffer.on 'after-save', afterSave1
-        saveBuffer.on 'after-save', afterSave2
+        saveBuffer.on 'saved', afterSave1
+        saveBuffer.on 'saved', afterSave2
 
         saveBuffer.save()
         expect(events).toEqual ['beforeSave1', 'beforeSave2', 'fs.write', 'afterSave1', 'afterSave2']
 
-      it "fires before-reload and after-reload events when reloaded", ->
+      it "fires will-reload and reloaded events when reloaded", ->
         events = []
 
-        saveBuffer.on 'before-reload', -> events.push 'before-reload'
-        saveBuffer.on 'after-reload', -> events.push 'after-reload'
+        saveBuffer.on 'will-reload', -> events.push 'will-reload'
+        saveBuffer.on 'reloaded', -> events.push 'reloaded'
         saveBuffer.reload()
-        expect(events).toEqual ['before-reload', 'after-reload']
+        expect(events).toEqual ['will-reload', 'reloaded']
 
     describe "when the buffer has no path", ->
       it "throws an exception", ->
@@ -396,7 +396,7 @@ describe 'Buffer', ->
 
       saveAsBuffer = new Buffer().retain()
       eventHandler = jasmine.createSpy('eventHandler')
-      saveAsBuffer.on 'path-change', eventHandler
+      saveAsBuffer.on 'path-changed', eventHandler
 
       saveAsBuffer.setText 'Buffer contents!'
       saveAsBuffer.saveAs(filePath)
@@ -648,7 +648,7 @@ describe 'Buffer', ->
     beforeEach ->
       destroyHandler = jasmine.createSpy("destroyHandler")
       anchor = buffer.addAnchorAtPosition([4, 25])
-      anchor.on 'destroy', destroyHandler
+      anchor.on 'destroyed', destroyHandler
 
     describe "when anchor.ignoreChangesStartingOnAnchor is true", ->
       beforeEach ->

spec/app/edit-session-spec.coffee

@@ -1732,7 +1732,7 @@ describe "EditSession", ->
     beforeEach ->
       destroyHandler = jasmine.createSpy("destroyHandler")
       anchor = editSession.addAnchorAtBufferPosition([4, 25])
-      anchor.on 'destroy', destroyHandler
+      anchor.on 'destroyed', destroyHandler
 
     describe "when a buffer change precedes an anchor", ->
       it "moves the anchor in accordance with the change", ->

src/app/anchor.coffee

@@ -83,6 +83,6 @@ class Anchor
   destroy: ->
     @buffer.removeAnchor(this)
     @editSession?.removeAnchor(this)
-    @trigger 'destroy'
+    @trigger 'destroyed'
 
 _.extend(Anchor.prototype, EventEmitter)

src/app/buffer.coffee

@@ -70,13 +70,13 @@ class Buffer
       @trigger "contents-modified", {differsFromDisk: true}
 
     @file.on "move", =>
-      @trigger "path-change", this
+      @trigger "path-changed", this
 
   reload: ->
-    @trigger 'before-reload'
+    @trigger 'will-reload'
     @updateCachedDiskContents()
     @setText(@cachedDiskContents)
-    @trigger 'after-reload'
+    @trigger 'reloaded'
 
   updateCachedDiskContents: ->
     @cachedDiskContents = @file.read()
@@ -98,7 +98,7 @@ class Buffer
       @file.read()
       @subscribeToFile()
 
-    @trigger "path-change", this
+    @trigger "path-changed", this
 
   getExtension: ->
     if @getPath()
@@ -243,12 +243,12 @@ class Buffer
   saveAs: (path) ->
     unless path then throw new Error("Can't save buffer with no file path")
 
-    @trigger 'before-save'
+    @trigger 'will-save'
     @setPath(path)
     @cachedDiskContents = @getText()
     @file.write(@getText())
     @subscribeToFile()
-    @trigger 'after-save'
+    @trigger 'saved'
 
   isModified: ->
     if @file
@@ -393,7 +393,7 @@ class Buffer
     path = @getPath()
     return unless path
     if @git?.checkoutHead(path)
-      @trigger 'git-status-change'
+      @trigger 'git-status-changed'
 
   scheduleStoppedChangingEvent: ->
     clearTimeout(@stoppedChangingTimeout) if @stoppedChangingTimeout

src/app/edit-session.coffee

@@ -50,7 +50,7 @@ class EditSession
     @addCursorAtScreenPosition([0, 0])
 
     @buffer.retain()
-    @buffer.on "path-change.edit-session-#{@id}", =>
+    @buffer.on "path-changed.edit-session-#{@id}", =>
       @trigger "buffer-path-change"
 
     @buffer.on "contents-conflicted.edit-session-#{@id}", =>
@@ -604,9 +604,9 @@ class EditSession
 
   preserveCursorPositionOnBufferReload: ->
     cursorPosition = null
-    @buffer.on "before-reload.edit-session-#{@id}", =>
+    @buffer.on "will-reload.edit-session-#{@id}", =>
       cursorPosition = @getCursorBufferPosition()
-    @buffer.on "after-reload.edit-session-#{@id}", =>
+    @buffer.on "reloaded.edit-session-#{@id}", =>
       @setCursorBufferPosition(cursorPosition) if cursorPosition
       cursorPosition = null
 

src/packages/status-bar/spec/status-bar-spec.coffee

@@ -151,12 +151,12 @@ describe "StatusBar", ->
       rootView.open(newPath)
       expect(statusBar.gitStatusIcon).toHaveClass('new-status-icon')
 
-    it "updates when a git-status-change event occurs", ->
+    it "updates when a git-status-changed event occurs", ->
       fs.write(path, "i've changed for the worse")
       rootView.open(path)
       expect(statusBar.gitStatusIcon).toHaveClass('modified-status-icon')
       fs.write(path, originalPathText)
-      rootView.getActiveEditor().getBuffer().trigger 'git-status-change'
+      rootView.getActiveEditor().getBuffer().trigger 'git-status-changed'
       expect(statusBar.gitStatusIcon).not.toHaveClass('modified-status-icon')
 
     it "updates when the window receives focus", ->

src/packages/status-bar/src/status-bar.coffee

@@ -45,8 +45,8 @@ class StatusBar extends View
     @buffer?.off '.status-bar'
     @buffer = @editor.getBuffer()
     @buffer.on 'contents-modified.status-bar', (e) => @updateBufferHasModifiedText(e.differsFromDisk)
-    @buffer.on 'after-save.status-bar', => @updateStatusBar()
-    @buffer.on 'git-status-change.status-bar', => @updateStatusBar()
+    @buffer.on 'saved.status-bar', => @updateStatusBar()
+    @buffer.on 'git-status-changed.status-bar', => @updateStatusBar()
     @updateStatusBar()
 
   updateStatusBar: ->

src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee

@@ -9,7 +9,7 @@ module.exports =
       @stripTrailingWhitespaceBeforeSave(buffer)
 
   stripTrailingWhitespaceBeforeSave: (buffer) ->
-    buffer.on 'before-save', ->
+    buffer.on 'will-save', ->
       buffer.transact ->
         buffer.scan /[ \t]+$/g, (match, range, { replace }) ->
           replace('')

src/packages/tabs/src/tab.coffee

@@ -9,10 +9,10 @@ class Tab extends View
 
   initialize: (@editSession) ->
     @buffer = @editSession.buffer
-    @subscribe @buffer, 'path-change', => @updateFileName()
+    @subscribe @buffer, 'path-changed', => @updateFileName()
     @subscribe @buffer, 'contents-modified', => @updateModifiedStatus()
-    @subscribe @buffer, 'after-save', => @updateModifiedStatus()
-    @subscribe @buffer, 'git-status-change', => @updateModifiedStatus()
+    @subscribe @buffer, 'saved', => @updateModifiedStatus()
+    @subscribe @buffer, 'git-status-changed', => @updateModifiedStatus()
     @updateFileName()
     @updateModifiedStatus()