From d30532c6aacf4f46bb6282890468260f8fc1ec22 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 30 Jan 2013 15:05:36 -0800
Subject: [PATCH] Show directory in tab when duplicate names are open

Closes #181
---
 src/packages/tabs/spec/tabs-spec.coffee | 18 ++++++++++++++++++
 src/packages/tabs/src/tab.coffee        | 16 ++++++++++++++--
 src/packages/tabs/src/tabs-view.coffee  |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/packages/tabs/spec/tabs-spec.coffee b/src/packages/tabs/spec/tabs-spec.coffee
index c3055d081..76558b301 100644
--- a/src/packages/tabs/spec/tabs-spec.coffee
+++ b/src/packages/tabs/spec/tabs-spec.coffee
@@ -118,3 +118,21 @@ describe "Tabs", ->
       tabs.find('.tab .close-icon:eq(1)').click()
       expect(editor.getActiveEditSessionIndex()).toBe 0
       expect(editor.activeEditSession).toBe firstSession
+
+  describe "when two tabs have the same file name", ->
+    [tempPath] = []
+
+    beforeEach ->
+      tempPath = '/tmp/sample.js'
+      fs.write(tempPath, 'sample')
+
+    afterEach ->
+      fs.remove(tempPath) if fs.exists(tempPath)
+
+    it "displays the parent folder name after the file name", ->
+      expect(tabs.find('.tab:eq(0) .file-name').text()).toBe 'sample.js'
+      rootView.open(tempPath)
+      expect(tabs.find('.tab:eq(0) .file-name').text()).toBe 'sample.js - fixtures'
+      expect(tabs.find('.tab:last .file-name').text()).toBe 'sample.js - tmp'
+      editor.destroyActiveEditSession()
+      expect(tabs.find('.tab:eq(0) .file-name').text()).toBe 'sample.js'
diff --git a/src/packages/tabs/src/tab.coffee b/src/packages/tabs/src/tab.coffee
index 6a26a114f..7bc1a8828 100644
--- a/src/packages/tabs/src/tab.coffee
+++ b/src/packages/tabs/src/tab.coffee
@@ -1,4 +1,5 @@
 {View} = require 'space-pen'
+fs = require 'fs'
 
 module.exports =
 class Tab extends View
@@ -7,12 +8,14 @@ class Tab extends View
       @span class: 'file-name', outlet: 'fileName'
       @span class: 'close-icon'
 
-  initialize: (@editSession) ->
+  initialize: (@editSession, @editor) ->
     @buffer = @editSession.buffer
     @subscribe @buffer, 'path-changed', => @updateFileName()
     @subscribe @buffer, 'contents-modified', => @updateModifiedStatus()
     @subscribe @buffer, 'saved', => @updateModifiedStatus()
     @subscribe @buffer, 'git-status-changed', => @updateModifiedStatus()
+    @subscribe @editor, 'editor:edit-session-added', => @updateFileName()
+    @subscribe @editor, 'editor:edit-session-removed', => @updateFileName()
     @updateFileName()
     @updateModifiedStatus()
 
@@ -25,4 +28,13 @@ class Tab extends View
       @isModified = false
 
   updateFileName: ->
-    @fileName.text(@editSession.buffer.getBaseName() ? 'untitled')
+    fileNameText = @editSession.buffer.getBaseName()
+    if fileNameText?
+      duplicates = @editor.getEditSessions().filter (session) -> fileNameText is session.buffer.getBaseName()
+      if duplicates.length > 1
+        directory = fs.base(fs.directory(@editSession.getPath()))
+        fileNameText = "#{fileNameText} - #{directory}" if directory
+    else
+      fileNameText = 'untitled'
+
+    @fileName.text(fileNameText)
diff --git a/src/packages/tabs/src/tabs-view.coffee b/src/packages/tabs/src/tabs-view.coffee
index e7322dc64..d2b21fa7c 100644
--- a/src/packages/tabs/src/tabs-view.coffee
+++ b/src/packages/tabs/src/tabs-view.coffee
@@ -34,7 +34,7 @@ class Tabs extends View
       false
 
   addTabForEditSession: (editSession) ->
-    @append(new Tab(editSession))
+    @append(new Tab(editSession, @editor))
 
   setActiveTab: (index) ->
     @find(".tab.active").removeClass('active')