Handle history with safe render

Author: andyleejordan

PSReadLine/History.cs

@@ -846,6 +846,8 @@ private void UpdateFromHistory(HistoryMoveCursor moveCursor)
             }
             _buffer.Clear();
             _buffer.Append(line);
+            // Deletes the whole line (from start of line)
+            SafeRender("\x1b[K", 0);
 
             switch (moveCursor)
             {
@@ -864,7 +866,8 @@ private void UpdateFromHistory(HistoryMoveCursor moveCursor)
             }
 
             using var _ = _prediction.DisableScoped();
-            Render();
+            // Renders the line and re-adjusts the cursor to account for the above options
+            SafeRender(line, cursorBefore: null, cursorAfter: _current);
         }
 
         private void SaveCurrentLine()

PSReadLine/Render.cs

@@ -218,7 +218,7 @@ private void RenderWithPredictionQueryPaused()
             Render();
         }
 
-        private void SafeRender(string s, int? cursor = null)
+        private void SafeRender(string s, int? cursorBefore = null, int? cursorAfter = null)
         {
             // Render as usual if we're not supporting a screen reader
             if (!_singleton.Options.ScreenReader)
@@ -227,13 +227,17 @@ private void SafeRender(string s, int? cursor = null)
                 return;
             }
 
-            // Move the cursor if we have to
-            if (cursor.HasValue)
-                MoveCursor(cursor.Value);
+            // Many commands will need the cursor set before writing
+            if (cursorBefore.HasValue)
+                MoveCursor(cursorBefore.Value);
 
             // Directly write without re-rendering
             // This means using ANSI escapes for movement
             _console.Write(s);
+
+            // Some commands adjust the cursor after writing
+            if (cursorAfter.HasValue)
+                MoveCursor(cursorAfter.Value);
         }
 
         private void Render()