display history

thomasballinger · thomasballinger · commit afca1da4a83f · 2014-07-06T14:30:43.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -77,6 +77,7 @@ def event_or_refresh():
                       interp=interp,
                       interactive=interactive) as repl:
                 repl.height, repl.width = window.t.height, window.t.width
+                sys.repl = repl
 
                 def process_event(e):
                     try:
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -496,6 +496,7 @@ def add_normal_character(self, char):
     def update_completion(self, tab=False):
         """Update autocomplete info; self.matches_iter and self.argspec"""
         self.list_win_visible = BpythonRepl.complete(self, tab)
+        #look for history stuff
 
     def push(self, line, insert_into_history=True):
         """Push a line of code onto the buffer, start running the buffer
@@ -677,13 +678,22 @@ def display_line_with_prompt(self):
                 func_for_letter(self.config.color_scheme['prompt_more'])(self.ps2)) + self.current_line_formatted
 
     @property
-    def current_cursor_line(self):
+    def current_cursor_line_without_suggestion(self):
         """Current line, either output/input or Python prompt + code"""
         value = (self.current_output_line +
                 ('' if self.coderunner.running else self.display_line_with_prompt))
         logging.debug('current cursor line: %r', value)
         return value
 
+    @property
+    def current_cursor_line(self):
+        return self.current_cursor_line_without_suggestion + fmtfuncs.bold(fmtfuncs.dark((self.current_suggestion)))
+
+    @property
+    def current_suggestion(self):
+        matches = [e for e in self.rl_history.entries if e.startswith(self.current_line)]
+        return matches[0][len(self.current_line):] if matches else ''
+
     @property
     def current_output_line(self):
         """line of output currently being written, and stdin typed"""
@@ -759,13 +769,13 @@ def paint(self, about_to_exit=False, user_quit=False):
         current_line_end_row = current_line_start_row + len(lines) - 1
 
         if self.stdin.has_focus:
-            cursor_row, cursor_column = divmod(len(self.current_stdouterr_line) + self.stdin.cursor_offset, width)
+            cursor_row, cursor_column = divmod(len(self.current_stdouterr_line_without_suggestion) + self.stdin.cursor_offset, width)
             assert cursor_column >= 0, cursor_column
         elif self.coderunner.running: #TODO does this ever happen?
-            cursor_row, cursor_column = divmod(len(self.current_cursor_line) + self.cursor_offset, width)
+            cursor_row, cursor_column = divmod(len(self.current_cursor_line_without_suggestion) + self.cursor_offset, width)
             assert cursor_column >= 0, (cursor_column, len(self.current_cursor_line), len(self.current_line), self.cursor_offset)
         else:
-            cursor_row, cursor_column = divmod(len(self.current_cursor_line) - len(self.current_line) + self.cursor_offset, width)
+            cursor_row, cursor_column = divmod(len(self.current_cursor_line_without_suggestion) - len(self.current_line) + self.cursor_offset, width)
             assert cursor_column >= 0, (cursor_column, len(self.current_cursor_line), len(self.current_line), self.cursor_offset)
         cursor_row += current_line_start_row
 
