Refactored key chords handling

Author: springcomp

PSReadLine/Completion.cs

@@ -1091,7 +1091,8 @@ private void MenuCompleteImpl(Menu menu, CommandCompletion completions)
                         prependNextKey = true;
 
                         // without this branch experience doesn't look naturally
-                        if (_dispatchTable.TryGetValue(nextKey, out var handler) &&
+                        if (_dispatchTable.TryGetValue(nextKey, out var handlerOrChordDispatchTable) &&
+                            handlerOrChordDispatchTable.TryGetKeyHandler(out var handler) &&
                             (
                                 handler.Action == CopyOrCancelLine ||
                                 handler.Action == Cut ||

PSReadLine/ConsoleKeyChordConverter.cs

@@ -36,20 +36,22 @@ public static ConsoleKeyInfo[] Convert(string chord)
                 throw new ArgumentNullException(nameof(chord));
             }
 
-            int start = 0;
-            var first = GetOneKey(chord, ref start);
+            var keyChord = new List<ConsoleKeyInfo>(2);
 
-            if (start >= chord.Length)
-                return new [] { first };
+            int index = 0;
 
-            if (chord[start++] != ',')
-                throw CantConvert(PSReadLineResources.InvalidSequence, chord);
+            while (true)
+            {
+                keyChord.Add(GetOneKey(chord, ref index));
+
+                if (index >= chord.Length)
+                    break;
 
-            var second = GetOneKey(chord, ref start);
-            if (start < chord.Length)
-                throw CantConvert(PSReadLineResources.InvalidSequence, chord);
+                if (chord[index++] != ',')
+                    throw CantConvert(PSReadLineResources.InvalidSequence, chord);
+            }
 
-            return new [] { first, second };
+            return keyChord.ToArray();
         }
 
         private static ConsoleKeyInfo GetOneKey(string chord, ref int start)

PSReadLine/History.cs

@@ -1171,9 +1171,13 @@ private void InteractiveHistorySearchLoop(int direction)
             var toMatch = new StringBuilder(64);
             while (true)
             {
+                Action<ConsoleKeyInfo?, object> function = null;
+
                 var key = ReadKey();
-                _dispatchTable.TryGetValue(key, out var handler);
-                var function = handler?.Action;
+                _dispatchTable.TryGetValue(key, out var handlerOrChordDispatchTable);
+                if (handlerOrChordDispatchTable.TryGetKeyHandler(out var handler))
+                    function = handler.Action;
+
                 if (function == ReverseSearchHistory)
                 {
                     UpdateHistoryDuringInteractiveSearch(toMatch.ToString(), -1, ref searchFromPoint);

PSReadLine/KeyBindings.cs

@@ -370,7 +370,7 @@ private static bool CheckIsBound(Action<ConsoleKeyInfo?, object> action)
         {
             foreach (var entry in _singleton._dispatchTable)
             {
-                if (entry.Value.Action == action)
+                if (entry.Value.TryGetKeyHandler(out var handler) && handler.Action == action)
                     return true;
             }
             return false;