feat: add reopen closed file feature ctrl-shift-t reassigned low use

Author: abose

src/base-config/keyboard.json

@@ -290,9 +290,6 @@
     "navigate.gotoDefinition":  [
         "Ctrl-T"
     ],
-    "navigate.gotoDefinitionInProject":  [
-        "Ctrl-Shift-T"
-    ],
     "navigate.jumptoDefinition":  [
         "Ctrl-J"
     ],

src/command/Commands.js

@@ -49,6 +49,7 @@ define(function (require, exports, module) {
     exports.FILE_CLOSE                  = "file.close";                 // DocumentCommandHandlers.js   handleFileClose()
     exports.FILE_CLOSE_ALL              = "file.close_all";             // DocumentCommandHandlers.js   handleFileCloseAll()
     exports.FILE_CLOSE_LIST             = "file.close_list";            // DocumentCommandHandlers.js   handleFileCloseList()
+    exports.FILE_REOPEN_CLOSED          = "file.reopen_closed";         // DocumentCommandHandlers.js   handleReopenClosed()
     exports.FILE_OPEN_DROPPED_FILES     = "file.openDroppedFiles";      // DragAndDrop.js               openDroppedFiles()
     exports.FILE_LIVE_FILE_PREVIEW      = "file.liveFilePreview";       // LiveDevelopment/main.js      _handleGoLiveCommand()
     exports.FILE_LIVE_FILE_PREVIEW_SETTINGS = "file.liveFilePreviewSettings";       // LiveDevelopment/main.js      _handleGoLiveCommand()

src/command/DefaultMenus.js

@@ -75,6 +75,7 @@ define(function (require, exports, module) {
     const fileCloseAllShortcut = isDesktop ? "Ctrl-Shift-W" : ""; // Ctrl-Alt-Shift-W` universal shortcut is set in keyboard.json
     const openFileShortcut = isDesktop ? "Ctrl-O" : "";
     const openFolderShortcut = isBrowser ? "Ctrl-O" : "";
+    const reopenClosedShortcut = isBrowser ? "" : "Ctrl-Shift-T";
 
     AppInit.htmlReady(function () {
         /**
@@ -119,6 +120,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.FILE_OPEN_FOLDER, openFolderShortcut);
         menu.addMenuItem(Commands.FILE_CLOSE, fileCloseShortcut);
         menu.addMenuItem(Commands.FILE_CLOSE_ALL, fileCloseAllShortcut);
+        menu.addMenuItem(Commands.FILE_REOPEN_CLOSED, reopenClosedShortcut);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.FILE_SAVE);
         menu.addMenuItem(Commands.FILE_SAVE_ALL);

src/document/DocumentCommandHandlers.js

@@ -1320,6 +1320,38 @@ define(function (require, exports, module) {
         return saveAll();
     }
 
+    let closedFilesHistory = new Map();
+
+    function _enableOrDisableReopenClosedCmd() {
+        CommandManager.get(Commands.FILE_REOPEN_CLOSED).setEnabled(!!closedFilesHistory.size);
+    }
+
+    function _addToClosedFilesHistory(filePath, paneID) {
+        closedFilesHistory.set(filePath, {paneID, closeTime: Date.now()});
+        _enableOrDisableReopenClosedCmd();
+    }
+
+    function handleReopenClosed() {
+        // find the file that was most recently closed
+        let leastRecentlyClosedPath, leastRecentlyClosedTime, paneToUse;
+        for(let closedFilePath of closedFilesHistory.keys()){
+            const currentScan = closedFilesHistory.get(closedFilePath);
+            if(!leastRecentlyClosedPath || leastRecentlyClosedTime < currentScan.closeTime) {
+                leastRecentlyClosedPath = closedFilePath;
+                leastRecentlyClosedTime = currentScan.closeTime;
+                paneToUse = currentScan.paneID;
+            }
+        }
+        if(leastRecentlyClosedPath) {
+            closedFilesHistory.delete(leastRecentlyClosedPath);
+            if(MainViewManager.getPaneCount() === 1) {
+                paneToUse = MainViewManager.ACTIVE_PANE;
+            }
+            FileViewController.openFileAndAddToWorkingSet(leastRecentlyClosedPath, paneToUse);
+        }
+        _enableOrDisableReopenClosedCmd();
+    }
+
     /**
      * Closes the specified file: removes it from the workingset, and closes the main editor if one
      * is open. Prompts user about saving changes first, if document is dirty.
@@ -1339,7 +1371,8 @@ define(function (require, exports, module) {
             promptOnly,
             _forceClose,
             _spawnedRequest,
-            paneId = MainViewManager.ACTIVE_PANE;
+            paneId = MainViewManager.ACTIVE_PANE,
+            activePaneID = MainViewManager.getActivePaneId();
 
         if (commandData) {
             file        = commandData.file;
@@ -1353,6 +1386,11 @@ define(function (require, exports, module) {
         function doClose(file) {
             if (!promptOnly) {
                 MainViewManager._close(paneId, file);
+                let paneClosing = paneId;
+                if(paneId === MainViewManager.ACTIVE_PANE){
+                    paneClosing = activePaneID;
+                }
+                _addToClosedFilesHistory(file.fullPath, paneClosing);
                 _fileClosed(file);
             }
         }
@@ -2192,6 +2230,8 @@ define(function (require, exports, module) {
 
     let firstProjectOpenHandled = false;
     ProjectManager.on(ProjectManager.EVENT_AFTER_PROJECT_OPEN, ()=>{
+        closedFilesHistory = new Map();
+        _enableOrDisableReopenClosedCmd();
         if(firstProjectOpenHandled){
             return;
         }
@@ -2252,6 +2292,7 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_FILE_CLOSE,                  Commands.FILE_CLOSE,                     handleFileClose);
     CommandManager.register(Strings.CMD_FILE_CLOSE_ALL,              Commands.FILE_CLOSE_ALL,                 handleFileCloseAll);
     CommandManager.register(Strings.CMD_FILE_CLOSE_LIST,             Commands.FILE_CLOSE_LIST,                handleFileCloseList);
+    CommandManager.register(Strings.CMD_REOPEN_CLOSED,               Commands.FILE_REOPEN_CLOSED,             handleReopenClosed);
 
     // Traversal
     CommandManager.register(Strings.CMD_NEXT_DOC,                    Commands.NAVIGATE_NEXT_DOC,              handleGoNextDoc);

src/extensionsIntegrated/DisplayShortcuts/templates/bottom-panel.html

@@ -4,7 +4,7 @@
         <a href="#" class="close">&times;</a>
         <button class="btn reset-to-default" title="{{KEYBOARD_SHORTCUT_PANEL_RESET_DEFAULT}}">{{{KEYBOARD_SHORTCUT_PANEL_RESET}}}</button>
         <input class="filter" type="search" placeholder="{{{KEYBOARD_SHORTCUT_PANEL_FILTER}}}">
-        <span class="presetPickerContainer forced-hidden" title="{{KEYBOARD_SHORTCUT_PRESET_TOOLTIP}}"></span>
+        <span class="presetPickerContainer" title="{{KEYBOARD_SHORTCUT_PRESET_TOOLTIP}}"></span>
     </div>
     <div class="resizable-content"></div>
 </div>

src/extensionsIntegrated/NavigationAndHistory/main.js

@@ -731,7 +731,7 @@ define(function (require, exports, module) {
         KeyBindingManager.addBinding(PREV_IN_RECENT_FILES, KeyboardPrefs[PREV_IN_RECENT_FILES]);
 
         var menu = Menus.getMenu(Menus.AppMenuBar.FILE_MENU);
-        menu.addMenuItem(SHOW_RECENT_FILES, "", Menus.AFTER, Commands.FILE_OPEN_FOLDER);
+        menu.addMenuItem(SHOW_RECENT_FILES, "", Menus.AFTER, Commands.FILE_REOPEN_CLOSED);
     }
 
     function _initDefaultNavigationCommands() {

src/nls/root/strings.js

@@ -464,6 +464,7 @@ define({
     "CMD_OPEN_FOLDER": "Open Folder\u2026",
     "CMD_FILE_CLOSE": "Close",
     "CMD_FILE_CLOSE_ALL": "Close All",
+    "CMD_REOPEN_CLOSED": "Reopen Closed File",
     "CMD_FILE_CLOSE_LIST": "Close List",
     "CMD_FILE_CLOSE_OTHERS": "Close Others",
     "CMD_FILE_CLOSE_ABOVE": "Close Others Above",