Merge pull request #11478 from atom/ku-prompt-save-as-if-save-fails

Prompt user to save as if save fails

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] = []
 

src/pane.coffee

@@ -577,15 +577,23 @@ class Pane extends Model
     else
       return true
 
-    chosen = @applicationDelegate.confirm
-      message: "'#{item.getTitle?() ? uri}' has changes, do you want to save them?"
-      detailedMessage: "Your changes will be lost if you close this item without saving."
-      buttons: ["Save", "Cancel", "Don't Save"]
+    saveDialog = (saveButtonText, saveFn, message) =>
+      chosen = @applicationDelegate.confirm
+        message: message
+        detailedMessage: "Your changes will be lost if you close this item without saving."
+        buttons: [saveButtonText, "Cancel", "Don't save"]
+      switch chosen
+        when 0 then saveFn(item, saveError)
+        when 1 then false
+        when 2 then true
 
-    switch chosen
-      when 0 then @saveItem(item, -> true)
-      when 1 then false
-      when 2 then true
+    saveError = (error) =>
+      if error
+        saveDialog("Save as", @saveItemAs, "'#{item.getTitle?() ? uri}' could not be saved.\nError: #{@getMessageForErrorCode(error.code)}")
+      else
+        true
+
+    saveDialog("Save", @saveItem, "'#{item.getTitle?() ? uri}' has changes, do you want to save them?")
 
   # Public: Save the active item.
   saveActiveItem: (nextAction) ->
@@ -602,9 +610,11 @@ class Pane extends Model
   # Public: Save the given item.
   #
   # * `item` The item to save.
-  # * `nextAction` (optional) {Function} which will be called after the item is
-  #   successfully saved.
-  saveItem: (item, nextAction) ->
+  # * `nextAction` (optional) {Function} which will be called with no argument
+  #   after the item is successfully saved, or with the error if it failed.
+  #   The return value will be that of `nextAction` or `undefined` if it was not
+  #   provided
+  saveItem: (item, nextAction) =>
     if typeof item?.getURI is 'function'
       itemURI = item.getURI()
     else if typeof item?.getUri is 'function'
@@ -613,9 +623,12 @@ class Pane extends Model
     if itemURI?
       try
         item.save?()
+        nextAction?()
       catch error
-        @handleSaveError(error, item)
-      nextAction?()
+        if nextAction
+          nextAction(error)
+        else
+          @handleSaveError(error, item)
     else
       @saveItemAs(item, nextAction)
 
@@ -623,9 +636,11 @@ class Pane extends Model
   # path they select.
   #
   # * `item` The item to save.
-  # * `nextAction` (optional) {Function} which will be called after the item is
-  #   successfully saved.
-  saveItemAs: (item, nextAction) ->
+  # * `nextAction` (optional) {Function} which will be called with no argument
+  #   after the item is successfully saved, or with the error if it failed.
+  #   The return value will be that of `nextAction` or `undefined` if it was not
+  #   provided
+  saveItemAs: (item, nextAction) =>
     return unless item?.saveAs?
 
     saveOptions = item.getSaveDialogOptions?() ? {}
@@ -634,9 +649,12 @@ class Pane extends Model
     if newItemPath
       try
         item.saveAs(newItemPath)
+        nextAction?()
       catch error
-        @handleSaveError(error, item)
-      nextAction?()
+        if nextAction
+          nextAction(error)
+        else
+          @handleSaveError(error, item)
 
   # Public: Save all items.
   saveItems: ->