Update the basic UI

Author: daxian-dbw

PSReadLine/BasicEditing.cs

@@ -37,27 +37,18 @@ public static void SelfInsert(ConsoleKeyInfo? key = null, object arg = null)
                 count = 1;
             }
 
-            try
+            if (_singleton._visualSelectionCommandCount > 0)
             {
-                _singleton._showSuggestion = true;
-
-                if (_singleton._visualSelectionCommandCount > 0)
-                {
-                    _singleton.GetRegion(out var start, out var length);
-                    Replace(start, length, new string(keyChar, count));
-                }
-                else if (count > 1)
-                {
-                    Insert(new string(keyChar, count));
-                }
-                else
-                {
-                    Insert(keyChar);
-                }
+                _singleton.GetRegion(out var start, out var length);
+                Replace(start, length, new string(keyChar, count));
             }
-            finally
+            else if (count > 1)
+            {
+                Insert(new string(keyChar, count));
+            }
+            else
             {
-                _singleton._showSuggestion = false;
+                Insert(keyChar);
             }
         }
 

PSReadLine/PublicAPI.cs

@@ -235,5 +235,13 @@ public static bool TryGetArgAsInt(object arg, out int numericArg, int defaultNum
             numericArg = 0;
             return false;
         }
+
+        public static void AcceptSuggestion()
+        {
+            if (_singleton._suggestionText != null)
+            {
+
+            }
+        }
     }
 }

PSReadLine/ReadLine.cs

@@ -63,8 +63,6 @@ public partial class PSConsoleReadLine : IPSConsoleReadLineMockableMethods
 
         private readonly StringBuilder _buffer;
         private readonly StringBuilder _statusBuffer;
-        private string _suggestionText;
-        private bool _showSuggestion;
         private bool _statusIsErrorMessage;
         private string _statusLinePrompt;
         private List<EditItem> _edits;

PSReadLine/Render.cs

@@ -69,6 +69,10 @@ class RenderData
         private int _emphasisStart;
         private int _emphasisLength;
 
+        private string _suggestionText;
+        private uint _lastRenderedTextHash;
+        private bool _showSuggestion = true;
+
         private class SavedTokenState
         {
             internal Token[] Tokens { get; set; }
@@ -93,24 +97,26 @@ private string ParseInput()
 
         private string GetSuggestion(string text)
         {
-            if (!_showSuggestion || LineIsMultiLine())
+            if (!_showSuggestion || LineIsMultiLine() || string.IsNullOrWhiteSpace(text))
             {
-                _suggestionText = null;
+                return null;
             }
-            else
-            {
-                bool reuseSuggestionBuffer =
-                    _suggestionText != null &&
-                    _suggestionText.Length >= text.Length &&
-                    _suggestionText.StartsWith(text, StringComparison.OrdinalIgnoreCase);
 
-                if (!reuseSuggestionBuffer)
+            try
+            {
+                uint textHash = _lastRenderedTextHash;
+                _lastRenderedTextHash = FNV1a32Hash.ComputeHash(text);
+                if (textHash != _lastRenderedTextHash)
                 {
                     _suggestionText = Pseudo.DummySuggestion.GetCommandLineSuggestion(text);
                 }
             }
+            catch
+            {
+                _suggestionText = null;
+            }
 
-            return _suggestionText == null ? null : _suggestionText.Substring(text.Length);
+            return _suggestionText?.Substring(text.Length);
         }
 
         private void ClearStatusMessage(bool render)
@@ -362,6 +368,7 @@ void MaybeEmphasize(int i, string currColor)
                 _consoleBufferLines[currentLogicalLine].Append("\x1b[0m");
             }
 
+            inSelectedRegion = false;
             if (suggestion != null)
             {
                 // TODO: write suggestion out in dark black by default, but it needs to be configurable.