Fix 'Shift+Backspace/Escape' to work the same as 'Backspace/Escape' on Windows (#898)

Author: daxian-dbw

PSReadLine/ReadLine.cs

@@ -572,6 +572,8 @@ void CallPossibleExternalApplication(Action action)
 
         void ProcessOneKey(PSKeyInfo key, Dictionary<PSKeyInfo, KeyHandler> dispatchTable, bool ignoreIfNoAction, object arg)
         {
+            var consoleKey = key.AsConsoleKeyInfo();
+
             // Our dispatch tables are built as much as possible in a portable way, so for example,
             // we avoid depending on scan codes like ConsoleKey.Oem6 and instead look at the
             // PSKeyInfo.Key. We also want to ignore the shift state as that may differ on
@@ -585,15 +587,15 @@ void ProcessOneKey(PSKeyInfo key, Dictionary<PSKeyInfo, KeyHandler> dispatchTabl
                 // shift hadn't be pressed.  This cleanly allows Shift+Backspace without adding a key binding.
                 if (key.Shift && !key.Control && !key.Alt)
                 {
-                    var c = key.KeyChar;
+                    var c = consoleKey.KeyChar;
                     if (c != '\0' && char.IsControl(c))
                     {
-                        key = PSKeyInfo.From(key.KeyChar);
+                        key = PSKeyInfo.From(consoleKey.Key);
                         dispatchTable.TryGetValue(key, out handler);
                     }
                 }
             }
-            var consoleKey = key.AsConsoleKeyInfo();
+
             if (handler != null)
             {
                 if (handler.ScriptBlock != null)

test/KeyBindingsTest.cs

@@ -47,5 +47,19 @@ public void ShowKeyBindings()
             TestSetup(KeyMode.Vi);
             Test("", Keys(Enumerable.Repeat(_.Ctrl_Alt_Question, 3)));
         }
+
+        [SkippableFact]
+        public void ShiftBackspace()
+        {
+            TestSetup(KeyMode.Cmd);
+            Test("aa", Keys("aaa", _.Shift_Backspace));
+        }
+
+        [SkippableFact]
+        public void ShiftEscape()
+        {
+            TestSetup(KeyMode.Cmd);
+            Test("", Keys("aaa", _.Shift_Escape));
+        }
     }
 }

test/KeyInfo-en-US-linux.json

@@ -958,6 +958,20 @@
     "Modifiers": "0",
     "Investigate": false
   },
+  {
+    "Key": "Shift+Backspace",
+    "KeyChar": "\u007f",
+    "ConsoleKey": "Backspace",
+    "Modifiers": "0",
+    "Investigate": false
+  },
+  {
+    "Key": "Shift+Escape",
+    "KeyChar": "\u001b",
+    "ConsoleKey": "Escape",
+    "Modifiers": "0",
+    "Investigate": false
+  },
   {
     "Key": "Alt+F1",
     "KeyChar": "\u0000",

test/KeyInfo-en-US-windows.json

@@ -1301,6 +1301,18 @@
         "ConsoleKey":  "UpArrow",
         "Modifiers":  "Shift"
     },
+    {
+        "Key":  "Shift+Backspace",
+        "KeyChar":  "\b",
+        "ConsoleKey":  "Backspace",
+        "Modifiers":  "Shift"
+    },
+    {
+        "Key":  "Shift+Escape",
+        "KeyChar":  "\u001b",
+        "ConsoleKey":  "Escape",
+        "Modifiers":  "Shift"
+    },
     {
         "Key":  "Spacebar",
         "KeyChar":  " ",

test/KeyInfo-fr-FR-windows.json

@@ -1497,6 +1497,20 @@
         "Modifiers":  "Shift",
         "Investigate":  false
     },
+    {
+        "Key":  "Shift+Backspace",
+        "KeyChar":  "\b",
+        "ConsoleKey":  "Backspace",
+        "Modifiers":  "Shift",
+        "Investigate":  false
+    },
+    {
+        "Key":  "Shift+Escape",
+        "KeyChar":  "\u001b",
+        "ConsoleKey":  "Escape",
+        "Modifiers":  "Shift",
+        "Investigate":  false
+    },
     {
         "Key":  "Shift+UpArrow",
         "KeyChar":  "\u0000",

test/KeyInfo-pl-PL-linux.json

@@ -279,6 +279,20 @@
     "Modifiers": "Shift",
     "Investigate": false
   },
+  {
+    "Key": "Shift+Backspace",
+    "KeyChar": "\u007f",
+    "ConsoleKey": "Backspace",
+    "Modifiers": "0",
+    "Investigate": false
+  },
+  {
+    "Key": "Shift+Escape",
+    "KeyChar": "\u001b",
+    "ConsoleKey": "Escape",
+    "Modifiers": "0",
+    "Investigate": false
+  },
   {
     "Key": "j",
     "KeyChar": "j",

test/KeyInfo-pl-PL-windows.json

@@ -727,6 +727,20 @@
         "Modifiers":  "Shift",
         "Investigate":  false
     },
+    {
+        "Key":  "Shift+Backspace",
+        "KeyChar":  "\b",
+        "ConsoleKey":  "Backspace",
+        "Modifiers":  "Shift",
+        "Investigate":  false
+    },
+    {
+        "Key":  "Shift+Escape",
+        "KeyChar":  "\u001b",
+        "ConsoleKey":  "Escape",
+        "Modifiers":  "Shift",
+        "Investigate":  false
+    },
     {
         "Key":  "Ctrl+y",
         "KeyChar":  "\u0019",

test/KeyInfo-ru-RU-windows.json

@@ -741,6 +741,20 @@
         "Modifiers":  "Shift",
         "Investigate":  false
     },
+    {
+        "Key":  "Shift+Backspace",
+        "KeyChar":  "\b",
+        "ConsoleKey":  "Backspace",
+        "Modifiers":  "Shift",
+        "Investigate":  false
+    },
+    {
+        "Key":  "Shift+Escape",
+        "KeyChar":  "\u001b",
+        "ConsoleKey":  "Escape",
+        "Modifiers":  "Shift",
+        "Investigate":  false
+    },
     {
         "Key":  "5",
         "KeyChar":  "5",