From e508d73dd4160fe6bef27a4255506479b59eba3d Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 20 Nov 2012 15:49:52 -0700
Subject: [PATCH] Always provide the EditSession and its index on EditSession
 events

---
 spec/app/editor-spec.coffee               | 6 +++---
 src/app/editor.coffee                     | 4 ++--
 src/extensions/tabs/spec/tabs-spec.coffee | 2 +-
 src/extensions/tabs/src/tabs.coffee       | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index 7323a3ce8..46b69d36d 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -203,7 +203,7 @@ describe "Editor", ->
         expect(editor.editSessions.length).toBe originalEditSessionCount + 1
 
         expect(editSessionAddedHandler).toHaveBeenCalled()
-        expect(editSessionAddedHandler.argsForCall[0][1]).toBe otherEditSession
+        expect(editSessionAddedHandler.argsForCall[0][1..2]).toEqual [otherEditSession, originalEditSessionCount]
 
     describe "when the edit session was previously assigned to this editor", ->
       it "restores the previous edit session associated with the editor", ->
@@ -289,11 +289,11 @@ describe "Editor", ->
 
         editor.setActiveEditSessionIndex(2)
         expect(activeEditSessionChangeHandler).toHaveBeenCalled()
-        expect(activeEditSessionChangeHandler.argsForCall[0][1]).toBe 2
+        expect(activeEditSessionChangeHandler.argsForCall[0][1..2]).toEqual [editor.activeEditSession, 2]
         activeEditSessionChangeHandler.reset()
 
         editor.setActiveEditSessionIndex(0)
-        expect(activeEditSessionChangeHandler.argsForCall[0][1]).toBe 0
+        expect(activeEditSessionChangeHandler.argsForCall[0][1..2]).toEqual [editor.activeEditSession, 0]
         activeEditSessionChangeHandler.reset()
 
     describe ".loadNextEditSession()", ->
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index c5c9bc781..ef7206e09 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -388,7 +388,7 @@ class Editor extends View
     if index == -1
       index = @editSessions.length
       @editSessions.push(editSession)
-      @trigger 'editor:edit-session-added', editSession
+      @trigger 'editor:edit-session-added', [editSession, index]
 
     @setActiveEditSessionIndex(index)
 
@@ -431,7 +431,7 @@ class Editor extends View
       @trigger 'editor-path-change'
 
     @trigger 'editor-path-change'
-    @trigger 'editor:active-edit-session-changed', index
+    @trigger 'editor:active-edit-session-changed', [@activeEditSession, index]
     @resetDisplay()
 
     if @attached and @activeEditSession.buffer.isInConflict()
diff --git a/src/extensions/tabs/spec/tabs-spec.coffee b/src/extensions/tabs/spec/tabs-spec.coffee
index 76ff85e27..96bd28999 100644
--- a/src/extensions/tabs/spec/tabs-spec.coffee
+++ b/src/extensions/tabs/spec/tabs-spec.coffee
@@ -3,7 +3,7 @@ _ = require 'underscore'
 RootView = require 'root-view'
 Tabs = require 'tabs'
 
-describe "Tabs", ->
+fdescribe "Tabs", ->
   [rootView, editor, statusBar, buffer, tabs] = []
 
   beforeEach ->
diff --git a/src/extensions/tabs/src/tabs.coffee b/src/extensions/tabs/src/tabs.coffee
index 1a577a6a0..25a383755 100644
--- a/src/extensions/tabs/src/tabs.coffee
+++ b/src/extensions/tabs/src/tabs.coffee
@@ -23,8 +23,7 @@ class Tabs extends View
       @addTabForEditSession(editSession)
 
     @setActiveTab(@editor.getActiveEditSessionIndex())
-    @editor.on 'editor:active-edit-session-changed', (e, index) => @setActiveTab(index)
-
+    @editor.on 'editor:active-edit-session-changed', (e, editSession, index) => @setActiveTab(index)
     @editor.on 'editor:edit-session-added', (e, editSession) => @addTabForEditSession(editSession)
 
   addTabForEditSession: (editSession) ->