fix: navigation errors in console

Author: abose

src/extensionsIntegrated/NavigationAndHistory/NavigationProvider.js

@@ -428,7 +428,7 @@ define(function (require, exports, module) {
     function _getCurrentEditNavFrame() {
         const currentFullEditor = EditorManager.getCurrentFullEditor();
         const currentlyViewedFile = MainViewManager.getCurrentlyViewedFile();
-        let currentEditNavFrame;
+        let currentEditNavFrame = null;
         if(currentFullEditor){
             currentEditNavFrame = new NavigationFrame(EditorManager.getCurrentFullEditor(),
                 {ranges: EditorManager.getCurrentFullEditor()._codeMirror.listSelections()});
@@ -450,18 +450,20 @@ define(function (require, exports, module) {
         // Check if the poped frame is the current active frame or doesn't have any valid marker information
         // if true, jump again
         while (navFrame && navFrame === currentEditNavFrame
-        ||(navFrame && navFrame.filePath === currentEditNavFrame.filePath
+        ||(navFrame && currentEditNavFrame && navFrame.filePath === currentEditNavFrame.filePath
             && _isSimilarSelection(navFrame.selections, currentEditNavFrame.selections)
             && _isSimilarBookmarks(navFrame.bookMarkIds, currentEditNavFrame.bookMarkIds))
-        ||(skipCurrentFile && navFrame && navFrame.filePath === currentEditNavFrame.filePath)) {
+        ||(skipCurrentFile && navFrame && currentEditNavFrame && navFrame.filePath === currentEditNavFrame.filePath)) {
             navFrame = jumpBackwardStack.pop();
         }
 
         if (navFrame) {
             // We will check for the file existence now, if it doesn't exist we will jump back again
             // but discard the popped frame as invalid.
             _validateFrame(navFrame).done(function () {
-                jumpForwardStack.push(currentEditNavFrame);
+                if(currentEditNavFrame) {
+                    jumpForwardStack.push(currentEditNavFrame);
+                }
                 navFrame.goTo();
             }).fail(function () {
                 CommandManager.execute(NAVIGATION_JUMP_BACK);
@@ -470,7 +472,9 @@ define(function (require, exports, module) {
                 deferred.resolve();
             });
         } else {
-            jumpBackwardStack.push(currentEditNavFrame);
+            if(currentEditNavFrame){
+                jumpBackwardStack.push(currentEditNavFrame);
+            }
             deferred.resolve();
         }
         return deferred.promise();
@@ -491,18 +495,20 @@ define(function (require, exports, module) {
         // Check if the poped frame is the current active frame or doesn't have any valid marker information
         // if true, jump again
         while (navFrame === currentEditNavFrame
-        ||(navFrame && navFrame.filePath === currentEditNavFrame.filePath
+        ||(navFrame && currentEditNavFrame && navFrame.filePath === currentEditNavFrame.filePath
             && _isSimilarSelection(navFrame.selections ,currentEditNavFrame.selections)
             && _isSimilarBookmarks(navFrame.bookMarkIds, currentEditNavFrame.bookMarkIds))
-        ||(skipCurrentFile && navFrame && navFrame.filePath === currentEditNavFrame.filePath)) {
+        ||(skipCurrentFile && navFrame && currentEditNavFrame && navFrame.filePath === currentEditNavFrame.filePath)) {
             navFrame = jumpForwardStack.pop();
         }
 
         if(navFrame){
             // We will check for the file existence now, if it doesn't exist we will jump back again
             // but discard the popped frame as invalid.
             _validateFrame(navFrame).done(function () {
-                jumpBackwardStack.push(currentEditNavFrame);
+                if(currentEditNavFrame){
+                    jumpBackwardStack.push(currentEditNavFrame);
+                }
                 navFrame.goTo();
             }).fail(function () {
                 _validateNavigationCmds();
@@ -666,7 +672,9 @@ define(function (require, exports, module) {
             // make sure that we don't push in duplicates
             jumpBackwardStack.push(lastBack);
         }
-        jumpBackwardStack.push(currentEditNavFrame);
+        if(currentEditNavFrame) {
+            jumpBackwardStack.push(currentEditNavFrame);
+        }
         jumpForwardStack = [];
         _validateNavigationCmds();
     }

test/spec/Extn-NavigationAndHistory-integ-test.js

@@ -358,5 +358,17 @@ define(function (require, exports, module) {
             await navigateResetStack();
             await _validateNavForFiles("test.css", "img/grabber_color-well.png", "test.js");
         }, 15000);
+
+        it("Should navigate back and forward even after all files closed", async function () {
+            await navigateResetStack();
+            await _validateNavForFiles("test.css", "test.html", "test.js");
+
+            await awaitsForDone(CommandManager.execute(Commands.FILE_CLOSE_ALL, { _forceClose: true }),
+                "closing all files");
+            await _expectNavButton(false, true, "nav back only enabled");
+            await navigateBack();
+            await _validateActiveFile("test.js");
+            await _expectNavButton(false, true, "nav back only enabled");
+        }, 15000);
     });
 });