fix: close all tabs and close unmodified tabs now only close for the specified pane

Author: devvaannsh

src/extensionsIntegrated/TabBar/more-options.js

@@ -81,49 +81,63 @@ define(function (require, exports, module) {
 
     /**
      * "CLOSE ALL TABS"
-     * This will close all tabs no matter whether they are in first pane or second pane
+     * This will close all tabs in the specified pane
+     *
+     * @param {String} paneId - the id of the pane ["first-pane", "second-pane"]
      */
-    function handleCloseAllTabs() {
-        CommandManager.execute(Commands.FILE_CLOSE_ALL);
+    function handleCloseAllTabs(paneId) {
+        if (!paneId) {
+            return;
+        }
+
+        let workingSet;
+        workingSet = paneId === "first-pane" ? Global.firstPaneWorkingSet : Global.secondPaneWorkingSet;
+        if (!workingSet || workingSet.length === 0) {
+            return;
+        }
+
+        // close each file in the pane, start from the rightmost [to avoid index shifts]
+        for (let i = workingSet.length - 1; i >= 0; i--) {
+            const fileObj = FileSystem.getFileForPath(workingSet[i].path);
+            CommandManager.execute(
+                Commands.FILE_CLOSE,
+                { file: fileObj, paneId: paneId }
+            );
+        }
     }
 
 
     /**
      * "CLOSE UNMODIFIED TABS"
-     * This will close all tabs that are not modified
+     * This will close all tabs that are not modified in the specified pane
+     *
+     * @param {String} paneId - the id of the pane ["first-pane", "second-pane"]
      */
-    function handleCloseUnmodifiedTabs() {
-        const paneList = MainViewManager.getPaneIdList();
-
-        // for the first pane
-        if (paneList.length > 0 && Global.firstPaneWorkingSet.length > 0) {
-            // get all those entries that are not dirty
-            const unmodifiedEntries = Global.firstPaneWorkingSet.filter(entry => !entry.isDirty);
+    function handleCloseUnmodifiedTabs(paneId) {
+        if (!paneId) {
+            return;
+        }
 
-            // close each unmodified file in the first pane
-            unmodifiedEntries.forEach(entry => {
-                const fileObj = FileSystem.getFileForPath(entry.path);
-                CommandManager.execute(
-                    Commands.FILE_CLOSE,
-                    { file: fileObj, paneId: "first-pane" }
-                );
-            });
+        let workingSet;
+        workingSet = paneId === "first-pane" ? Global.firstPaneWorkingSet : Global.secondPaneWorkingSet;
+        if (!workingSet || workingSet.length === 0) {
+            return;
         }
 
-        // for second pane
-        if (paneList.length > 1 && Global.secondPaneWorkingSet.length > 0) {
-            const unmodifiedEntries = Global.secondPaneWorkingSet.filter(entry => !entry.isDirty);
+        // get all those entries that are not dirty
+        const unmodifiedEntries = workingSet.filter(entry => !entry.isDirty);
 
-            unmodifiedEntries.forEach(entry => {
-                const fileObj = FileSystem.getFileForPath(entry.path);
-                CommandManager.execute(
-                    Commands.FILE_CLOSE,
-                    { file: fileObj, paneId: "second-pane" }
-                );
-            });
+        // close each unmodified file in the pane
+        for (let i = unmodifiedEntries.length - 1; i >= 0; i--) {
+            const fileObj = FileSystem.getFileForPath(unmodifiedEntries[i].path);
+            CommandManager.execute(
+                Commands.FILE_CLOSE,
+                { file: fileObj, paneId: paneId }
+            );
         }
     }
 
+
     /**
      * "CLOSE TABS TO THE LEFT"
      * This function is responsible for closing all tabs to the left of the right-clicked tab
@@ -252,34 +266,34 @@ define(function (require, exports, module) {
      */
     function _handleSelection(index, filePath, paneId) {
         switch (index) {
-        case 0:
-            // Close tab (the one that was right-clicked)
-            handleCloseTab(filePath, paneId);
-            break;
-        case 1:
-            // Close active tab
-            handleCloseActiveTab();
-            break;
-        case 2:
-            // Close tabs to the left
-            handleCloseTabsToTheLeft(filePath, paneId);
-            break;
-        case 3:
-            // Close tabs to the right
-            handleCloseTabsToTheRight(filePath, paneId);
-            break;
-        case 4:
-            // Close all tabs
-            handleCloseAllTabs();
-            break;
-        case 5:
-            // Close unmodified tabs
-            handleCloseUnmodifiedTabs();
-            break;
-        case 6:
-            // Reopen closed file
-            reopenClosedFile();
-            break;
+            case 0:
+                // Close tab (the one that was right-clicked)
+                handleCloseTab(filePath, paneId);
+                break;
+            case 1:
+                // Close active tab
+                handleCloseActiveTab();
+                break;
+            case 2:
+                // Close tabs to the left
+                handleCloseTabsToTheLeft(filePath, paneId);
+                break;
+            case 3:
+                // Close tabs to the right
+                handleCloseTabsToTheRight(filePath, paneId);
+                break;
+            case 4:
+                // Close all tabs
+                handleCloseAllTabs(paneId);
+                break;
+            case 5:
+                // Close unmodified tabs
+                handleCloseUnmodifiedTabs(paneId);
+                break;
+            case 6:
+                // Reopen closed file
+                reopenClosedFile();
+                break;
         }
     }