Implement SafeRender() for use under a screen reader

Author: andyleejordan

PSReadLine/BasicEditing.cs

@@ -86,7 +86,7 @@ public static void CancelLine(ConsoleKeyInfo? key = null, object arg = null)
             _singleton._current = _singleton._buffer.Length;
 
             using var _ = _singleton._prediction.DisableScoped();
-            _singleton.ForceRender();
+            _singleton.Render(force: true);
 
             _singleton._console.Write("\x1b[91m^C\x1b[0m");
 
@@ -335,7 +335,7 @@ private bool AcceptLineImpl(bool validate)
 
             if (renderNeeded)
             {
-                ForceRender();
+                Render(force: true);
             }
 
             // Only run validation if we haven't before.  If we have and status line shows an error,

PSReadLine/Options.cs

@@ -189,10 +189,12 @@ private void SetOptionsInternal(SetPSReadLineOption options)
             {
                 Options.ScreenReader = options.ScreenReader;
 
-                // Disable prediction for better accessibility
                 if (Options.ScreenReader)
                 {
+                    // Disable prediction for better accessibility.
                     Options.PredictionSource = PredictionSource.None;
+                    // Disable continuation prompt as multi-line is not available.
+                    Options.ContinuationPrompt = "";
                 }
             }
         }

PSReadLine/Render.Helper.cs

@@ -96,6 +96,7 @@ internal static int LengthInBufferCells(char c)
             if (c < 256)
             {
                 // We render ^C for Ctrl+C, so return 2 for control characters
+                // TODO: Do we care about this under a screen reader?
                 return Char.IsControl(c) ? 2 : 1;
             }
 

PSReadLine/Render.cs

@@ -218,11 +218,11 @@ private void RenderWithPredictionQueryPaused()
             Render();
         }
 
-        private void Render()
+        private void Render(bool force = false)
         {
             // If there are a bunch of keys queued up, skip rendering if we've rendered very recently.
             long elapsedMs = _lastRenderTime.ElapsedMilliseconds;
-            if (_queuedKeys.Count > 10 && elapsedMs < 50)
+            if (!force && _queuedKeys.Count > 10 && elapsedMs < 50)
             {
                 // We won't render, but most likely the tokens will be different, so make
                 // sure we don't use old tokens, also allow garbage to get collected.
@@ -242,12 +242,123 @@ private void Render()
             // See the following 2 GitHub issues for more context:
             //  - https://github.com/PowerShell/PSReadLine/issues/3879#issuecomment-2573996070
             //  - https://github.com/PowerShell/PowerShell/issues/24696
-            if (elapsedMs < 50)
+            if (!force && elapsedMs < 50)
             {
                 _handlePotentialResizing = false;
             }
 
-            ForceRender();
+            // Use simplified rendering for screen readers
+            if (Options.ScreenReader)
+            {
+                SafeRender();
+            }
+            else
+            {
+                ForceRender();
+            }
+        }
+        
+        private void SafeRender()
+        {
+            int bufferWidth = _console.BufferWidth;
+            int bufferHeight = _console.BufferHeight;
+
+            static int FindCommonPrefixLength(string leftStr, string rightStr)
+            {
+                if (string.IsNullOrEmpty(leftStr) || string.IsNullOrEmpty(rightStr))
+                {
+                    return 0;
+                }
+
+                int i = 0;
+                int minLength = Math.Min(leftStr.Length, rightStr.Length);
+
+                while (i < minLength && leftStr[i] == rightStr[i])
+                {
+                    i++;
+                }
+
+                return i;
+            }
+
+            // For screen readers, we are just comparing the previous and current buffer text
+            // (without colors) and only writing the differences.
+            string currentBuffer = ParseInput();
+            string previousBuffer = _previousRender.lines[0].Line;
+
+            // In case the buffer was resized.
+            RecomputeInitialCoords(isTextBufferUnchanged: false);
+
+            // Make cursor invisible while we're rendering.
+            _console.CursorVisible = false;
+
+            // Calculate what to render and where to start the rendering.
+            // TODO: Short circuit optimization when currentBuffer == previousBuffer.
+            int commonPrefixLength = FindCommonPrefixLength(previousBuffer, currentBuffer);
+
+            if (commonPrefixLength > 0 && commonPrefixLength == previousBuffer.Length)
+            {
+                // Previous buffer is a complete prefix of current buffer.
+                // Just append the new data.
+                var appendedData = currentBuffer.Substring(commonPrefixLength);
+                _console.Write(appendedData);
+            }
+            else if (commonPrefixLength > 0)
+            {
+                // Buffers share a common prefix but previous buffer has additional content.
+                // Move cursor to where the difference starts, clear forward, and write the data.
+                var diffPoint = ConvertOffsetToPoint(commonPrefixLength);
+                _console.SetCursorPosition(diffPoint.X, diffPoint.Y);
+                var changedData = currentBuffer.Substring(commonPrefixLength);
+                _console.Write("\x1b[0J");
+                _console.Write(changedData);
+            }
+            else
+            {
+                // No common prefix, rewrite entire buffer.
+                _console.SetCursorPosition(_initialX, _initialY);
+                _console.Write("\x1b[0J");
+                _console.Write(currentBuffer);
+            }
+
+            // If we had to wrap to render everything, update _initialY
+            var endPoint = ConvertOffsetToPoint(currentBuffer.Length);
+            int physicalLine = endPoint.Y - _initialY;
+            if (_initialY + physicalLine > bufferHeight)
+            {
+                // We had to scroll to render everything, update _initialY.
+                _initialY = bufferHeight - physicalLine;
+            }
+
+            // Preserve the current render data.
+            var renderData = new RenderData
+            {
+                lines = new RenderedLineData[] { new(currentBuffer, isFirstLogicalLine: true) },
+                errorPrompt = (_parseErrors != null && _parseErrors.Length > 0) // Not yet used.
+            };
+            _previousRender = renderData;
+
+            // Calculate the coord to place the cursor for the next input.
+            var point = ConvertOffsetToPoint(_current);
+            if (point.X == 0 && point.Y == bufferHeight)
+            {
+                // The cursor top exceeds the buffer height and it hasn't already wrapped,
+                // so we need to scroll up the buffer by 1 line.
+                _console.Write("\n");
+
+                // Adjust the initial cursor position and the to-be-set cursor position
+                // after scrolling up the buffer.
+                _initialY -= 1;
+                point.Y -= 1;
+            }
+            _console.SetCursorPosition(point.X, point.Y);
+            _console.CursorVisible = true;
+
+            _previousRender.UpdateConsoleInfo(bufferWidth, bufferHeight, point.X, point.Y);
+            _previousRender.initialY = _initialY;
+
+            _lastRenderTime.Restart();
+            _waitingToRender = false;
         }
 
         private void ForceRender()
@@ -261,7 +372,7 @@ private void ForceRender()
             // and minimize writing more than necessary on the next render.)
 
             var renderLines = new RenderedLineData[logicalLineCount];
-            var renderData = new RenderData {lines = renderLines};
+            var renderData = new RenderData { lines = renderLines };
             for (var i = 0; i < logicalLineCount; i++)
             {
                 var line = _consoleBufferLines[i].ToString();
@@ -910,7 +1021,6 @@ void UpdateColorsIfNecessary(string newColor)
 
             // Calculate the coord to place the cursor for the next input.
             var point = ConvertOffsetToPoint(_current);
-
             if (point.Y == bufferHeight)
             {
                 // The cursor top exceeds the buffer height, so we need to
@@ -946,7 +1056,6 @@ void UpdateColorsIfNecessary(string newColor)
                 _current = ConvertLineAndColumnToOffset(point);
                 point = ConvertOffsetToPoint(_current);
             }
-
             _console.SetCursorPosition(point.X, point.Y);
             _console.CursorVisible = true;
 
@@ -1827,6 +1936,6 @@ public static void ScrollDisplayToCursor(ConsoleKeyInfo? key = null, object arg
                 newTop = (console.BufferHeight - console.WindowHeight);
             }
             console.SetWindowPosition(0, newTop);
-        }
+        }        
     }
 }