From b11d0c25851d9d784abccd7e9d0c96c2fa25eee3 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 16 Nov 2015 11:59:47 +0100
Subject: [PATCH] Use em-dash in window title and exclude app name on OS X

---
 spec/workspace-spec.coffee | 14 +++++++-------
 src/workspace.coffee       | 19 +++++++++++++------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/spec/workspace-spec.coffee b/spec/workspace-spec.coffee
index e150761af..74e98e1e4 100644
--- a/spec/workspace-spec.coffee
+++ b/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.getLongTitle())} - #{atom.project.getPaths()[0]} - Atom"
+          expect(document.title).toMatch ///^#{path.basename(editor3.getLongTitle())}\ \u2014\ #{atom.project.getPaths()[0]}///
 
     describe "where there are no open panes or editors", ->
       it "constructs the view with no open editors", ->
@@ -732,7 +732,7 @@ describe "Workspace", ->
     describe "when the project has no path", ->
       it "sets the title to 'untitled'", ->
         atom.project.setPaths([])
-        expect(document.title).toBe 'untitled - Atom'
+        expect(document.title).toMatch ///^untitled///
 
     describe "when the project has a path", ->
       beforeEach ->
@@ -742,25 +742,25 @@ describe "Workspace", ->
       describe "when there is an active pane item", ->
         it "sets the title to the pane item's title plus the project path", ->
           item = atom.workspace.getActivePaneItem()
-          expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
+          expect(document.title).toMatch ///^#{item.getTitle()}\ \u2014\ #{atom.project.getPaths()[0]}///
 
       describe "when the title of the active pane item changes", ->
         it "updates the window title based on the item's new title", ->
           editor = atom.workspace.getActivePaneItem()
           editor.buffer.setPath(path.join(temp.dir, 'hi'))
-          expect(document.title).toBe "#{editor.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
+          expect(document.title).toMatch ///^#{editor.getTitle()}\ \u2014\ #{atom.project.getPaths()[0]}///
 
       describe "when the active pane's item changes", ->
         it "updates the title to the new item's title plus the project path", ->
           atom.workspace.getActivePane().activateNextItem()
           item = atom.workspace.getActivePaneItem()
-          expect(document.title).toBe "#{item.getTitle()} - #{atom.project.getPaths()[0]} - Atom"
+          expect(document.title).toMatch ///^#{item.getTitle()}\ \u2014\ #{atom.project.getPaths()[0]}///
 
       describe "when the last pane item is removed", ->
         it "updates the title to contain the project's path", ->
           atom.workspace.getActivePane().destroy()
           expect(atom.workspace.getActivePaneItem()).toBeUndefined()
-          expect(document.title).toBe "#{atom.project.getPaths()[0]} - Atom"
+          expect(document.title).toMatch ///^#{atom.project.getPaths()[0]}///
 
       describe "when an inactive pane's item changes", ->
         it "does not update the title", ->
@@ -784,7 +784,7 @@ describe "Workspace", ->
         })
         workspace2.deserialize(atom.workspace.serialize(), atom.deserializers)
         item = workspace2.getActivePaneItem()
-        expect(document.title).toBe "#{item.getLongTitle()} - #{atom.project.getPaths()[0]} - Atom"
+        expect(document.title).toMatch ///^#{item.getLongTitle()}\ \u2014\ #{atom.project.getPaths()[0]}///
         workspace2.destroy()
 
   describe "document edited status", ->
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 04feef61e..f64f58ee0 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -161,15 +161,22 @@ class Workspace extends Model
     itemTitle ?= "untitled"
     projectPath ?= projectPaths[0]
 
+    titleParts = []
     if item? and projectPath?
-      document.title = "#{itemTitle} - #{projectPath} - #{appName}"
-      @applicationDelegate.setRepresentedFilename(itemPath ? projectPath)
+      titleParts.push itemTitle, projectPath
+      representedPath = itemPath ? projectPath
     else if projectPath?
-      document.title = "#{projectPath} - #{appName}"
-      @applicationDelegate.setRepresentedFilename(projectPath)
+      titleParts.push projectPath
+      representedPath = projectPath
     else
-      document.title = "#{itemTitle} - #{appName}"
-      @applicationDelegate.setRepresentedFilename("")
+      titleParts.push itemTitle
+      representedPath = ""
+
+    unless process.platform is 'darwin'
+      titleParts.push appName
+
+    document.title = titleParts.join(" \u2014 ")
+    @applicationDelegate.setRepresentedFilename(representedPath)
 
   # On OS X, fades the application window's proxy icon when the current file
   # has been modified.