Ctrl-R support

Author: lzybkr

GenerateBuiltinList.ps1

@@ -24,13 +24,13 @@ function GenerateStrings
     process
     {
         $null = $buffer.Append($comma)
-        $count++
-        if (($count % 5) -eq 0)
+        if ($count -gt 0 -and ($count % 5) -eq 0)
         {
             # Remove the trailing space
             $null = $buffer.Remove($buffer.Length - 1, 1)
             $null = $buffer.Append("`n$indent$(' ' * $prefix.Length)")
         }
+        $count++
         $null = $buffer.Append('"')
         $null = $buffer.Append($Item)
         $null = $buffer.Append('"')

PSReadLine/Cmdlets.cs

@@ -16,6 +16,7 @@ public class PSConsoleReadlineOptions
         public const ConsoleColor DefaultTypeForegroundColor      = ConsoleColor.Gray;
         public const ConsoleColor DefaultNumberForegroundColor    = ConsoleColor.White;
         public const ConsoleColor DefaultMemberForegroundColor    = ConsoleColor.Gray;
+        public const ConsoleColor DefaultEmphasisForegroundColor  = ConsoleColor.Cyan;
 
         public const string DefaultContinuationPrompt = ">>> ";
 
@@ -133,6 +134,8 @@ public PSConsoleReadlineOptions()
         public ConsoleColor TypeBackgroundColor { get; set; }
         public ConsoleColor NumberBackgroundColor { get; set; }
         public ConsoleColor MemberBackgroundColor { get; set; }
+        public ConsoleColor EmphasisForegroundColor { get; set; }
+        public ConsoleColor EmphasisBackgroundColor { get; set; }
 
         internal void ResetColors()
         {
@@ -147,6 +150,7 @@ internal void ResetColors()
             TypeForegroundColor         = DefaultTypeForegroundColor;
             NumberForegroundColor       = DefaultNumberForegroundColor;
             MemberForegroundColor       = DefaultNumberForegroundColor;
+            EmphasisForegroundColor     = DefaultEmphasisForegroundColor;
             DefaultTokenBackgroundColor = Console.BackgroundColor;
             CommentBackgroundColor      = Console.BackgroundColor;
             KeywordBackgroundColor      = Console.BackgroundColor;
@@ -158,6 +162,7 @@ internal void ResetColors()
             TypeBackgroundColor         = Console.BackgroundColor;
             NumberBackgroundColor       = Console.BackgroundColor;
             MemberBackgroundColor       = Console.BackgroundColor;
+            EmphasisBackgroundColor     = Console.BackgroundColor;
         }
 
         internal void SetForegroundColor(TokenClassification tokenKind, ConsoleColor color)
@@ -239,6 +244,22 @@ public ConsoleColor ContinuationPromptBackgroundColor
         }
         internal ConsoleColor? _continuationPromptBackgroundColor;
 
+        [Parameter(ParameterSetName = "OptionsSet")]
+        public ConsoleColor EmphasisForegroundColor
+        {
+            get { return _emphasisForegroundColor.GetValueOrDefault(); }
+            set { _emphasisForegroundColor = value; }
+        }
+        internal ConsoleColor? _emphasisForegroundColor;
+
+        [Parameter(ParameterSetName = "OptionsSet")]
+        public ConsoleColor EmphasisBackgroundColor
+        {
+            get { return _emphasisBackgroundColor.GetValueOrDefault(); }
+            set { _emphasisBackgroundColor = value; }
+        }
+        internal ConsoleColor? _emphasisBackgroundColor;
+
         [Parameter(ParameterSetName = "OptionsSet")]
         public SwitchParameter HistoryNoDuplicates
         {
@@ -391,15 +412,15 @@ public class SetKeyHandlerCommand : PSCmdlet
         public string LongDescription { get; set; }
 
         // ValidateSet attribute is generated by the script GenerateBuiltinList
-        [ValidateSet("AcceptLine", "AddLine", "BackwardChar", "BackwardDeleteChar",
+        [ValidateSet("Abort", "AcceptLine", "AddLine", "BackwardChar", "BackwardDeleteChar",
                      "BackwardDeleteLine", "BackwardKillLine", "BackwardWord", "BeginningOfHistory", "BeginningOfLine",
-                     "CancelLine", "Complete", "DeleteChar", "DisableDemoMode", "EmacsBackwardWord",
-                     "EmacsForwardWord", "EnableDemoMode", "EndOfHistory", "EndOfLine", "ExchangePointAndMark",
-                     "ForwardChar", "ForwardDeleteLine", "ForwardWord", "GotoBrace", "HistorySearchBackward",
-                     "HistorySearchForward", "KillBackwardWord", "KillLine", "KillWord", "NextHistory",
-                     "Paste", "PossibleCompletions", "PreviousHistory", "Redo", "RevertLine",
-                     "SetKeyHandler", "SetMark", "TabCompleteNext", "TabCompletePrevious", "Undo",
-                     "Yank", "YankPop")]
+                     "CancelLine", "ClearScreen", "Complete", "DeleteChar", "DisableDemoMode",
+                     "EmacsBackwardWord", "EmacsForwardWord", "EnableDemoMode", "EndOfHistory", "EndOfLine",
+                     "ExchangePointAndMark", "ForwardChar", "ForwardDeleteLine", "ForwardSearchHistory", "ForwardWord",
+                     "GotoBrace", "HistorySearchBackward", "HistorySearchForward", "KillBackwardWord", "KillLine",
+                     "KillWord", "NextHistory", "Paste", "PossibleCompletions", "PreviousHistory",
+                     "Redo", "ReverseSearchHistory", "RevertLine", "SetKeyHandler", "SetMark",
+                     "TabCompleteNext", "TabCompletePrevious", "Undo", "Yank", "YankPop")]
         [Parameter(Position = 1, Mandatory = true, ParameterSetName = "Function")]
         public string Function { get; set; }
 

PSReadLine/ConsoleLib.cs

@@ -19,6 +19,7 @@ public static class NativeMethods
         public const uint MENU_IS_INACTIVE  = 0x00; // windows key
 
         public const uint ENABLE_PROCESSED_INPUT = 0x0001;
+        public const uint ENABLE_LINE_INPUT      = 0x0002;
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         public static extern IntPtr GetStdHandle(uint handleId);

PSReadLine/PSReadLineResources.Designer.cs

@@ -258,4 +258,13 @@
   <data name="GotoBraceDescription" xml:space="preserve">
     <value>Go to matching brace</value>
   </data>
+  <data name="AbortDescription" xml:space="preserve">
+    <value>Abort the current operation, e.g. incremental history search</value>
+  </data>
+  <data name="ForwardSearchHistoryDescription" xml:space="preserve">
+    <value>Search history forward interactively</value>
+  </data>
+  <data name="ReverseSearchHistoryDescription" xml:space="preserve">
+    <value>Search history backwards interactively</value>
+  </data>
 </root>