Merge branch 'master' into ns-switch-to-display-layers

# Conflicts:
#	src/text-editor.coffee

spec/command-registry-spec.coffee

@@ -74,6 +74,13 @@ describe "CommandRegistry", ->
       grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
       expect(calls).toEqual ['.foo.bar', '.bar', '.foo']
 
+    it "orders inline listeners by reverse registration order", ->
+      calls = []
+      registry.add child, 'command', -> calls.push('child1')
+      registry.add child, 'command', -> calls.push('child2')
+      child.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual ['child2', 'child1']
+
     it "stops bubbling through ancestors when .stopPropagation() is called on the event", ->
       calls = []
 

spec/pane-spec.coffee

@@ -917,6 +917,82 @@ describe "Pane", ->
       expect(item1.save).not.toHaveBeenCalled()
       expect(pane.isDestroyed()).toBe false
 
+    describe "when item fails to save", ->
+      [pane, item1, item2] = []
+
+      beforeEach ->
+        pane = new Pane({items: [new Item("A"), new Item("B")], applicationDelegate: atom.applicationDelegate, config: atom.config})
+        [item1, item2] = pane.getItems()
+
+        item1.shouldPromptToSave = -> true
+        item1.getURI = -> "/test/path"
+
+        item1.save = jasmine.createSpy("save").andCallFake ->
+          error = new Error("EACCES, permission denied '/test/path'")
+          error.path = '/test/path'
+          error.code = 'EACCES'
+          throw error
+
+      it "does not destroy the pane if save fails and user clicks cancel", ->
+        confirmations = 0
+        confirm.andCallFake ->
+          confirmations++
+          if confirmations is 1
+            return 0 # click save
+          else
+            return 1 # click cancel
+
+        pane.close()
+
+        expect(atom.applicationDelegate.confirm).toHaveBeenCalled()
+        expect(confirmations).toBe(2)
+        expect(item1.save).toHaveBeenCalled()
+        expect(pane.isDestroyed()).toBe false
+
+      it "does destroy the pane if the user saves the file under a new name", ->
+        item1.saveAs = jasmine.createSpy("saveAs").andReturn(true)
+
+        confirmations = 0
+        confirm.andCallFake ->
+          confirmations++
+          return 0 # save and then save as
+
+        showSaveDialog.andReturn("new/path")
+
+        pane.close()
+
+        expect(atom.applicationDelegate.confirm).toHaveBeenCalled()
+        expect(confirmations).toBe(2)
+        expect(atom.applicationDelegate.showSaveDialog).toHaveBeenCalled()
+        expect(item1.save).toHaveBeenCalled()
+        expect(item1.saveAs).toHaveBeenCalled()
+        expect(pane.isDestroyed()).toBe true
+
+      it "asks again if the saveAs also fails", ->
+        item1.saveAs = jasmine.createSpy("saveAs").andCallFake ->
+          error = new Error("EACCES, permission denied '/test/path'")
+          error.path = '/test/path'
+          error.code = 'EACCES'
+          throw error
+
+        confirmations = 0
+        confirm.andCallFake ->
+          confirmations++
+          if confirmations < 3
+            return 0 # save, save as, save as
+          return 2 # don't save
+
+        showSaveDialog.andReturn("new/path")
+
+        pane.close()
+
+        expect(atom.applicationDelegate.confirm).toHaveBeenCalled()
+        expect(confirmations).toBe(3)
+        expect(atom.applicationDelegate.showSaveDialog).toHaveBeenCalled()
+        expect(item1.save).toHaveBeenCalled()
+        expect(item1.saveAs).toHaveBeenCalled()
+        expect(pane.isDestroyed()).toBe true
+
   describe "::destroy()", ->
     [container, pane1, pane2] = []
 

spec/text-editor-registry-spec.coffee

@@ -10,6 +10,7 @@ describe "TextEditorRegistry", ->
     it "gets added to the list of registered editors", ->
       editor = {}
       registry.add(editor)
+      expect(editor.registered).toBe true
       expect(registry.editors.size).toBe 1
       expect(registry.editors.has(editor)).toBe(true)
 
@@ -19,6 +20,16 @@ describe "TextEditorRegistry", ->
       expect(registry.editors.size).toBe 1
       disposable.dispose()
       expect(registry.editors.size).toBe 0
+      expect(editor.registered).toBe false
+
+    it "can be removed", ->
+      editor = {}
+      registry.add(editor)
+      expect(registry.editors.size).toBe 1
+      success = registry.remove(editor)
+      expect(success).toBe true
+      expect(registry.editors.size).toBe 0
+      expect(editor.registered).toBe false
 
   describe "when the registry is observed", ->
     it "calls the callback for current and future editors until unsubscribed", ->