add right arrow completion config option

thomasballinger · thomasballinger · commit 4e654ef07b22 · 2014-07-11T14:15:19.000-04:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -90,6 +90,7 @@ def loadini(struct, configfile):
         'curtsies': {
             'list_above' : False,
             'fill_terminal' : False,
+            'right_arrow_completion' : True,
         }})
     if not config.read(config_path):
         # No config file. If the user has it in the old place then complain
@@ -150,6 +151,7 @@ def loadini(struct, configfile):
 
     struct.curtsies_list_above = config.getboolean('curtsies', 'list_above')
     struct.curtsies_fill_terminal = config.getboolean('curtsies', 'fill_terminal')
+    struct.curtsies_right_arrow_completion = config.getboolean('curtsies', 'right_arrow_completion')
 
     color_scheme_name = config.get('general', 'color_scheme')
 
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -336,7 +336,8 @@ def process_event(self, e):
             self.update_completion()
             return
 
-        elif e in ("KEY_RIGHT") and self.cursor_offset == len(self.current_line):
+        elif (e in ("KEY_RIGHT", '\x06') and self.config.curtsies_right_arrow_completion
+                and self.cursor_offset == len(self.current_line)):
             self.current_line += self.current_suggestion
             self.cursor_offset = len(self.current_line)
             self.update_completion()
@@ -348,13 +349,15 @@ def process_event(self, e):
         # readline history commands
         elif e in ("KEY_UP",) + key_dispatch[self.config.up_one_line_key]:
             self.rl_history.enter(self.current_line)
-            self.current_line = self.rl_history.back(False, search=True)
+            self.current_line = self.rl_history.back(False,
+                    search=self.config.curtsies_right_arrow_completion)
             self.cursor_offset = len(self.current_line)
             self.update_completion()
 
         elif e in ("KEY_DOWN",) + key_dispatch[self.config.down_one_line_key]:
             self.rl_history.enter(self.current_line)
-            self.current_line = self.rl_history.forward(False, search=True)
+            self.current_line = self.rl_history.forward(False,
+                    search=self.config.curtsies_right_arrow_completion)
             self.cursor_offset = len(self.current_line)
             self.update_completion()
         elif e in key_dispatch[self.config.search_key]: #TODO Not Implemented
@@ -664,6 +667,9 @@ def current_line_formatted(self):
         """The colored current line (no prompt, not wrapped)"""
         if self.config.syntax:
             fs = bpythonparse(format(self.tokenize(self.current_line), self.formatter))
+            if self.rl_history.saved_line in self.current_line:
+                if self.config.curtsies_right_arrow_completion:
+                    fs = fmtfuncs.on_magenta(self.rl_history.saved_line).join(fs.split(self.rl_history.saved_line))
             logging.debug('Display line %r -> %r', self.current_line, fs)
         else:
             fs = fmtstr(self.current_line)
@@ -707,7 +713,10 @@ def current_cursor_line_without_suggestion(self):
 
     @property
     def current_cursor_line(self):
-        return self.current_cursor_line_without_suggestion + fmtfuncs.bold(fmtfuncs.dark((self.current_suggestion)))
+        if self.config.curtsies_right_arrow_completion:
+            return self.current_cursor_line_without_suggestion + fmtfuncs.bold(fmtfuncs.dark((self.current_suggestion)))
+        else:
+            return self.current_cursor_line_without_suggestion
 
     @property
     def current_suggestion(self):
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -295,3 +295,15 @@ Default: False
 
 When there is space above the current line, whether the suggestions list will be
 displayed there instead of below the current line.
+
+right_arrow_completion
+^^^^^^^^^^^^^^^^^^^^^^
+Default: True
+
+Full line suggestion and completion (like fish shell and many web browsers).
+
+Full line completions are displayed under the cursor in gray.
+When the cursor is at the end of a line, pressing right arrow or ctrl-f will
+complete the full line.
+This option also turns on substring history search, highlighting the matching
+section in previous result.
