Fixed rewind interaction with stdout/err

thomasballinger · thomasballinger · commit cbe01ab069e9 · 2013-11-07T10:07:41.000-05:00
still need to fix stdin.readline

--HG--
branch : scroll-frontend
extra : amend_source : 78e141e4c2f5230264d7fd6017b5afec667a49af
diff --git a/bpython/scroll.py b/bpython/scroll.py
@@ -20,7 +20,10 @@ def main(args=None, locals_=None, banner=None):
 
     with TerminalController() as tc:
         with Terminal(tc, keep_last_line=True, hide_cursor=False) as term:
-            with Repl(config=config, locals_=locals_, stuff_a_refresh_request=tc.stuff_a_refresh_request, banner=banner) as repl:
+            with Repl(config=config,
+                      locals_=locals_,
+                      stuff_a_refresh_request=tc.stuff_a_refresh_request,
+                      banner=banner) as repl:
                 rows, columns = tc.get_screen_size()
                 repl.width = columns
                 repl.height = rows
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -43,6 +43,7 @@
 #TODO use events instead of length-one queues for interthread communication
 
 #TODO raw_input should be bytes in python2
+#TODO check py3 compatibility
 
 
 from bpython.keys import cli_key_dispatch as key_dispatch
@@ -145,7 +146,12 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
         self.cursor_offset_in_line = 0 # from the left, 0 means first char
         self.done = True
 
-        self.coderunner = CodeRunner(self.interp, stuff_a_refresh_request)
+        def request_refresh():
+            self.refresh_requests += 1
+            stuff_a_refresh_request()
+        self.refresh_requests = 0
+        self.stuff_a_refresh_request = request_refresh
+        self.coderunner = CodeRunner(self.interp, request_refresh)
         self.stdout = FakeOutput(self.coderunner, self.send_to_stdout)
         self.stderr = FakeOutput(self.coderunner, self.send_to_stderr)
         self.stdin = FakeStdin(self.coderunner, self)
@@ -154,6 +160,7 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
         self.request_paint_to_clear_screen = False
         self.last_events = [None] * 50
         self.presentation_mode = False
+        self.reevaluating = False
 
         self.width = None  # will both be set by a window resize event
         self.height = None
@@ -195,7 +202,13 @@ def process_event(self, e):
 
         logging.debug("processing event %r", e)
         if isinstance(e, events.RefreshRequestEvent):
-            self.run_code_and_maybe_finish()
+            assert self.refresh_requests > 0
+            self.refresh_requests -= 1
+            assert self.coderunner.code_is_waiting or self.reevaluating
+            if self.coderunner.code_is_waiting:
+                self.run_code_and_maybe_finish()
+            if self.refresh_requests == 0 and self.reevaluating:
+                self.reevaluate()
             return
         self.last_events.append(e)
         self.last_events.pop(0)
@@ -263,7 +276,6 @@ def process_event(self, e):
             self.on_tab(back=True)
         elif e in ('',) + key_dispatch[self.config.undo_key]:
             self.undo()
-            self.update_completion()
         elif e in ('\x13',) + key_dispatch[self.config.save_key]: # ctrl-s for save
             t = threading.Thread(target=self.write2file)
             t.daemon = True
@@ -740,6 +752,15 @@ def reprint_line(self, lineno, tokens):
             self.display_buffer[lineno] = bpythonparse(format(tokens, self.formatter))
     def reevaluate(self, insert_into_history=False):
         """bpython.Repl.undo calls this"""
+        #TODO This almost works, but events are necessary to keep it going!
+        if not self.reevaluating:
+            self.reevaluating = self.reevaluation_generator(insert_into_history=insert_into_history)
+        try:
+            self.reevaluating.next()
+        except StopIteration:
+            self.reevaluating = False
+
+    def reevaluation_generator(self, insert_into_history):
         #TODO other implementations have a enter no-history method, could do
         # that instead of clearing history and getting it rewritten
         old_logical_lines = self.history
@@ -748,6 +769,7 @@ def reevaluate(self, insert_into_history=False):
 
         self.done = True # this keeps the first prompt correct
         self.interp = code.InteractiveInterpreter()
+        self.coderunner.interp = self.interp
         self.completer = Autocomplete(self.interp.locals, self.config)
         self.completer.autocomplete_mode = 'simple'
         self.buffer = []
@@ -757,8 +779,14 @@ def reevaluate(self, insert_into_history=False):
         for line in old_logical_lines:
             self._current_line = line
             self.on_enter(insert_into_history=insert_into_history)
+            if self.refresh_requests > 0:
+                yield line # use up remaining refresh requests
+            else:
+                self.stuff_a_refresh_request()
+                yield line
         self.cursor_offset_in_line = 0
         self._current_line = ''
+
     def getstdout(self):
         lines = self.lines_for_display + [self.current_line_formatted]
         s = '\n'.join([x.s if isinstance(x, FmtStr) else x
