Import PowerShell changes

.gitignore

@@ -43,6 +43,7 @@ x64/
 *.vspscc
 *.vssscc
 .builds
+project.lock.json
 
 # Visual C++ cache files
 ipch/

NuGet.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
+  </packageSources>
+</configuration>

PSReadLine/BasicEditing.cs

@@ -428,8 +428,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
@@ -523,7 +523,7 @@ public static void AddLine(ConsoleKeyInfo? key = null, object arg = null)
         [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         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);
@@ -554,7 +554,7 @@ public static void InsertLineAbove(ConsoleKeyInfo? key = null, object arg = null
         [SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed")]
         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

@@ -154,7 +154,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.
@@ -227,7 +227,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

PSReadLine/Cmdlets.cs

@@ -10,6 +10,10 @@
 using System.Management.Automation.Language;
 using System.Reflection;
 using System.Linq;
+#if CORECLR
+using System.Runtime.InteropServices;
+using Microsoft.PowerShell.Internal;
+#endif
 
 namespace Microsoft.PowerShell
 {
@@ -69,20 +73,31 @@ public enum HistorySaveStyle
 
     public class PSConsoleReadlineOptions
     {
+#if UNIX // TODO: why different schemes for LINUX?
+        public const ConsoleColor DefaultCommentForegroundColor   = ConsoleColor.Magenta;
+        public const ConsoleColor DefaultOperatorForegroundColor  = ConsoleColor.Gray;
+        public const ConsoleColor DefaultParameterForegroundColor = ConsoleColor.Green;
+#else
         public const ConsoleColor DefaultCommentForegroundColor   = ConsoleColor.DarkGreen;
+        public const ConsoleColor DefaultOperatorForegroundColor  = ConsoleColor.DarkGray;
+        public const ConsoleColor DefaultParameterForegroundColor = ConsoleColor.DarkGray;
+#endif
         public const ConsoleColor DefaultKeywordForegroundColor   = ConsoleColor.Green;
         public const ConsoleColor DefaultStringForegroundColor    = ConsoleColor.DarkCyan;
-        public const ConsoleColor DefaultOperatorForegroundColor  = ConsoleColor.DarkGray;
         public const ConsoleColor DefaultVariableForegroundColor  = ConsoleColor.Green;
         public const ConsoleColor DefaultCommandForegroundColor   = ConsoleColor.Yellow;
-        public const ConsoleColor DefaultParameterForegroundColor = ConsoleColor.DarkGray;
         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 ConsoleColor DefaultErrorForegroundColor     = ConsoleColor.Red;
 
-        public const EditMode DefaultEditMode = EditMode.Windows;
+        public const EditMode DefaultEditMode =
+#if UNIX
+            EditMode.Emacs;
+#else
+            EditMode.Windows;
+#endif
 
         public const string DefaultContinuationPrompt = ">> ";
 
@@ -105,7 +120,7 @@ public class PSConsoleReadlineOptions
 
         /// <summary>
         /// When displaying possible completions, either display
-        /// tooltips or dipslay just the completions.
+        /// tooltips or display just the completions.
         /// </summary>
         public const bool DefaultShowToolTips = false;
 
@@ -151,8 +166,32 @@ public PSConsoleReadlineOptions(string hostName)
             WordDelimiters = DefaultWordDelimiters;
             HistorySearchCaseSensitive = DefaultHistorySearchCaseSensitive;
             HistorySaveStyle = DefaultHistorySaveStyle;
-            HistorySavePath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)
-                + @"\Microsoft\Windows\PowerShell\PSReadline\" + hostName + "_history.txt";
+
+            string historyFileName = hostName + "_history.txt";
+#if UNIX
+            // PSReadline does not have access to Utils.CorePSPlatform. Must set PSReadline path separately
+            string historyPath = System.Environment.GetEnvironmentVariable("XDG_DATA_HOME");
+
+            if (!String.IsNullOrEmpty(historyPath))
+            {
+                historyPath = System.IO.Path.Combine(historyPath, "powershell", "PSReadLine", historyFileName);
+                HistorySavePath = historyPath;
+            }
+            else
+            {
+                // History is data, so it goes into .local/share/powershell folder
+                HistorySavePath = System.IO.Path.Combine(Environment.GetEnvironmentVariable("HOME"),
+                                                         ".local",
+                                                         "share",
+                                                         "powershell",
+                                                         "PSReadLine",
+                                                         historyFileName);
+            }
+#else
+            HistorySavePath = System.IO.Path.Combine(Environment.GetEnvironmentVariable("APPDATA"),
+                                                     @"Microsoft\Windows\PowerShell\PSReadline\",
+                                                     historyFileName);
+#endif
             CommandValidationHandler = null;
             CommandsToValidateScriptBlockArguments = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
@@ -342,7 +381,7 @@ internal void SetBackgroundColor(TokenClassification tokenKind, ConsoleColor col
         }
     }
 
-    [Cmdlet("Get", "PSReadlineOption", HelpUri = "http://go.microsoft.com/fwlink/?LinkId=528808")]
+    [Cmdlet("Get", "PSReadlineOption", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=528808")]
     [OutputType(typeof(PSConsoleReadlineOptions))]
     public class GetPSReadlineOption : PSCmdlet
     {
@@ -353,7 +392,7 @@ protected override void EndProcessing()
         }
     }
 
-    [Cmdlet("Set", "PSReadlineOption", HelpUri = "http://go.microsoft.com/fwlink/?LinkId=528811")]
+    [Cmdlet("Set", "PSReadlineOption", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=528811")]
     public class SetPSReadlineOption : PSCmdlet
     {
         [Parameter(ParameterSetName = "OptionsSet")]
@@ -633,7 +672,7 @@ protected IDisposable UseRequestedDispatchTables()
         }
     }
 
-    [Cmdlet("Set", "PSReadlineKeyHandler", HelpUri = "http://go.microsoft.com/fwlink/?LinkId=528810")]
+    [Cmdlet("Set", "PSReadlineKeyHandler", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=528810")]
     public class SetPSReadlineKeyHandlerCommand : ChangePSReadlineKeyHandlerCommandBase, IDynamicParameters
     {
         [Parameter(Position = 1, Mandatory = true, ParameterSetName = "ScriptBlock")]
@@ -658,9 +697,9 @@ protected override void EndProcessing()
                 if (ParameterSetName.Equals(FunctionParameterSet))
                 {
                     var function = (string)_dynamicParameters.Value[FunctionParameter].Value;
+                    MethodInfo mi = typeof (PSConsoleReadLine).GetMethod(function);
                     var keyHandler = (Action<ConsoleKeyInfo?, object>)
-                        Delegate.CreateDelegate(typeof (Action<ConsoleKeyInfo?, object>),
-                            typeof (PSConsoleReadLine).GetMethod(function));
+                        mi.CreateDelegate(typeof (Action<ConsoleKeyInfo?, object>));
                     BriefDescription = function;
                     PSConsoleReadLine.SetKeyHandler(Chord, keyHandler, BriefDescription, Description);
                 }
@@ -708,7 +747,7 @@ public object GetDynamicParameters()
         }
     }
 
-    [Cmdlet("Get", "PSReadlineKeyHandler", HelpUri = "http://go.microsoft.com/fwlink/?LinkId=528807")]
+    [Cmdlet("Get", "PSReadlineKeyHandler", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=528807")]
     [OutputType(typeof(KeyHandler))]
     public class GetKeyHandlerCommand : PSCmdlet
     {
@@ -752,7 +791,7 @@ protected override void EndProcessing()
         }
     }
 
-    [Cmdlet("Remove", "PSReadlineKeyHandler", HelpUri = "http://go.microsoft.com/fwlink/?LinkId=528809")]
+    [Cmdlet("Remove", "PSReadlineKeyHandler", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=528809")]
     public class RemoveKeyHandlerCommand : ChangePSReadlineKeyHandlerCommandBase
     {
         [ExcludeFromCodeCoverage]

PSReadLine/Completion.cs

@@ -23,6 +23,9 @@ public partial class PSConsoleReadLine
         private CommandCompletion _tabCompletions;
         private Runspace _runspace;
 
+        // String helper for directory paths
+        private static string DirectorySeparatorString = System.IO.Path.DirectorySeparatorChar.ToString();
+
         // Stub helper method so completion can be mocked
         [ExcludeFromCodeCoverage]
         CommandCompletion IPSConsoleReadLineMockableMethods.CompleteInput(string input, int cursorIndex, Hashtable options, System.Management.Automation.PowerShell powershell)
@@ -273,36 +276,36 @@ private void DoReplacementForCompletion(CompletionResult completionResult, Comma
 
         private static string GetReplacementTextForDirectory(string replacementText, ref int cursorAdjustment)
         {
-            if (!replacementText.EndsWith("\\", StringComparison.Ordinal))
+            if (!replacementText.EndsWith(DirectorySeparatorString , StringComparison.Ordinal))
             {
-                if (replacementText.EndsWith("\\'", StringComparison.Ordinal) || replacementText.EndsWith("\\\"", StringComparison.Ordinal))
+                if (replacementText.EndsWith(String.Format("{0}\'", DirectorySeparatorString), StringComparison.Ordinal) ||
+                    replacementText.EndsWith(String.Format("{0}\"", DirectorySeparatorString), StringComparison.Ordinal))
                 {
                     cursorAdjustment = -1;
                 }
-                else if (replacementText.EndsWith("'", StringComparison.Ordinal) || replacementText.EndsWith("\"", StringComparison.Ordinal))
+                else if (replacementText.EndsWith("'", StringComparison.Ordinal) ||
+                         replacementText.EndsWith("\"", StringComparison.Ordinal))
                 {
                     var len = replacementText.Length;
-                    replacementText = replacementText.Substring(0, len - 1) + '\\' + replacementText[len - 1];
+                    replacementText = replacementText.Substring(0, len - 1) + System.IO.Path.DirectorySeparatorChar + replacementText[len - 1];
                     cursorAdjustment = -1;
                 }
                 else
                 {
-                    replacementText = replacementText + '\\';
+                    replacementText = replacementText + System.IO.Path.DirectorySeparatorChar;
                 }
             }
             return replacementText;
         }
 
-        private static void InvertSelectedCompletion(CHAR_INFO[] buffer, int selectedItem, int menuColumnWidth, int menuRows)
+        private static void InvertSelectedCompletion(BufferChar[] buffer, int selectedItem, int menuColumnWidth, int menuRows)
         {
             var selectedX = selectedItem / menuRows;
             var selectedY = selectedItem - (selectedX * menuRows);
             var start = selectedY * _singleton._console.BufferWidth + selectedX * menuColumnWidth;
             for (int i = 0; i < menuColumnWidth; i++)
             {
-                int j = i + start;
-                buffer[j].ForegroundColor = (ConsoleColor)((int)buffer[j].ForegroundColor ^ 7);
-                buffer[j].BackgroundColor = (ConsoleColor)((int)buffer[j].BackgroundColor ^ 7);
+                buffer[i + start].Inverse = true;
             }
         }
 

PSReadLine/ConsoleBufferBuilder.cs

@@ -10,18 +10,18 @@ namespace Microsoft.PowerShell
 {
     internal class ConsoleBufferBuilder
     {
-        private List<CHAR_INFO> buffer;
+        private List<BufferChar> buffer;
         private IConsole _console;
 
         public ConsoleBufferBuilder(int capacity, IConsole console)
         {
-            buffer = new List<CHAR_INFO>(capacity);
+            buffer = new List<BufferChar>(capacity);
             _console = console;
         }
 
-        CHAR_INFO NewCharInfo(char c)
+        BufferChar NewCharInfo(char c)
         {
-            return new CHAR_INFO
+            return new BufferChar
             {
                 UnicodeChar = c,
                 BackgroundColor = _console.BackgroundColor,
@@ -45,7 +45,7 @@ public void Append(char c, int count)
             }
         }
 
-        public CHAR_INFO[] ToArray()
+        public BufferChar[] ToArray()
         {
             return buffer.ToArray();
         }