don't paint current line again if user code exits

thomasballinger · thomasballinger · commit 7306686c830e · 2013-11-18T11:17:58.000-05:00
--HG--
branch : scroll-frontend
diff --git a/bpython/scroll.py b/bpython/scroll.py
@@ -5,6 +5,7 @@
 from fmtstr.terminalcontrol import TerminalController
 
 from bpython.scrollfrontend.repl import Repl
+from bpython.scrollfrontend.coderunner import SystemExitFromCodeThread
 from bpython import args as bpargs
 from bpython.translations import _
 
@@ -47,6 +48,10 @@ def main(args=None, locals_=None, banner=None):
                 while True:
                     try:
                         repl.process_event(tc.get_event())
+                    except SystemExitFromCodeThread:
+                        array, cursor_pos = repl.paint(about_to_exit=2)
+                        term.render_to_terminal(array, cursor_pos)
+                        raise
                     except SystemExit:
                         array, cursor_pos = repl.paint(about_to_exit=True)
                         term.render_to_terminal(array, cursor_pos)
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -674,6 +674,8 @@ def paint(self, about_to_exit=False):
             arr[:history.height,:history.width] = history
 
         current_line = paint.paint_current_line(min_height, width, self.current_cursor_line)
+        if about_to_exit == 2: # hack for quit() in user code
+            current_line_start_row = current_line_start_row - current_line.height
         logging.debug("---current line row slice %r, %r", current_line_start_row, current_line_start_row + current_line.height)
         logging.debug("---current line col slice %r, %r", 0, current_line.width)
         arr[current_line_start_row:current_line_start_row + current_line.height,
