Enable IntelliSense prediction by default (#3351)

PowerShell · Jun 22, 2022 · 2ef36fb · 2ef36fb
1 parent 60a48d6
commit 2ef36fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/PSReadLine/Cmdlets.cs b/PSReadLine/Cmdlets.cs
@@ -165,7 +165,7 @@ public class PSConsoleReadLineOptions
         /// </summary>
         public const int DefaultAnsiEscapeTimeout = 100;
 
-        public PSConsoleReadLineOptions(string hostName)
+        public PSConsoleReadLineOptions(string hostName, bool usingLegacyConsole)
         {
             ResetColors();
             EditMode = DefaultEditMode;
@@ -185,7 +185,11 @@ public PSConsoleReadLineOptions(string hostName)
             HistorySearchCaseSensitive = DefaultHistorySearchCaseSensitive;
             HistorySaveStyle = DefaultHistorySaveStyle;
             AnsiEscapeTimeout = DefaultAnsiEscapeTimeout;
-            PredictionSource = DefaultPredictionSource;
+            PredictionSource = usingLegacyConsole
+                ? PredictionSource.None
+                : Environment.Version.Major < 6
+                    ? PredictionSource.History
+                    : PredictionSource.HistoryAndPlugin;
             PredictionViewStyle = DefaultPredictionViewStyle;
             MaximumHistoryCount = 0;
 

diff --git a/PSReadLine/KeyBindings.cs b/PSReadLine/KeyBindings.cs
@@ -230,6 +230,8 @@ void SetDefaultWindowsBindings()
                 { Keys.AltMinus,               MakeKeyHandler(DigitArgument,             "DigitArgument") },
                 { Keys.AltQuestion,            MakeKeyHandler(WhatIsKey,                 "WhatIsKey") },
                 { Keys.AltA,                   MakeKeyHandler(SelectCommandArgument,     "SelectCommandArgument") },
+                { Keys.AltH,                   MakeKeyHandler(ShowParameterHelp,         "ShowParameterHelp") },
+                { Keys.F1,                     MakeKeyHandler(ShowCommandHelp,           "ShowCommandHelp") },
                 { Keys.F2,                     MakeKeyHandler(SwitchPredictionView,      "SwitchPredictionView") },
                 { Keys.F3,                     MakeKeyHandler(CharacterSearch,           "CharacterSearch") },
                 { Keys.ShiftF3,                MakeKeyHandler(CharacterSearchBackward,   "CharacterSearchBackward") },
@@ -239,8 +241,6 @@ void SetDefaultWindowsBindings()
                 { Keys.AltD,                   MakeKeyHandler(KillWord,                  "KillWord") },
                 { Keys.CtrlAt,                 MakeKeyHandler(MenuComplete,              "MenuComplete") },
                 { Keys.CtrlW,                  MakeKeyHandler(BackwardKillWord,          "BackwardKillWord") },
-                { Keys.AltH,                   MakeKeyHandler(ShowParameterHelp,         "ShowParameterHelp") },
-                { Keys.F1,                     MakeKeyHandler(ShowCommandHelp,           "ShowCommandHelp") },
             };
 
             // Some bindings are not available on certain platforms
@@ -338,6 +338,7 @@ void SetDefaultEmacsBindings()
                 { Keys.AltA,                   MakeKeyHandler(SelectCommandArgument,     "SelectCommandArgument") },
                 { Keys.AltH,                   MakeKeyHandler(ShowParameterHelp,         "ShowParameterHelp") },
                 { Keys.F1,                     MakeKeyHandler(ShowCommandHelp,           "ShowCommandHelp") },
+                { Keys.F2,                     MakeKeyHandler(SwitchPredictionView,      "SwitchPredictionView") },
             };
 
             // Some bindings are not available on certain platforms

diff --git a/PSReadLine/ReadLine.cs b/PSReadLine/ReadLine.cs
@@ -686,7 +686,9 @@ private PSConsoleReadLine()
             {
                 hostName = PSReadLine;
             }
-            _options = new PSConsoleReadLineOptions(hostName);
+
+            bool usingLegacyConsole = _console is PlatformWindows.LegacyWin32Console;
+            _options = new PSConsoleReadLineOptions(hostName, usingLegacyConsole);
             _prediction = new Prediction(this);
             SetDefaultBindings(_options.EditMode);
         }