Clear the saved current line in a more general way

Author: daxian-dbw

PSReadLine/BasicEditing.cs

@@ -74,12 +74,6 @@ public static void RevertLine(ConsoleKeyInfo? key = null, object arg = null)
                 _singleton._edits[_singleton._undoEditIndex - 1].Undo();
                 _singleton._undoEditIndex--;
             }
-
-            // It's possible we just finished a history search, which saved the line when the search was triggered
-            // so that another search with the reversed order can go back to the same line.
-            // Now that we are reverting the real current line, the saved current line should be cleared since we
-            // will no longer go back to it.
-            _singleton.ClearSavedCurrentLine();
             _singleton.Render();
         }
 

PSReadLine/History.cs

@@ -95,6 +95,7 @@ public class HistoryItem
         private int _getNextHistoryIndex;
         private int _searchHistoryCommandCount;
         private int _recallHistoryCommandCount;
+        private int _allHistoryCommandCount;
         private string _searchHistoryPrefix;
         // When cycling through history, the current line (not yet added to history)
         // is saved here so it can be restored.
@@ -510,6 +511,7 @@ private void SaveCurrentLine()
             // to check if we need to load history from another sessions now.
             MaybeReadHistoryFile();
 
+            _allHistoryCommandCount += 1;
             if (_savedCurrentLine.CommandLine == null)
             {
                 _savedCurrentLine.CommandLine = _buffer.ToString();
@@ -686,6 +688,12 @@ public static void BeginningOfHistory(ConsoleKeyInfo? key = null, object arg = n
         /// Move to the last item (the current input) in the history.
         /// </summary>
         public static void EndOfHistory(ConsoleKeyInfo? key = null, object arg = null)
+        {
+            _singleton.SaveCurrentLine();
+            GoToEndOfHistory();
+        }
+
+        private static void GoToEndOfHistory()
         {
             _singleton._currentHistoryIndex = _singleton._history.Count;
             _singleton.UpdateFromHistory(HistoryMoveCursor.ToEnd);
@@ -844,7 +852,7 @@ private void InteractiveHistorySearchLoop(int direction)
                 else if (function == Abort)
                 {
                     // Abort search
-                    EndOfHistory();
+                    GoToEndOfHistory();
                     break;
                 }
                 else

PSReadLine/ReadLine.cs

@@ -474,6 +474,7 @@ private string InputLoop()
                 var tabCommandCount = _tabCommandCount;
                 var searchHistoryCommandCount = _searchHistoryCommandCount;
                 var recallHistoryCommandCount = _recallHistoryCommandCount;
+                var allHistoryCommandCount = _allHistoryCommandCount;
                 var yankLastArgCommandCount = _yankLastArgCommandCount;
                 var visualSelectionCommandCount = _visualSelectionCommandCount;
                 var moveToLineCommandCount = _moveToLineCommandCount;
@@ -515,18 +516,22 @@ private string InputLoop()
                         _emphasisStart = -1;
                         _emphasisLength = 0;
                         Render();
-                        _currentHistoryIndex = _history.Count;
                     }
                     _searchHistoryCommandCount = 0;
                     _searchHistoryPrefix = null;
                 }
                 if (recallHistoryCommandCount == _recallHistoryCommandCount)
                 {
-                    if (_recallHistoryCommandCount > 0)
+                    _recallHistoryCommandCount = 0;
+                }
+                if (allHistoryCommandCount == _allHistoryCommandCount)
+                {
+                    if (_allHistoryCommandCount > 0)
                     {
+                        ClearSavedCurrentLine();
                         _currentHistoryIndex = _history.Count;
                     }
-                    _recallHistoryCommandCount = 0;
+                    _allHistoryCommandCount = 0;
                 }
                 if (searchHistoryCommandCount == _searchHistoryCommandCount &&
                     recallHistoryCommandCount == _recallHistoryCommandCount)

test/HistoryTest.cs

@@ -428,6 +428,37 @@ public void HistorySearchCurrentLine()
             Test("", Keys("ec", _.UpArrow, _.DownArrow, _.Escape, "echo ", _.UpArrow, _.DownArrow, _.Escape));
         }
 
+        [SkippableFact]
+        public void HistorySavedCurrentLine()
+        {
+            TestSetup(KeyMode.Cmd,
+                      new KeyHandler("F3", PSConsoleReadLine.BeginningOfHistory),
+                      new KeyHandler("Shift+F3", PSConsoleReadLine.EndOfHistory));
+
+            SetHistory("echo foo", "echo bar");
+            Test("echo bar", Keys("ec", _.UpArrow));
+            Test("echo foo", Keys("ec", _.UpArrow, _.F3));
+            Test("echo bar", Keys("ec", _.UpArrow, _.F3, _.DownArrow));
+            Test("ec", Keys("ec", _.UpArrow, _.F3, _.Shift_F3));
+            Test("ec", Keys("ec", _.UpArrow, _.F3, _.DownArrow, _.DownArrow));
+
+            Test("echo foo", Keys("e", _.UpArrow, _.UpArrow));
+            Test("e", Keys("e", _.UpArrow, _.UpArrow, _.Shift_F3));
+
+            Test("echo bar", Keys("ech", _.F8));
+            Test("echo foo", Keys("ech", _.F8, _.F3));
+            Test("echo bar", Keys("ech", _.F8, _.F3, _.DownArrow));
+            Test("ech", Keys("ech", _.F8, _.F3, _.DownArrow, _.DownArrow));
+            Test("ech", Keys("ech", _.F8, _.F8, _.Shift_F3));
+
+            SetHistory("echo foo", "echo f");
+            Test("echo f", Keys("ec", _.UpArrow));
+            Test("echo foo", Keys("ec", _.UpArrow, _.F8));
+            Test("echo f", Keys("ec", _.UpArrow, _.F8, _.Shift_F8));
+            Test("ec", Keys("ec", _.UpArrow, _.F8, _.DownArrow, _.DownArrow));
+            Test("ec", Keys("ec", _.UpArrow, _.F8, _.Shift_F8, _.Shift_F3));
+        }
+
         [SkippableFact]
         public void SearchHistory()
         {