Highlight also matching brackets und braces.

Trundle · Trundle · commit 60c3d950ebe1 · 2009-06-07T19:37:49.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1502,39 +1502,39 @@ def reprint_line(lineno, s, to_replace=[]):
                 pos += len(value)
                 under_cursor = (line == len(self.buffer) and pos == x)
                 if token is Token.Punctuation:
-                    if value == '(':
+                    if value in '({[':
                         if under_cursor:
-                            tokens[i] = (Parenthesis, '(')
+                            tokens[i] = (Parenthesis, value)
                             # Push marker on the stack
                             stack.append(Parenthesis)
                         else:
-                            stack.append((line, i))
-                    elif value == ')':
+                            stack.append((line, i, value))
+                    elif value in ')}]':
                         try:
-                            value = stack.pop()
+                            opening = stack.pop()
                         except IndexError:
                             # SyntaxError.. more closed parentheses than
                             # opened
                             break
-                        if value is Parenthesis:
+                        if opening is Parenthesis:
                             # Marker found
-                            tokens[i] = (Parenthesis, ')')
+                            tokens[i] = (Parenthesis, value)
                             break
                         elif under_cursor:
-                            tokens[i] = (Parenthesis, ')')
-                            (line, i) = value
+                            tokens[i] = (Parenthesis, value)
+                            (line, i, opening) = opening
                             screen_line = y - len(self.buffer) + line
                             if line == len(self.buffer):
                                 self.highlighted_paren = (screen_line, s)
-                                tokens[i] = (Parenthesis, '(')
+                                tokens[i] = (Parenthesis, opening)
                             else:
                                 self.highlighted_paren = (screen_line,
                                                           self.buffer[line])
                                 # We need to redraw a line
                                 reprint_line(
                                     screen_line,
                                     self.buffer[line],
-                                    [(i, (Parenthesis, '('))]
+                                    [(i, (Parenthesis, opening))]
                                 )
                     elif under_cursor:
                         break
