Fix a typo and off-by-one in paren highlighting.

Trundle · Trundle · commit a6d0aa1c0836 · 2009-07-12T13:41:35.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1657,6 +1657,8 @@ def reprint_line(lineno, s, to_replace=[]):
                 map(self.echo, o.split('\x04'))
 
             y, x = self.scr.getyx()
+            if not self.cpos:
+                x += 1
             if self.highlighted_paren:
                 # Clear previous highlighted paren
                 reprint_line(*self.highlighted_paren)
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:
+                if k is Parenthesis or k is Parenthesis.UnderCursor:
                     # FIXME: Find a way to make this the inverse of the current
                     # background colour
                     self.f_strings[k] += 'I'
@@ -106,7 +106,7 @@ def format(self, tokensource, outfile):
             if text == '\n':
                 continue
 
-            if token is Parenthesis.UnderCorsor:
+            if token is Parenthesis.UnderCursor:
                 curses.curs_set(0)
 
             if token in self.f_strings:
