feat: add consistent options close all option in working set and tab bar

Author: devvaannsh

src/extensions/default/CloseOthers/main.js

@@ -31,9 +31,9 @@ define(function (require, exports, module) {
         workingSetListCmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU);
 
     // Constants
-    var closeOthers             = "file.close_others",
-        closeAbove              = "file.close_above",
-        closeBelow              = "file.close_below";
+    const closeAbove              = "file.close_above",
+        closeBelow              = "file.close_below",
+        closeAll                = "file.close_all_in_pane";
 
     // Global vars and preferences
     var prefs                   = PreferencesManager.getExtensionPrefs("closeOthers"),
@@ -42,16 +42,13 @@ define(function (require, exports, module) {
     prefs.definePreference("below",  "boolean", true, {
         description: Strings.DESCRIPTION_CLOSE_OTHERS_BELOW
     });
-    prefs.definePreference("others", "boolean", true, {
-        description: Strings.DESCRIPTION_CLOSE_OTHERS
-    });
     prefs.definePreference("above",  "boolean", true, {
         description: Strings.DESCRIPTION_CLOSE_OTHERS_ABOVE
     });
 
 
     /**
-     * Handle the different Close Other commands
+     * Handle the different Close commands
      * @param {string} mode
      */
     function handleClose(mode) {
@@ -63,23 +60,30 @@ define(function (require, exports, module) {
             i;
 
         for (i = start; i < end; i++) {
-            if ((mode === closeOthers && i !== targetIndex) || (mode !== closeOthers)) {
-                files.push(workingSetList[i]);
-            }
+            files.push(workingSetList[i]);
         }
 
         CommandManager.execute(Commands.FILE_CLOSE_LIST, {fileList: files});
     }
 
+    /**
+     * Handle Close All - closes all files in the active pane
+     */
+    function handleCloseAll() {
+        let workingSetList = MainViewManager.getWorkingSet(MainViewManager.ACTIVE_PANE);
+        CommandManager.execute(Commands.FILE_CLOSE_LIST, {fileList: workingSetList});
+    }
+
     /**
      * Enable/Disable the menu items depending on which document is selected in the working set
      */
     function contextMenuOpenHandler() {
         var file = MainViewManager.getCurrentlyViewedFile(MainViewManager.ACTIVE_PANE);
 
-        // reset these labels for Working Set context (because tabBar may have changed them to "Left/Right")
+        // reset these labels for Working Set context (because tabBar may have changed them)
         CommandManager.get(closeAbove).setName(Strings.CMD_FILE_CLOSE_ABOVE);
         CommandManager.get(closeBelow).setName(Strings.CMD_FILE_CLOSE_BELOW);
+        CommandManager.get(closeAll).setName(Strings.CMD_FILE_CLOSE_ALL);
 
         if (file) {
             var targetIndex  = MainViewManager.findInWorkingSet(MainViewManager.ACTIVE_PANE, file.fullPath),
@@ -91,12 +95,6 @@ define(function (require, exports, module) {
                 CommandManager.get(closeBelow).setEnabled(true);
             }
 
-            if (workingSetListSize === 1) { // hide "Close Others" if there is only one file in Working Files
-                CommandManager.get(closeOthers).setEnabled(false);
-            } else {
-                CommandManager.get(closeOthers).setEnabled(true);
-            }
-
             if (targetIndex === 0) { // hide "Close Others Above" if the first file in Working Files is selected
                 CommandManager.get(closeAbove).setEnabled(false);
             } else {
@@ -108,14 +106,13 @@ define(function (require, exports, module) {
 
     /**
      * Returns the preferences used to add/remove the menu items
-     * @return {{closeBelow: boolean, closeOthers: boolean, closeAbove: boolean}}
+     * @return {{closeBelow: boolean, closeAbove: boolean}}
      */
     function getPreferences() {
         // It's senseless to look prefs up for the current file, instead look them up for
         // the current project (or globally)
         return {
             closeBelow: prefs.get("below",  PreferencesManager.CURRENT_PROJECT),
-            closeOthers: prefs.get("others", PreferencesManager.CURRENT_PROJECT),
             closeAbove: prefs.get("above",  PreferencesManager.CURRENT_PROJECT)
         };
     }
@@ -126,22 +123,6 @@ define(function (require, exports, module) {
     function prefChangeHandler() {
         var prefs = getPreferences();
 
-        if (prefs.closeBelow !== menuEntriesShown.closeBelow) {
-            if (prefs.closeBelow) {
-                workingSetListCmenu.addMenuItem(closeBelow, "", Menus.AFTER, Commands.FILE_CLOSE);
-            } else {
-                workingSetListCmenu.removeMenuItem(closeBelow);
-            }
-        }
-
-        if (prefs.closeOthers !== menuEntriesShown.closeOthers) {
-            if (prefs.closeOthers) {
-                workingSetListCmenu.addMenuItem(closeOthers, "", Menus.AFTER, Commands.FILE_CLOSE);
-            } else {
-                workingSetListCmenu.removeMenuItem(closeOthers);
-            }
-        }
-
         if (prefs.closeAbove !== menuEntriesShown.closeAbove) {
             if (prefs.closeAbove) {
                 workingSetListCmenu.addMenuItem(closeAbove, "", Menus.AFTER, Commands.FILE_CLOSE);
@@ -150,6 +131,14 @@ define(function (require, exports, module) {
             }
         }
 
+        if (prefs.closeBelow !== menuEntriesShown.closeBelow) {
+            if (prefs.closeBelow) {
+                workingSetListCmenu.addMenuItem(closeBelow, "", Menus.AFTER, closeAbove);
+            } else {
+                workingSetListCmenu.removeMenuItem(closeBelow);
+            }
+        }
+
         menuEntriesShown = prefs;
     }
 
@@ -162,22 +151,20 @@ define(function (require, exports, module) {
         CommandManager.register(Strings.CMD_FILE_CLOSE_BELOW, closeBelow, function () {
             handleClose(closeBelow);
         });
-        CommandManager.register(Strings.CMD_FILE_CLOSE_OTHERS, closeOthers, function () {
-            handleClose(closeOthers);
-        });
         CommandManager.register(Strings.CMD_FILE_CLOSE_ABOVE, closeAbove, function () {
             handleClose(closeAbove);
         });
+        CommandManager.register(Strings.CMD_FILE_CLOSE_ALL, closeAll, handleCloseAll);
 
-        if (prefs.closeBelow) {
-            workingSetListCmenu.addMenuItem(closeBelow, "", Menus.AFTER, Commands.FILE_CLOSE);
-        }
-        if (prefs.closeOthers) {
-            workingSetListCmenu.addMenuItem(closeOthers, "", Menus.AFTER, Commands.FILE_CLOSE);
-        }
+        // Menu order: Close, Close Others Above, Close Others Below, Close All
         if (prefs.closeAbove) {
             workingSetListCmenu.addMenuItem(closeAbove, "", Menus.AFTER, Commands.FILE_CLOSE);
         }
+        if (prefs.closeBelow) {
+            workingSetListCmenu.addMenuItem(closeBelow, "", Menus.AFTER, closeAbove);
+        }
+        workingSetListCmenu.addMenuItem(closeAll, "", Menus.AFTER, closeBelow);
+
         menuEntriesShown = prefs;
     }
 

src/extensionsIntegrated/TabBar/more-options.js

@@ -25,23 +25,17 @@
 define(function (require, exports, module) {
     const CommandManager = require("command/CommandManager");
     const Commands = require("command/Commands");
-    const FileSystem = require("filesystem/FileSystem");
     const MainViewManager = require("view/MainViewManager");
     const Menus = require("command/Menus");
     const Strings = require("strings");
 
-    const Global = require("./global");
-
-    // these are Tab bar specific commands for the context menu
-    // not added in the Commands.js as Tab bar is not a core module but an extension
-    // read init function
-    const TABBAR_CLOSE_ALL = "tabbar.closeAllTabs";
-
     // command IDs from working files - we reuse it here with different labels
     // Close Others Above = Close Tabs to the Left
     // Close Others Below = Close Tabs to the Right
+    // Close All (in pane) = Close All Tabs
     const FILE_CLOSE_ABOVE = "file.close_above";
     const FILE_CLOSE_BELOW = "file.close_below";
+    const FILE_CLOSE_ALL = "file.close_all_in_pane";
 
     // stores the context of the right-clicked tab (which file, which pane)
     // this is set inside the showMoreOptionsContextMenu. read that func for more details
@@ -62,43 +56,13 @@ define(function (require, exports, module) {
         const pinCommand = CommandManager.get(Commands.FILE_PIN);
         pinCommand.setName(isPinned ? Strings.CMD_FILE_UNPIN : Strings.CMD_FILE_PIN);
 
-        // update Close Above/Below labels for TabBar context (Left/Right instead of Above/Below)
+        // update Close Above/Below/All labels for TabBar context
         const closeAboveCmd = CommandManager.get(FILE_CLOSE_ABOVE);
         const closeBelowCmd = CommandManager.get(FILE_CLOSE_BELOW);
+        const closeAllCmd = CommandManager.get(FILE_CLOSE_ALL);
         closeAboveCmd.setName(Strings.CLOSE_TABS_TO_THE_LEFT);
         closeBelowCmd.setName(Strings.CLOSE_TABS_TO_THE_RIGHT);
-    }
-
-    // gets the working set (list of open files) for the given pane
-    function _getWorkingSet(paneId) {
-        return paneId === "first-pane" ? Global.firstPaneWorkingSet : Global.secondPaneWorkingSet;
-    }
-
-    // closes files from right to left to avoid index shifts during iteration
-    function _closeFiles(files, paneId) {
-        for (let i = files.length - 1; i >= 0; i--) {
-            const fileObj = FileSystem.getFileForPath(files[i].path);
-            CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId });
-        }
-    }
-
-    // executes a command with the right-clicked tab's file as the target
-    function _executeWithFileContext(commandId, options = {}) {
-        if (_currentTabContext.filePath) {
-            // we need to get the file object from the file path, as the commandManager expects the file object
-            const fileObj = FileSystem.getFileForPath(_currentTabContext.filePath);
-            CommandManager.execute(commandId, { file: fileObj, ...options });
-        }
-    }
-
-    // **Close All Tabs**
-    // closes all tabs in the pane where the tab was right-clicked
-    function handleCloseAllTabs() {
-        const workingSet = _getWorkingSet(_currentTabContext.paneId);
-        if (workingSet && workingSet.length !== 0) {
-            // close everything in the pane
-            _closeFiles(workingSet, _currentTabContext.paneId);
-        }
+        closeAllCmd.setName(Strings.CLOSE_ALL_TABS);
     }
 
     /**
@@ -124,14 +88,12 @@ define(function (require, exports, module) {
      * this registers the context menu and add the menu items inside it
      */
     function init() {
-        // these are the tab bar specific commands
-        CommandManager.register(Strings.CLOSE_ALL_TABS, TABBAR_CLOSE_ALL, handleCloseAllTabs);
-
+        // Use commands from CloseOthers extension with TabBar-specific labels (via setName in _updateMenuItems)
         const menu = Menus.registerContextMenu("tabbar-context-menu");
         menu.addMenuItem(Commands.FILE_CLOSE);
-        menu.addMenuItem(FILE_CLOSE_ABOVE);  // updated label will be : "Close Tabs to the Left"
-        menu.addMenuItem(FILE_CLOSE_BELOW);  // updated label will be : "Close Tabs to the Right"
-        menu.addMenuItem(TABBAR_CLOSE_ALL);
+        menu.addMenuItem(FILE_CLOSE_ABOVE);  // updated label: "Close Tabs to the Left"
+        menu.addMenuItem(FILE_CLOSE_BELOW);  // updated label: "Close Tabs to the Right"
+        menu.addMenuItem(FILE_CLOSE_ALL);    // updated label: "Close All Tabs"
         menu.addMenuDivider();
         menu.addMenuItem(Commands.FILE_PIN);
         menu.addMenuDivider();