Initial changes to implement ctrl+o functionality

PeriGK · thomasballinger · commit da6150b911f9 · 2017-04-04T08:09:30.000-07:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -483,13 +483,13 @@ def request_undo(self, n=1):
         """Like request_refresh, but for undo request events."""
         raise NotImplementedError
 
-    def on_suspend():
+    def on_suspend(self):
         """Will be called on sigtstp.
 
         Do whatever cleanup would allow the user to use other programs."""
         raise NotImplementedError
 
-    def after_suspend():
+    def after_suspend(self):
         """Will be called when process foregrounded after suspend.
 
         See to it that process_event is called with None to trigger a refresh
@@ -675,6 +675,8 @@ def process_key_event(self, e):
             self.down_one_line()
         elif e in ("<Ctrl-d>",):
             self.on_control_d()
+        elif e in ("<Ctrl-o>",):
+            self.on_control_o()
         elif e in ("<Esc+.>",):
             self.get_last_word()
         elif e in key_dispatch[self.config.reverse_incremental_search_key]:
@@ -844,6 +846,13 @@ def on_control_d(self):
             self.current_line = (self.current_line[:self.cursor_offset] +
                                  self.current_line[(self.cursor_offset + 1):])
 
+    def on_control_o(self):
+        next_idx = -self.rl_history.index + 1
+        next = self.rl_history.entries[next_idx]
+        self.on_enter()
+        print("Next is : " + next)
+        self._set_current_line(next)
+
     def cut_to_buffer(self):
         self.cut_buffer = self.current_line[self.cursor_offset:]
         self.current_line = self.current_line[:self.cursor_offset]
@@ -958,18 +967,24 @@ def toggle_file_watch(self):
 
     # Handler Helpers
     def add_normal_character(self, char):
+        print("Char is :" + str(char))
         if len(char) > 1 or is_nop(char):
             return
         if self.incr_search_mode:
+            print("Incr search mode")
             self.add_to_incremental_search(char)
         else:
+            print("In here current line: " + self.current_line)
+
             self._set_current_line((self.current_line[:self.cursor_offset] +
                                     char +
                                     self.current_line[self.cursor_offset:]),
                                    update_completion=False,
                                    reset_rl_history=False,
                                    clear_special_mode=False)
             self.cursor_offset += 1
+
+            print("but here: " + self.current_line)
         if (self.config.cli_trim_prompts and
                 self.current_line.startswith(self.ps1)):
             self.current_line = self.current_line[4:]
@@ -1021,6 +1036,7 @@ def push(self, line, insert_into_history=True):
 
         If the interpreter successfully runs the code, clear the buffer
         """
+
         if self.paste_mode:
             self.saved_indent = 0
         else:
@@ -1187,6 +1203,7 @@ def current_line_formatted(self):
         self.old_fs = fs
         return fs
 
+
     @property
     def lines_for_display(self):
         """All display lines (wrapped, colored, with prompts)"""
