Merge pull request #10336 from atom/wl-backport-tabs-fix

Backport identical tab names fix

spec/text-editor-spec.coffee

@@ -168,7 +168,7 @@ describe "TextEditor", ->
         buffer.setPath(undefined)
         expect(editor.getLongTitle()).toBe 'untitled'
 
-      it "returns <parent-directory>/<filename> when opened files has identical file names", ->
+      it "returns '<filename> — <parent-directory>' when opened files have identical file names", ->
         editor1 = null
         editor2 = null
         waitsForPromise ->
@@ -177,10 +177,10 @@ describe "TextEditor", ->
             atom.workspace.open(path.join('sample-theme-2', 'readme')).then (o) ->
               editor2 = o
         runs ->
-          expect(editor1.getLongTitle()).toBe 'sample-theme-1/readme'
-          expect(editor2.getLongTitle()).toBe 'sample-theme-2/readme'
+          expect(editor1.getLongTitle()).toBe "readme \u2014 sample-theme-1"
+          expect(editor2.getLongTitle()).toBe "readme \u2014 sample-theme-2"
 
-      it "or returns <parent-directory>/.../<filename> when opened files has identical file names", ->
+      it "returns '<filename> — <parent-directories>' when opened files have identical file and dir names", ->
         editor1 = null
         editor2 = null
         waitsForPromise ->
@@ -189,9 +189,20 @@ describe "TextEditor", ->
             atom.workspace.open(path.join('sample-theme-2', 'src', 'js', 'main.js')).then (o) ->
               editor2 = o
         runs ->
-          expect(editor1.getLongTitle()).toBe 'sample-theme-1/.../main.js'
-          expect(editor2.getLongTitle()).toBe 'sample-theme-2/.../main.js'
+          expect(editor1.getLongTitle()).toBe "main.js \u2014 sample-theme-1/src/js"
+          expect(editor2.getLongTitle()).toBe "main.js \u2014 sample-theme-2/src/js"
 
+      it "returns '<filename> — <parent-directories>' when opened files have identical file and same parent dir name", ->
+        editor1 = null
+        editor2 = null
+        waitsForPromise ->
+          atom.workspace.open(path.join('sample-theme-2', 'src', 'js', 'main.js')).then (o) ->
+            editor1 = o
+            atom.workspace.open(path.join('sample-theme-2', 'src', 'js', 'plugin', 'main.js')).then (o) ->
+              editor2 = o
+        runs ->
+          expect(editor1.getLongTitle()).toBe "main.js \u2014 js"
+          expect(editor2.getLongTitle()).toBe "main.js \u2014 js/plugin"
 
     it "notifies ::onDidChangeTitle observers when the underlying buffer path changes", ->
       observed = []

spec/workspace-spec.coffee

@@ -76,7 +76,7 @@ describe "Workspace", ->
           expect(editor4.getCursorScreenPosition()).toEqual [2, 4]
 
           expect(atom.workspace.getActiveTextEditor().getPath()).toBe editor3.getPath()
-          expect(document.title).toBe "#{path.basename(editor3.getPath())} - #{atom.project.getPaths()[0]} - Atom"
+          expect(document.title).toBe "#{path.basename(editor3.getLongTitle())} - #{atom.project.getPaths()[0]} - Atom"
 
     describe "where there are no open panes or editors", ->
       it "constructs the view with no open editors", ->
@@ -776,8 +776,8 @@ describe "Workspace", ->
           applicationDelegate: atom.applicationDelegate, assert: atom.assert.bind(atom)
         })
         workspace2.deserialize(atom.workspace.serialize(), atom.deserializers)
-        item = atom.workspace.getActivePaneItem()
-        expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
+        item = workspace2.getActivePaneItem()
+        expect(document.title).toBe "#{item.getLongTitle()} - #{atom.project.getPaths()[0]} - Atom"
         workspace2.destroy()
 
   describe "document edited status", ->

src/text-editor.coffee

@@ -581,10 +581,7 @@ class TextEditor extends Model
   #
   # Returns a {String}.
   getTitle: ->
-    if sessionPath = @getPath()
-      path.basename(sessionPath)
-    else
-      'untitled'
+    @getFileName() ? 'untitled'
 
   # Essential: Get unique title for display in other parts of the UI, such as
   # the window title.
@@ -593,41 +590,52 @@ class TextEditor extends Model
   # If the editor's buffer is saved, its unique title is formatted as one
   # of the following,
   # * "<filename>" when it is the only editing buffer with this file name.
-  # * "<unique-dir-prefix>/.../<filename>", where the "..." may be omitted
-  #   if the the direct parent directory is already different.
+  # * "<filename> — <unique-dir-prefix>" when other buffers have this file name.
   #
   # Returns a {String}
   getLongTitle: ->
-    if sessionPath = @getPath()
-      title = @getTitle()
+    if @getPath()
+      fileName = @getFileName()
 
-      # find text editors with identical file name.
-      paths = []
+      allPathSegments = []
       for textEditor in atom.workspace.getTextEditors() when textEditor isnt this
-        if textEditor.getTitle() is title
-          paths.push(textEditor.getPath())
-      if paths.length is 0
-        return title
-      fileName = path.basename(sessionPath)
+        if textEditor.getFileName() is fileName
+          allPathSegments.push(textEditor.getDirectoryPath().split(path.sep))
 
-      # find the first directory in all these paths that is unique
-      nLevel = 0
-      while (_.some(paths, (apath) -> path.basename(apath) is path.basename(sessionPath)))
-        sessionPath = path.dirname(sessionPath)
-        paths = _.map(paths, (apath) -> path.dirname(apath))
-        nLevel += 1
+      if allPathSegments.length is 0
+        return fileName
 
-      directory = path.basename sessionPath
-      if nLevel > 1
-        path.join(directory, "...", fileName)
-      else
-        path.join(directory, fileName)
+      ourPathSegments = @getDirectoryPath().split(path.sep)
+      allPathSegments.push ourPathSegments
+
+      loop
+        firstSegment = ourPathSegments[0]
+
+        commonBase = _.all(allPathSegments, (pathSegments) -> pathSegments.length > 1 and pathSegments[0] is firstSegment)
+        if commonBase
+          pathSegments.shift() for pathSegments in allPathSegments
+        else
+          break
+
+      "#{fileName} \u2014 #{path.join(pathSegments...)}"
     else
       'untitled'
 
   # Essential: Returns the {String} path of this editor's text buffer.
   getPath: -> @buffer.getPath()
 
+  getFileName: ->
+    if fullPath = @getPath()
+      path.basename(fullPath)
+    else
+      null
+
+  getDirectoryPath: ->
+    if fullPath = @getPath()
+      path.dirname(fullPath)
+    else
+      null
+
   # Extended: Returns the {String} character set encoding of this editor's text
   # buffer.
   getEncoding: -> @buffer.getEncoding()
@@ -678,16 +686,16 @@ class TextEditor extends Model
   getSaveDialogOptions: -> {}
 
   checkoutHeadRevision: ->
-    if filePath = this.getPath()
+    if @getPath()
       checkoutHead = =>
-        @project.repositoryForDirectory(new Directory(path.dirname(filePath)))
+        @project.repositoryForDirectory(new Directory(@getDirectoryPath()))
           .then (repository) =>
             repository?.checkoutHeadForEditor(this)
 
       if @config.get('editor.confirmCheckoutHeadRevision')
         @applicationDelegate.confirm
           message: 'Confirm Checkout HEAD Revision'
-          detailedMessage: "Are you sure you want to discard all changes to \"#{path.basename(filePath)}\" since the last Git commit?"
+          detailedMessage: "Are you sure you want to discard all changes to \"#{@getFileName()}\" since the last Git commit?"
           buttons:
             OK: checkoutHead
             Cancel: null

src/workspace.coffee

@@ -155,7 +155,7 @@ class Workspace extends Model
     projectPaths = @project.getPaths() ? []
     if item = @getActivePaneItem()
       itemPath = item.getPath?()
-      itemTitle = item.getTitle?()
+      itemTitle = item.getLongTitle?() ? item.getTitle?()
       projectPath = _.find projectPaths, (projectPath) ->
         itemPath is projectPath or itemPath?.startsWith(projectPath + path.sep)
     itemTitle ?= "untitled"