Basic handling of status line prompt in screen reader mode

It does not handle added text like in incremental history search, but it does display correctly.

Author: andyleejordan

PSReadLine/Render.cs

@@ -286,7 +286,18 @@ static int FindCommonPrefixLength(string leftStr, string rightStr)
 
             // For screen readers, we are just comparing the previous and current buffer text
             // (without colors) and only writing the differences.
-            string currentBuffer = ParseInput();
+            string parsedInput = ParseInput();
+            StringBuilder buffer = new(parsedInput);
+
+            // Really simple handling of a status line: append it!
+            if (!string.IsNullOrEmpty(_statusLinePrompt))
+            {
+                buffer.Append("\n");
+                buffer.Append(_statusLinePrompt);
+                buffer.Append(_statusBuffer);
+            }
+
+            string currentBuffer = buffer.ToString();
             string previousBuffer = _previousRender.lines[0].Line;
 
             // In case the buffer was resized.
@@ -310,7 +321,7 @@ static int FindCommonPrefixLength(string leftStr, string rightStr)
             {
                 // 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);
+                var diffPoint = ConvertOffsetToPoint(commonPrefixLength, buffer);
                 _console.SetCursorPosition(diffPoint.X, diffPoint.Y);
                 var changedData = currentBuffer.Substring(commonPrefixLength);
                 _console.Write("\x1b[0J");
@@ -325,7 +336,7 @@ static int FindCommonPrefixLength(string leftStr, string rightStr)
             }
 
             // If we had to wrap to render everything, update _initialY
-            var endPoint = ConvertOffsetToPoint(currentBuffer.Length);
+            var endPoint = ConvertOffsetToPoint(currentBuffer.Length, buffer);
             if (endPoint.Y >= bufferHeight)
             {
 
@@ -349,7 +360,7 @@ static int FindCommonPrefixLength(string leftStr, string rightStr)
             _previousRender = renderData;
 
             // Calculate the coord to place the cursor for the next input.
-            var point = ConvertOffsetToPoint(_current);
+            var point = ConvertOffsetToPoint(_current, buffer);
 
             if (point.Y == bufferHeight)
             {
@@ -1327,8 +1338,12 @@ internal Point EndOfBufferPosition()
             return ConvertOffsetToPoint(_buffer.Length);
         }
 
-        internal Point ConvertOffsetToPoint(int offset)
+        internal Point ConvertOffsetToPoint(int offset, StringBuilder buffer = null)
         {
+            // This lets us re-use the logic in the screen reader rendering implementation
+            // where the status line is added to the buffer without modifying the locabl state.
+            buffer ??= _buffer;
+
             int x = _initialX;
             int y = _initialY;
 
@@ -1337,7 +1352,7 @@ internal Point ConvertOffsetToPoint(int offset)
 
             for (int i = 0; i < offset; i++)
             {
-                char c = _buffer[i];
+                char c = buffer[i];
                 if (c == '\n')
                 {
                     y += 1;
@@ -1355,7 +1370,7 @@ internal Point ConvertOffsetToPoint(int offset)
 
                         // If cursor is at column 0 and the next character is newline, let the next loop
                         // iteration increment y.
-                        if (x != 0 || !(i + 1 < offset && _buffer[i + 1] == '\n'))
+                        if (x != 0 || !(i + 1 < offset && buffer[i + 1] == '\n'))
                         {
                             y += 1;
                         }
@@ -1364,9 +1379,9 @@ internal Point ConvertOffsetToPoint(int offset)
             }
 
             // If next character actually exists, and isn't newline, check if wider than the space left on the current line.
-            if (_buffer.Length > offset && _buffer[offset] != '\n')
+            if (buffer.Length > offset && buffer[offset] != '\n')
             {
-                int size = LengthInBufferCells(_buffer[offset]);
+                int size = LengthInBufferCells(buffer[offset]);
                 if (x + size > bufferWidth)
                 {
                     // Character was wider than remaining space, so character, and cursor, appear on next line.

test/DigitArgumentTest.cs

@@ -46,8 +46,6 @@ public void DigitArgumentValues()
         [SkippableFact]
         public void DigitArgumentPrompt()
         {
-            Skip.If(ScreenReaderModeEnabled, "Digit argument prompt is not supported in screen reader mode.");
-
             TestSetup(KeyMode.Emacs);
 
             Test("", Keys(

test/HistoryTest.VI.cs

@@ -53,8 +53,6 @@ public void ViHistory()
         [SkippableFact]
         public void ViSearchHistory()
         {
-            Skip.If(ScreenReaderModeEnabled, "Incremental search prompt is not supported in screen reader mode.");
-
             TestSetup(KeyMode.Vi);
 
             // Clear history in case the above added some history (but it shouldn't)

test/HistoryTest.cs

@@ -882,8 +882,6 @@ public void EndOfHistory()
         [SkippableFact]
         public void InteractiveHistorySearch()
         {
-            Skip.If(ScreenReaderModeEnabled, "Incremental search prompt is not supported in screen reader mode.");
-
             TestSetup(KeyMode.Emacs);
 
             SetHistory("echo aaa");

test/KeyBindingsTest.cs

@@ -9,8 +9,6 @@ public partial class ReadLine
         [SkippableFact]
         public void WhatIsKey()
         {
-            Skip.If(ScreenReaderModeEnabled, "The what-is-key prompt is not supported in screen reader mode.");
-
             TestSetup(KeyMode.Cmd);
 
             Test("", Keys(