Add brace matching support

Author: lzybkr

Changes.txt

@@ -1,3 +1,12 @@
+### Version 1.0.0.4
+
+New features:
+* Brace matching function added (GotoBrace)
+
+Bugs fixed:
+* When showing possible completions, truncate at newline
+* Prompt before showing a large number of completions
+
 ### Version 1.0.0.3
 
 Bugs fixed:

PSReadLine/Cmdlets.cs

@@ -395,11 +395,11 @@ public class SetKeyHandlerCommand : PSCmdlet
                      "BackwardDeleteLine", "BackwardKillLine", "BackwardWord", "BeginningOfHistory", "BeginningOfLine",
                      "CancelLine", "Complete", "DeleteChar", "DisableDemoMode", "EmacsBackwardWord",
                      "EmacsForwardWord", "EnableDemoMode", "EndOfHistory", "EndOfLine", "ExchangePointAndMark",
-                     "ForwardChar", "ForwardDeleteLine", "ForwardWord", "HistorySearchBackward", "HistorySearchForward",
-                     "KillBackwardWord", "KillLine", "KillWord", "NextHistory", "Paste",
-                     "PossibleCompletions", "PreviousHistory", "Redo", "RevertLine", "SetKeyHandler",
-                     "SetMark", "TabCompleteNext", "TabCompletePrevious", "Undo", "Yank",
-                     "YankPop")]
+                     "ForwardChar", "ForwardDeleteLine", "ForwardWord", "GotoBrace", "HistorySearchBackward",
+                     "HistorySearchForward", "KillBackwardWord", "KillLine", "KillWord", "NextHistory",
+                     "Paste", "PossibleCompletions", "PreviousHistory", "Redo", "RevertLine",
+                     "SetKeyHandler", "SetMark", "TabCompleteNext", "TabCompletePrevious", "Undo",
+                     "Yank", "YankPop")]
         [Parameter(Position = 1, Mandatory = true, ParameterSetName = "Function")]
         public string Function { get; set; }
 

PSReadLine/Keys.cs

@@ -116,6 +116,7 @@ public class Keys
         public static ConsoleKeyInfo CtrlSpace   = new ConsoleKeyInfo(' ', ConsoleKey.Spacebar, false, false, true);
         public static ConsoleKeyInfo AltLess     = new ConsoleKeyInfo('<', ConsoleKey.OemComma, true, true, false);
         public static ConsoleKeyInfo AltGreater  = new ConsoleKeyInfo('>', ConsoleKey.OemPeriod, true, true, false);
+        public static ConsoleKeyInfo CtrlRBracket = new ConsoleKeyInfo((char)29, ConsoleKey.Oem6, false, false, true);
 
         public static ConsoleKeyInfo AltA = new ConsoleKeyInfo((char)97, ConsoleKey.A, false, true, false);
         public static ConsoleKeyInfo AltB = new ConsoleKeyInfo((char)98, ConsoleKey.B, false, true, false);

PSReadLine/PSReadLineResources.Designer.cs

@@ -252,4 +252,7 @@
   <data name="DisplayAllPossibilities" xml:space="preserve">
     <value>Display all {0} possibilities? (y or n)</value>
   </data>
+  <data name="GotoBraceDescription" xml:space="preserve">
+    <value>Go to matching brace</value>
+  </data>
 </root>

PSReadLine/PSReadLineResources.resx

@@ -370,6 +370,7 @@ static PSConsoleReadLine()
                 { Keys.CtrlZ,           MakeKeyHandler(Undo,                 "Undo") },
                 { Keys.CtrlEnd,         MakeKeyHandler(ForwardDeleteLine,    "ForwardDeleteLine") },
                 { Keys.CtrlHome,        MakeKeyHandler(BackwardDeleteLine,   "BackwardDeleteLine") },
+                { Keys.CtrlRBracket,    MakeKeyHandler(GotoBrace,            "GotoBrace") },
             };
 
             _emacsKeyMap = new Dictionary<ConsoleKeyInfo, KeyHandler>(new ConsoleKeyInfoComparer())
@@ -774,6 +775,69 @@ public static void EmacsBackwardWord(ConsoleKeyInfo? key = null, object arg = nu
             _singleton.BackwardWord(EditMode.Emacs);
         }
 
+        /// <summary>
+        /// Go to the matching brace, paren, or square bracket
+        /// </summary>
+        public static void GotoBrace(ConsoleKeyInfo? key = null, object arg = null)
+        {
+            if (_singleton._current >= _singleton._buffer.Length)
+            {
+                Ding();
+                return;
+            }
+
+            var charAtPoint = _singleton._buffer[_singleton._current];
+
+            Token token = null;
+            var index = 0;
+            for (; index < _singleton._tokens.Length; index++)
+            {
+                token = _singleton._tokens[index];
+                if (token.Extent.StartOffset == _singleton._current)
+                    break;
+            }
+
+            TokenKind toMatch;
+            int direction;
+            switch (token.Kind)
+            {
+            case TokenKind.LParen:   toMatch = TokenKind.RParen; direction = 1; break;
+            case TokenKind.LCurly:   toMatch = TokenKind.RCurly; direction = 1; break;
+            case TokenKind.LBracket: toMatch = TokenKind.RBracket; direction = 1; break;
+
+            case TokenKind.RParen:   toMatch = TokenKind.LParen; direction = -1; break;
+            case TokenKind.RCurly:   toMatch = TokenKind.LCurly; direction = -1; break;
+            case TokenKind.RBracket: toMatch = TokenKind.LBracket; direction = -1; break;
+
+            default:
+                // Nothing to match (don't match inside strings/comments)
+                Ding();
+                return;
+            }
+
+            var matchCount = 0;
+            var limit = (direction > 0) ? _singleton._tokens.Length - 1 : -1;
+            for (; index != limit; index += direction)
+            {
+                var t = _singleton._tokens[index];
+                if (t.Kind == token.Kind)
+                {
+                    matchCount++;
+                }
+                else if (t.Kind == toMatch)
+                {
+                    matchCount--;
+                    if (matchCount == 0)
+                    {
+                        _singleton._current = t.Extent.StartOffset;
+                        _singleton.PlaceCursor();
+                        return;
+                    }
+                }
+            }
+            Ding();
+        }
+
 #endregion Movement
 
 #region History