Merge pull request #4514 from adobe/bchin/issue-4489

Fixed issue #4489- "Save/Close All with multiple untitled documents gives ambiguous Save dialogs"

Author: peterflynn

src/document/DocumentCommandHandlers.js

@@ -660,6 +660,11 @@ define(function (require, exports, module) {
             origPath = doc.file.fullPath;
             // If the document is an untitled document, we should default to project root.
             if (doc.isUntitled()) {
+                // (Issue #4489) if we're saving an untitled document, go ahead and switch to this document
+                //   in the editor, so that if we're, for example, saving several files (ie. Save All),
+                //   then the user can visually tell which document we're currently prompting them to save.
+                DocumentManager.setCurrentDocument(doc);
+
                 // If the document is untitled, default to project root.
                 saveAsDefaultPath = ProjectManager.getProjectRoot().fullPath;
             } else {

test/spec/DocumentCommandHandlers-test.js

@@ -34,6 +34,7 @@ define(function (require, exports, module) {
         DocumentCommandHandlers, // loaded from brackets.test
         DocumentManager,     // loaded from brackets.test
         Dialogs,             // loaded from brackets.test
+        FileViewController,  // loaded from brackets.test
         SpecRunnerUtils     = require("spec/SpecRunnerUtils"),
         NativeFileSystem    = require("file/NativeFileSystem").NativeFileSystem,
         FileUtils           = require("file/FileUtils"),
@@ -59,6 +60,7 @@ define(function (require, exports, module) {
                 DocumentCommandHandlers = testWindow.brackets.test.DocumentCommandHandlers;
                 DocumentManager     = testWindow.brackets.test.DocumentManager;
                 Dialogs             = testWindow.brackets.test.Dialogs;
+                FileViewController  = testWindow.brackets.test.FileViewController;
             });
         });
 
@@ -146,7 +148,7 @@ define(function (require, exports, module) {
                 });
             });
 
-            it("should keep untitled document in the Working Set after saving with new name", function () {
+            it("should swap out untitled document in the Working Set after saving with new name", function () {
                 var newFilename = "testname.js",
                     newFilePath = testPath + "/" + newFilename,
                     promise;
@@ -173,12 +175,53 @@ define(function (require, exports, module) {
                     expect(noLongerUntitledDocument.isUntitled()).toBe(false);
                     expect(noLongerUntitledDocument.file.fullPath).toEqual(newFilePath);
                     expect(DocumentManager.findInWorkingSet(newFilePath)).toBeGreaterThan(-1);
+                    expect(DocumentManager.getWorkingSet().length).toEqual(1);  // no remnant of untitled doc left
 
                     // Verify file exists, & clean up
                     expectAndDelete(newFilePath);
                 });
             });
 
+            it("should swap out untitled document from working set even when not current", function () {
+                var newFilePath = testPath + "/testname.js",
+                    promise;
+
+                runs(function () {
+                    promise = CommandManager.execute(Commands.FILE_NEW_UNTITLED);
+
+                    waitsForDone(promise, "FILE_NEW_UNTITLED");
+                });
+
+                runs(function () {
+                    // Select test.js in the project tree (so nothing is selected in the working set)
+                    promise = FileViewController.openAndSelectDocument(testPath + "/test.js", FileViewController.PROJECT_MANAGER);
+
+                    waitsForDone(promise, "openAndSelectDocument");
+                });
+
+                runs(function () {
+                    spyOn(testWindow.brackets.fs, 'showSaveDialog').andCallFake(function (dialogTitle, initialPath, proposedNewName, callback) {
+                        callback(undefined, newFilePath);
+                    });
+
+                    var promise = CommandManager.execute(Commands.FILE_SAVE_ALL);
+                    waitsForDone(promise, "FILE_SAVE_ALL");
+                });
+                
+                runs(function () {
+                    var noLongerUntitledDocument = DocumentManager.getCurrentDocument();
+
+                    expect(noLongerUntitledDocument.isDirty).toBe(false);
+                    expect(noLongerUntitledDocument.isUntitled()).toBe(false);
+                    expect(noLongerUntitledDocument.file.fullPath).toEqual(newFilePath);
+                    expect(DocumentManager.findInWorkingSet(newFilePath)).toBeGreaterThan(-1);
+                    expect(DocumentManager.getWorkingSet().length).toEqual(1);  // no remnant of untitled doc left
+
+                    // Verify file exists, & clean up
+                    expectAndDelete(newFilePath);
+                });
+            });
+            
             it("should ask to save untitled document upon closing", function () {
                 var newFilename = "testname2.js",
                     newFilePath = testPath + "/" + newFilename,