Do not show suggestion for history commands; also remove extra suggestion text when accepting the line

Author: daxian-dbw

PSReadLine/BasicEditing.cs

@@ -208,6 +208,8 @@ public static void DeleteCharOrExit(ConsoleKeyInfo? key = null, object arg = nul
 
         private bool AcceptLineImpl(bool validate)
         {
+            using var _ = ChangeSuggestionMode(showSuggestion: false);
+
             ParseInput();
             if (_parseErrors.Any(e => e.IncompleteInput))
             {
@@ -268,6 +270,12 @@ private bool AcceptLineImpl(bool validate)
 
             // Let public API set cursor to end of line incase end of line is end of buffer
             SetCursorPosition(_current);
+            if (_suggestionText != null)
+            {
+                _suggestionText = null;
+                _console.BlankRestOfLine();
+            }
+
             _console.Write("\n");
             _inputAccepted = true;
             return true;

PSReadLine/History.cs

@@ -502,6 +502,8 @@ private void UpdateFromHistory(HistoryMoveCursor moveCursor)
                     }
                     break;
             }
+
+            using var _ = ChangeSuggestionMode(showSuggestion: false);
             Render();
         }
 

PSReadLine/PSReadLine.csproj

@@ -9,6 +9,7 @@
     <InformationalVersion>2.0.1</InformationalVersion>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">

PSReadLine/Render.cs

@@ -110,7 +110,7 @@ private string GetSuggestion(string text)
                 _lastRenderedTextHash = FNV1a32Hash.ComputeHash(text);
                 if (textHash != _lastRenderedTextHash)
                 {
-                    _suggestionText = Pseudo.DummySuggestion.GetCommandLineSuggestion(text);
+                    _suggestionText = DummySuggestion.GetCommandLineSuggestion(text);
                 }
             }
             catch

PSReadLine/DummySuggestion.cs PSReadLine/Suggestion.csPSReadLine/DummySuggestion.cs renamed to PSReadLine/Suggestion.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Pseudo
+namespace Microsoft.PowerShell
 {
     internal class DummySuggestion
     {
@@ -11,6 +11,8 @@ static DummySuggestion()
         {
             s_suggestions = new List<string>()
             {
+                "ildasm",
+                "git",
                 "git branch -r",
                 "git checkout -b",
                 "git checkout master",
@@ -36,4 +38,28 @@ internal static string GetCommandLineSuggestion(string text)
             return null;
         }
     }
+
+    public partial class PSConsoleReadLine
+    {
+        private class SuggestionModeRestore : IDisposable
+        {
+            private bool oldSuggestionMode;
+
+            internal SuggestionModeRestore(bool showSuggestion)
+            {
+                oldSuggestionMode = _singleton._showSuggestion;
+                _singleton._showSuggestion = showSuggestion;
+            }
+
+            public void Dispose()
+            {
+                _singleton._showSuggestion = oldSuggestionMode;
+            }
+        }
+
+        private SuggestionModeRestore ChangeSuggestionMode(bool showSuggestion)
+        {
+            return new SuggestionModeRestore(showSuggestion);
+        }
+    }
 }