Create a first implementation of keybinding to the reverse-i search mode.

ikanobori · ikanobori · commit 1732f4b2d1f1 · 2012-02-29T12:27:42.000Z
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -575,6 +575,15 @@ def fwd(self):
         self.s = self.rl_history.forward()
         self.print_line(self.s, clr=True)
 
+    def search(self):
+        """Search with the partial matches from the history object."""
+
+        self.cpo = 0
+        self.clear_wrapped_lines()
+        self.rl_history.enter(self.s)
+        self.s = self.rl_history.back(start=False, search=True)
+        self.print_line(self.s, clr=True)
+
     def get_key(self):
         key = ''
         while True:
@@ -848,6 +857,10 @@ def p_key(self, key):
             self.undo()
             return ''
 
+        elif key in key_dispatch[config.search_key]:
+            self.search()
+            return ''
+
         elif key in ('KEY_UP', ) + key_dispatch[config.up_one_line_key]:
             # Cursor Up/C-p
             self.back()
diff --git a/bpython/config.py b/bpython/config.py
@@ -84,6 +84,7 @@ def loadini(struct, configfile):
             'show_source': 'F2',
             'suspend': 'C-z',
             'undo': 'C-r',
+            'search': 'C-o',
             'up_one_line': 'C-p',
             'yank_from_buffer': 'C-y'},
         'cli': {
@@ -115,6 +116,7 @@ def loadini(struct, configfile):
     struct.flush_output = config.getboolean('general', 'flush_output')
     struct.pastebin_key = config.get('keyboard', 'pastebin')
     struct.save_key = config.get('keyboard', 'save')
+    struct.search_key = config.get('keyboard', 'search')
     struct.show_source_key = config.get('keyboard', 'show_source')
     struct.suspend_key = config.get('keyboard', 'suspend')
     struct.undo_key = config.get('keyboard', 'undo')
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -173,10 +173,12 @@ def first(self):
             self.index = len(self.entries)
         return self.entries[-self.index]
 
-    def back(self, match=True):
+    def back(self, start=True, search=False):
         """Move one step back in the history."""
         if not self.is_at_end:
-            if match:
+            if search:
+                self.index += self.find_partial_match_backward(self.saved_line)
+            elif match:
                 self.index += self.find_match_backward(self.saved_line)
             else:
                 self.index += 1
@@ -189,10 +191,20 @@ def find_match_backward(self, search_term):
                 return idx + 1
         return 0
 
-    def forward(self, match = True):
+    def find_partial_match_backward(self, search_term):
+        filtered_list_len = len(self.entries) - self.index
+        for idx, val in enumerate(reversed(self.entries[:filtered_list_len])):
+            if search_term in val:
+                return idx + 1
+        return 0
+
+
+    def forward(self, start=True, search=False):
         """Move one step forward in the history."""
         if self.index > 1:
-            if match:
+            if search:
+                self.index -= self.find_partial_match_forward(self.saved_line)
+            elif match:
                 self.index -= self.find_match_forward(self.saved_line)
             else:
                 self.index -= 1
@@ -208,6 +220,15 @@ def find_match_forward(self, search_term):
                 return idx + 1
         return self.index
 
+    def find_partial_match_forward(self, search_term):
+        filtered_list_len = len(self.entries) - self.index + 1
+        for idx, val in enumerate(self.entries[filtered_list_len:]):
+            if search_term in val:
+                return idx + 1
+        return self.index
+
+
+
     def last(self):
         """Move forward to the end of the history."""
         if not self.is_at_start:
