Improve and fix the "under cursor" detection of paren highlighting.

Trundle · Trundle · commit 5a0d9d6b6f7f · 2009-07-12T22:45:10.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1656,9 +1656,10 @@ def reprint_line(lineno, s, to_replace=[]):
                 self.scr.move(lineno, 4)
                 map(self.echo, o.split('\x04'))
 
-            y, x = self.scr.getyx()
+            y = self.scr.getyx()[0]
+            x = self.ix + len(s) - self.cpos
             if not self.cpos:
-                x += 1
+                x -= 1
             if self.highlighted_paren:
                 # Clear previous highlighted paren
                 reprint_line(*self.highlighted_paren)
@@ -1690,7 +1691,15 @@ def reprint_line(lineno, s, to_replace=[]):
                             tokens[i] = (Parenthesis, value)
                             break
                         elif under_cursor:
-                            tokens[i] = (Parenthesis.UnderCursor, value)
+                            if self.cpos:
+                                tokens[i] = (Parenthesis.UnderCursor, value)
+                            else:
+                                # The cursor is at the end of line and
+                                # next to the paren, so it doesn't reverse
+                                # the paren. Therefore, we insert the
+                                # Parenthesis token here instead of the
+                                # Parenthesis.UnderCursor token.
+                                tokens[i] = (Parenthesis, value)
                             (line, i, opening) = opening
                             screen_line = y - len(self.buffer) + line
                             if line == len(self.buffer):
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -93,7 +93,7 @@ def __init__(self, color_scheme, **options):
         if not self.f_strings:
             for k, v in theme_map.iteritems():
                 self.f_strings[k] = '\x01%s' % (color_scheme[v],)
-                if k is Parenthesis or k is Parenthesis.UnderCursor:
+                if k is Parenthesis:
                     # FIXME: Find a way to make this the inverse of the current
                     # background colour
                     self.f_strings[k] += 'I'
@@ -106,9 +106,6 @@ def format(self, tokensource, outfile):
             if text == '\n':
                 continue
 
-            if token is Parenthesis.UnderCursor:
-                curses.curs_set(0)
-
             if token in self.f_strings:
                 o +=  "%s\x03%s\x04" % (self.f_strings[token], text )
             else:
