Make PSReadLine more portable

.gitignore

@@ -123,3 +123,6 @@ ChocolateyPackage/PSReadLine/
 # gvim swap files
 *.swp
 *.swo
+
+# Visual Studio cache/options directory
+.vs/

PSReadLine/AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PSReadLine")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyCopyright("Copyright")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -36,8 +36,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0")]
 
 
 [assembly: SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]

PSReadLine/BasicEditing.cs

@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
+using Microsoft.PowerShell.PSReadLine;
 
 namespace Microsoft.PowerShell
 {
@@ -81,27 +82,10 @@ public static void CancelLine(ConsoleKeyInfo? key = null, object arg = null)
         {
             _singleton.ClearStatusMessage(false);
             _singleton._current = _singleton._buffer.Length;
-            // We want to display ^C to show the line was canceled.  Instead of appending ^C
-            // (or (char)3), we append 2 spaces so we don't affect tokenization too much, e.g.
-            // changing a keyword to a command.
-            _singleton._buffer.Append("  ");
-            _singleton.ReallyRender();
-
-            // Now that we've rendered with this extra spaces, go back and replace the spaces
-            // with ^C colored in red (so it stands out.)
-            var coordinates = _singleton.ConvertOffsetToCoordinates(_singleton._current);
-            var console = _singleton._console;
-            var consoleBuffer = _singleton._consoleBuffer;
-            int i = (coordinates.Y - _singleton._initialY) * console.BufferWidth + coordinates.X;
-            consoleBuffer[i].UnicodeChar = '^';
-            consoleBuffer[i].ForegroundColor = ConsoleColor.Red;
-            consoleBuffer[i].BackgroundColor = console.BackgroundColor;
-            consoleBuffer[i+1].UnicodeChar = 'C';
-            consoleBuffer[i+1].ForegroundColor = ConsoleColor.Red;
-            consoleBuffer[i+1].BackgroundColor = console.BackgroundColor;
-            console.WriteBufferLines(consoleBuffer, ref _singleton._initialY);
-
-            _singleton.PlaceCursor(0, coordinates.Y + 1);
+            _singleton.ForceRender();
+
+            _singleton._console.Write("\x1b[91m^C\x1b[0m");
+
             _singleton._buffer.Clear(); // Clear so we don't actually run the input
             _singleton._current = 0; // If Render is called, _current must be correct.
             _singleton._currentHistoryIndex = _singleton._history.Count;
@@ -248,7 +232,7 @@ private bool AcceptLineImpl(bool validate)
 
             if (renderNeeded)
             {
-                ReallyRender();
+                ForceRender();
             }
 
             // Only run validation if we haven't before.  If we have and status line shows an error,
@@ -283,8 +267,8 @@ private bool AcceptLineImpl(bool validate)
                 ClearStatusMessage(render: true);
             }
 
-            var coordinates = ConvertOffsetToCoordinates(_current);
-            PlaceCursor(0, coordinates.Y + 1);
+            var point = ConvertOffsetToPoint(_current);
+            PlaceCursor(0, point.Y + 1);
             _inputAccepted = true;
             return true;
         }
@@ -406,8 +390,8 @@ private bool UnresolvedCommandCouldSucceed(string commandName, Ast rootAst)
                 {
                 // The following are debugger commands that should be accepted if we're debugging
                 // because the console host will interpret these commands directly.
-                case 's': case 'v': case 'o': case 'c': case 'q': case'k': case 'l':
-                case 'S': case 'V': case 'O': case 'C': case 'Q': case'K': case 'L':
+                case 's': case 'v': case 'o': case 'c': case 'q': case 'k': case 'l':
+                case 'S': case 'V': case 'O': case 'C': case 'Q': case 'K': case 'L':
                 case '?': case 'h': case 'H':
                     // Ideally we would check $PSDebugContext, but it is set at function
                     // scope, and because we're in a module, we can't find that variable
@@ -482,7 +466,7 @@ public static void AddLine(ConsoleKeyInfo? key = null, object arg = null)
         /// </summary>
         public static void InsertLineAbove(ConsoleKeyInfo? key = null, object arg = null)
         {
-            // Move the current postion to the beginning of the current line and only the current line.
+            // Move the current position to the beginning of the current line and only the current line.
             if (_singleton.LineIsMultiLine())
             {
                 int i = Math.Max(0, _singleton._current - 1);
@@ -512,7 +496,7 @@ public static void InsertLineAbove(ConsoleKeyInfo? key = null, object arg = null
         /// </summary>
         public static void InsertLineBelow(ConsoleKeyInfo? key = null, object arg = null)
         {
-            // Move the current postion to the end of the current line and only the current line.
+            // Move the current position to the end of the current line and only the current line.
             if (_singleton.LineIsMultiLine())
             {
                 int i = _singleton._current;

PSReadLine/Changes.txt

@@ -1,14 +1,39 @@
-### Version 1.?
+### Version 2.0
 
-Bug fixes:
+New features:
+* Interactive filtering during menu complete.
+* Tooltips always on in MenuComplete (only displayed
+  if they give more information than the completion.)
+* Support for VT escape sequences to specify colors.
 
+Bug fixes:
 * DeleteChar no longer deletes any text left of the cursor in Windows/Emacs
   and matches vim behavior of working like <x> in command mode.
 * Fix InvokePrompt when the prompt is > 1 line.
 * Avoid reporting an error when stdin/stdout is redirected. There is still
   no support for redirected stdin/stdout though.
 * Fix YankToPercent off by 1 error.
 * Fix error reported when running in container.
+* Remove Ding from Backspace on an empty line
+* Fix occasional hang reading history file
+* Honor HistorySearchCursorMovesToEnd in Vi mode
+* Fix cursor placement with CJK characters
+* Fix key bindings with certain Windows keyboard layouts
+
+Breaking changes:
+* Requires PowerShell V5 or later and .Net 4.6.1
+* Building requires VS2017
+* Set-PSReadlineOption color parameters have changed
+  - Accept `object` instead of `ConsoleColor` to support accepting both
+    strings (VT escape sequences) and ConsoleColor
+  - Parameter names changed - no explicit Foreground/Background options anymore,
+    but aliases introduced so `-ForegroundColor` is the same as `-Color` and
+    `-ErrorForegroundColor` is the same as `-ErrorColor`.
+    To specify background colors, you must now use a VT escape sequence.
+* Changing the end of the prompt to red may not work automatically anymore if
+  your prompt is non-trivial. To fix, use `Set-PSReadlineOption -PromptText "> "`,
+  replacing the string with the text that should turn red - be sure to include
+  any whitespace.
 
 ### Version 1.2
 
@@ -166,7 +191,7 @@ New features:
 * SamplePSReadlineProfile.ps1 added with examples of custom key bindings
 * Word movement takes DigitArgument
 * HistoryNoDuplicates now works a little differently
-    - Dupicates are saved (it was a dubious memory optimization anyway)
+    - Duplicates are saved (it was a dubious memory optimization anyway)
     - Recall will recall the most recently executed item instead of the first
 * When at the last word, NextWord/ForwardWord now move to the end of line instead
   of the last character of the word.
@@ -239,7 +264,7 @@ Bugs fixed:
 * Ctrl+R with long search lines no longer causes big problems
 
 Behavior change:
-* Word functions now use delimiters.  The previous behavior is availble 
+* Word functions now use delimiters.  The previous behavior is available 
   via a Shell*Word function, e.g. instead of KillWord, use ShellKillWord.
 
 ### Version 1.0.0.4