"close others" extension added to default extensions directory.

src/document/DocumentCommandHandlers.js

@@ -715,20 +715,12 @@ define(function (require, exports, module) {
         return $.Deferred().reject().promise();
     }
 
-    /**
-     * Saves all unsaved documents. Returns a Promise that will be resolved once ALL the save
-     * operations have been completed. If ANY save operation fails, an error dialog is immediately
-     * shown and the other files wait to save until it is dismissed; after all files have been
-     * processed, the Promise is rejected if any ONE save operation failed.
-     *
-     * @return {$.Promise}
-     */
-    function saveAll() {
+    function _saveFileList(fileList) {
         // Do in serial because doSave shows error UI for each file, and we don't want to stack
         // multiple dialogs on top of each other
         var userCanceled = false;
         return Async.doSequentially(
-            DocumentManager.getWorkingSet(),
+            fileList,
             function (file) {
                 // Abort remaining saves if user canceled any Save dialog
                 if (userCanceled) {
@@ -753,6 +745,18 @@ define(function (require, exports, module) {
         );
     }
 
+    /**
+     * Saves all unsaved documents. Returns a Promise that will be resolved once ALL the save
+     * operations have been completed. If ANY save operation fails, an error dialog is immediately
+     * shown and the other files wait to save until it is dismissed; after all files have been
+     * processed, the Promise is rejected if any ONE save operation failed.
+     *
+     * @return {$.Promise}
+     */
+    function saveAll() {
+        return _saveFileList(DocumentManager.getWorkingSet());
+    }
+
     /**
      * Prompts user with save as dialog and saves document.
      * @return {$.Promise} a promise that is resolved once the save has been completed
@@ -903,21 +907,12 @@ define(function (require, exports, module) {
         }
         return promise;
     }
-
-    /**
-     * Closes all open documents; equivalent to calling handleFileClose() for each document, except
-     * that unsaved changes are confirmed once, in bulk.
-     * @param {?{promptOnly: boolean}}  If true, only displays the relevant confirmation UI and does NOT
-     *          actually close any documents. This is useful when chaining close-all together with
-     *          other user prompts that may be cancelable.
-     * @return {$.Promise} a promise that is resolved when all files are closed
-     */
-    function handleFileCloseAll(commandData) {
-        var result = new $.Deferred(),
-            promptOnly = commandData && commandData.promptOnly;
 
-        var unsavedDocs = [];
-        DocumentManager.getWorkingSet().forEach(function (file) {
+    function _doCloseDocumentList(list, promptOnly) {
+        var result      = new $.Deferred(),
+            unsavedDocs = [];
+
+        list.forEach(function (file) {
             var doc = DocumentManager.getOpenDocumentForPath(file.fullPath);
             if (doc && doc.isDirty) {
                 unsavedDocs.push(doc);
@@ -980,7 +975,7 @@ define(function (require, exports, module) {
                         result.reject();
                     } else if (id === Dialogs.DIALOG_BTN_OK) {
                         // Save all unsaved files, then if that succeeds, close all
-                        saveAll().done(function () {
+                        _saveFileList(list).done(function () {
                             result.resolve();
                         }).fail(function () {
                             result.reject();
@@ -997,13 +992,29 @@ define(function (require, exports, module) {
         // guarantees that handlers run in the order they are added.
         result.done(function () {
             if (!promptOnly) {
-                DocumentManager.closeAll();
+                DocumentManager.removeFilesFromWorkingSet(list);
             }
         });
 
         return result.promise();
     }
 
+    /**
+     * Closes all open documents; equivalent to calling handleFileClose() for each document, except
+     * that unsaved changes are confirmed once, in bulk.
+     * @param {?{promptOnly: boolean}}  If true, only displays the relevant confirmation UI and does NOT
+     *          actually close any documents. This is useful when chaining close-all together with
+     *          other user prompts that may be cancelable.
+     * @return {$.Promise} a promise that is resolved when all files are closed
+     */
+    function handleFileCloseAll(commandData) {
+        return _doCloseDocumentList(DocumentManager.getWorkingSet(), (commandData && commandData.promptOnly));
+    }
+
+    function handleFileCloseList(documentList) {
+        return _doCloseDocumentList(documentList);
+    }
+
     /**
      * @private - tracks our closing state if we get called again
      */
@@ -1182,6 +1193,8 @@ define(function (require, exports, module) {
 
     // Exported for unit testing only
     exports._parseDecoratedPath = _parseDecoratedPath;
+
+    exports.handleFileCloseList = handleFileCloseList;
 
     // Register global commands
     CommandManager.register(Strings.CMD_FILE_OPEN,          Commands.FILE_OPEN, handleFileOpen);

src/document/DocumentManager.js

@@ -316,29 +316,41 @@ define(function (require, exports, module) {
         // Dispatch event
         $(exports).triggerHandler("workingSetAddList", [uniqueFileList]);
     }
-
-    /**
-     * Warning: low level API - use FILE_CLOSE command in most cases.
-     * Removes the given file from the working set list, if it was in the list. Does not change
-     * the current editor even if it's for this file. Does not prompt for unsaved changes.
-     * @param {!FileEntry} file
-     * @param {boolean=} true to suppress redraw after removal
-     */
-    function removeFromWorkingSet(file, suppressRedraw) {
+
+    function _internalRemoveFromWorkingSet(file) {
         // If doc isn't in working set, do nothing
         var index = findInWorkingSet(file.fullPath);
         if (index === -1) {
-            return;
+            return false;
         }
 
         // Remove
         _workingSet.splice(index, 1);
         _workingSetMRUOrder.splice(findInWorkingSet(file.fullPath, _workingSetMRUOrder), 1);
         _workingSetAddedOrder.splice(findInWorkingSet(file.fullPath, _workingSetAddedOrder), 1);
 
+        return true;
+    }
+
+    function removeFromWorkingSet(file, suppressRedraw) {
+        if (_internalRemoveFromWorkingSet(file)) {
+            $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]);
+        }
+    }
+
+    function removeFilesFromWorkingSet(fileList) {        
+        if (!fileList) {
+            return;
+        }
+
+        fileList.forEach(function (file) {
+            _internalRemoveFromWorkingSet(file);
+        });
+
         // Dispatch event
-        $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]);
+        $(exports).triggerHandler("workingSetRemoveList", [fileList]);
     }
+
 
     /**
      * Removes all files from the working set list.
@@ -569,7 +581,6 @@ define(function (require, exports, module) {
         _removeAllFromWorkingSet();
     }
 
-
     /**
      * Cleans up any loose Documents whose only ref is its own master Editor, and that Editor is not
      * rooted in the UI anywhere. This can happen if the Editor is auto-created via Document APIs that
@@ -817,43 +828,32 @@ define(function (require, exports, module) {
      * @param {boolean} isFolder True if path is a folder; False if it is a file.
      */
     function notifyPathNameChanged(oldName, newName, isFolder) {
-        var i, path;
-
         // Update open documents. This will update _currentDocument too, since 
         // the current document is always open.
         var keysToDelete = [];
-        for (path in _openDocuments) {
-            if (_openDocuments.hasOwnProperty(path)) {
-                if (FileUtils.isAffectedWhenRenaming(path, oldName, newName, isFolder)) {
-                    var doc = _openDocuments[path];
-
-                    // Copy value to new key
-                    var newKey = path.replace(oldName, newName);
-                    _openDocuments[newKey] = doc;
-
-                    keysToDelete.push(path);
-
-                    // Update document file
-                    FileUtils.updateFileEntryPath(doc.file, oldName, newName, isFolder);
-                    doc._notifyFilePathChanged();
-
-                    if (!isFolder) {
-                        // If the path name is a file, there can only be one matched entry in the open document
-                        // list, which we just updated. Break out of the for .. in loop. 
-                        break;
-                    }
-                }
+        CollectionUtils.forEach(_openDocuments, function (doc, path) {
+            if (FileUtils.isAffectedWhenRenaming(path, oldName, newName, isFolder)) {
+                // Copy value to new key
+                var newKey = path.replace(oldName, newName);
+                _openDocuments[newKey] = doc;
+
+                keysToDelete.push(path);
+
+                // Update document file
+                FileUtils.updateFileEntryPath(doc.file, oldName, newName, isFolder);
+                doc._notifyFilePathChanged();
             }
-        }
+        });
+
         // Delete the old keys
-        for (i = 0; i < keysToDelete.length; i++) {
-            delete _openDocuments[keysToDelete[i]];
-        }
+        keysToDelete.forEach(function (fullPath) {
+            delete _openDocuments[fullPath];
+        });
 
         // Update working set
-        for (i = 0; i < _workingSet.length; i++) {
-            FileUtils.updateFileEntryPath(_workingSet[i], oldName, newName, isFolder);
-        }
+        _workingSet.forEach(function (fileEntry) {
+            FileUtils.updateFileEntryPath(fileEntry, oldName, newName, isFolder);
+        });
 
         // Send a "fileNameChanged" event. This will trigger the views to update.
         $(exports).triggerHandler("fileNameChange", [oldName, newName]);
@@ -951,6 +951,7 @@ define(function (require, exports, module) {
     exports.addToWorkingSet             = addToWorkingSet;
     exports.addListToWorkingSet         = addListToWorkingSet;
     exports.removeFromWorkingSet        = removeFromWorkingSet;
+    exports.removeFilesFromWorkingSet   = removeFilesFromWorkingSet;
     exports.getNextPrevFile             = getNextPrevFile;
     exports.swapWorkingSetIndexes       = swapWorkingSetIndexes;
     exports.sortWorkingSet              = sortWorkingSet;

src/extensions/default/CloseOthers/main.js

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
+/*global define, $, brackets, window, document */
+
+define(function (require, exports, module) {
+    "use strict";
+
+    var Menus             = brackets.getModule("command/Menus"),
+        CommandManager    = brackets.getModule("command/CommandManager"),
+        Commands          = brackets.getModule("command/Commands"),
+        dm                = brackets.getModule("document/DocumentManager"),
+        docCH             = brackets.getModule("document/DocumentCommandHandlers"),
+        strings           = brackets.getModule("i18n!nls/strings"),
+        settings          = JSON.parse(require("text!settings.json")),
+        working_set_cmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_MENU),
+        close_others      = "file.close_others",
+        close_above       = "file.close_above",
+        close_below       = "file.close_below";
+
+    function handleClose(mode) {
+
+        var targetIndex = dm.findInWorkingSet(dm.getCurrentDocument().file.fullPath),
+            workingSet   = dm.getWorkingSet().slice(0),
+            start = (mode === close_below) ? (targetIndex + 1) : 0,
+            end   = (mode === close_above) ? (targetIndex) : (workingSet.length),
+            docList = [],
+            i;
+
+        if (mode === close_others) {
+            end--;
+            workingSet.splice(targetIndex, 1);
+        }
+
+        for (i = start; i < end; i++) {
+            docList.push(workingSet[i]);
+        }
+
+        docCH.handleFileCloseList(docList);
+    }
+
+    if (settings.close_below) {
+        CommandManager.register(strings.CMD_FILE_CLOSE_BELOW, close_below, function () {
+            handleClose(close_below);
+        });
+        working_set_cmenu.addMenuItem(close_below, "", Menus.AFTER, Commands.FILE_CLOSE);
+    }
+
+    if (settings.close_others) {
+        CommandManager.register(strings.CMD_FILE_CLOSE_OTHERS, close_others, function () {
+            handleClose(close_others);
+        });
+        working_set_cmenu.addMenuItem(close_others, "", Menus.AFTER, Commands.FILE_CLOSE);
+    }
+
+    if (settings.close_above) {
+        CommandManager.register(strings.CMD_FILE_CLOSE_ABOVE, close_above, function () {
+            handleClose(close_above);
+        });
+        working_set_cmenu.addMenuItem(close_above, "", Menus.AFTER, Commands.FILE_CLOSE);
+    }
+});

src/extensions/default/CloseOthers/settings.json

@@ -0,0 +1,5 @@
+{
+    "close_others": true,
+    "close_above": true,
+    "close_below": true
+}

src/nls/root/strings.js

@@ -179,6 +179,9 @@ define({
     "CMD_OPEN_FOLDER"                     : "Open Folder\u2026",
     "CMD_FILE_CLOSE"                      : "Close",
     "CMD_FILE_CLOSE_ALL"                  : "Close All",
+    "CMD_FILE_CLOSE_OTHERS"               : "Close Others",
+    "CMD_FILE_CLOSE_ABOVE"                : "Close Others Above",
+    "CMD_FILE_CLOSE_BELOW"                : "Close Others Below",
     "CMD_FILE_SAVE"                       : "Save",
     "CMD_FILE_SAVE_ALL"                   : "Save All",
     "CMD_FILE_SAVE_AS"                    : "Save As\u2026",