dictionary completion working! Bring on the custom completion!

thomasballinger · thomasballinger · commit f1edce96d812 · 2014-07-06T13:28:20.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -25,7 +25,7 @@
 import __builtin__
 import __main__
 import rlcompleter
-import line
+import line as lineparts
 import re
 import os
 from glob import glob
@@ -210,6 +210,10 @@ def get_completer(cursor_offset, current_line, locals_, argspec, config, magic_m
     if matches is not None:
         return sorted(set(matches)), FilenameCompletion
 
+    matches = DictKeyCompletion.matches(cursor_offset, current_line, locals_=locals_, config=config)
+    if matches is not None:
+        return sorted(set(matches)), DictKeyCompletion
+
     matches = AttrCompletion.matches(cursor_offset, current_line, locals_=locals_, config=config)
     if matches is not None:
         cw = AttrCompletion.locate(cursor_offset, current_line)[2]
@@ -264,18 +268,18 @@ def substitute(cls, cursor_offset, line, match):
 
 class ImportCompletion(BaseCompletionType):
     matches = staticmethod(importcompletion.complete)
-    locate = staticmethod(line.current_word)
+    locate = staticmethod(lineparts.current_word)
     format = staticmethod(after_last_dot)
 
 class FilenameCompletion(BaseCompletionType):
     shown_before_tab = False
     @classmethod
     def matches(cls, cursor_offset, current_line):
-        cs = line.current_string(cursor_offset, current_line)
+        cs = lineparts.current_string(cursor_offset, current_line)
         if cs is None:
             return None
         return filename_matches(cs[2])
-    locate = staticmethod(line.current_string)
+    locate = staticmethod(lineparts.current_string)
     format = staticmethod(last_part_of_filename)
 
 class AttrCompletion(BaseCompletionType):
@@ -292,9 +296,25 @@ def matches(cls, cursor_offset, line, locals_, config):
             # possibly be raised here, so if anyone wants to do that, feel free to send me
             # a patch. XXX: Make sure you raise here if you're debugging the completion
             # stuff !
-            e = True
-            raise
-        else:
-            e = False
-    locate = staticmethod(line.current_word)
+            pass
+        return None
+    locate = staticmethod(lineparts.current_word)
     format = staticmethod(after_last_dot)
+
+class DictKeyCompletion(BaseCompletionType):
+    locate = staticmethod(lineparts.current_dict_key)
+    @classmethod
+    def matches(cls, cursor_offset, line, locals_, config):
+        r = cls.locate(cursor_offset, line)
+        if r is None:
+            return None
+        start, end, orig = r
+        _, _, dexpr = lineparts.current_dict(cursor_offset, line)
+        obj = eval(dexpr, locals_)
+        if obj and isinstance(obj, type({})) and obj.keys():
+            return ["{!r}]".format(k) for k in obj.keys() if repr(k).startswith(orig)]
+        else:
+            return []
+    @classmethod
+    def format(cls, match):
+        return match[:-1]
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1436,7 +1436,12 @@ def tab(self, back=False):
 
         # 3. check to see if we can expand the current word
         if self.matches_iter.is_cseq():
-            self.cursor_offset, self.s = self.matches_iter.substitute_cseq()
+            #TODO resolve this error-prone situation:
+            # can't assign at same time to self.s and self.cursor_offest
+            # because for cursor_offset
+            # property to work correctly, self.s must already be set
+            temp_cursor_offset, self.s = self.matches_iter.substitute_cseq()
+            self.cursor_offset = temp_cursor_offset
             self.print_line(self.s)
             if not self.matches_iter:
                 self.complete()
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -738,7 +738,7 @@ def paint(self, about_to_exit=False, user_quit=False):
             visible_space_below = min_height - current_line_end_row - 1
 
             info_max_rows = max(visible_space_above, visible_space_below)
-            infobox = paint.paint_infobox(info_max_rows, int(width * self.config.cli_suggestion_width), self.matches_iter.matches, self.argspec, self.current_match, self.docstring, self.config)
+            infobox = paint.paint_infobox(info_max_rows, int(width * self.config.cli_suggestion_width), self.matches_iter.matches, self.argspec, self.current_match, self.docstring, self.config, self.matches_iter.completer.format)
 
             if visible_space_above >= infobox.height and self.config.curtsies_list_above:
                 arr[current_line_start_row - infobox.height:current_line_start_row, 0:infobox.width] = infobox
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -39,22 +39,17 @@ def paint_current_line(rows, columns, current_display_line):
     lines = display_linize(current_display_line, columns, True)
     return fsarray(lines, width=columns)
 
-def matches_lines(rows, columns, matches, current, config):
+def matches_lines(rows, columns, matches, current, config, format):
     highlight_color = func_for_letter(config.color_scheme['operator'].lower())
 
     if not matches:
         return []
     color = func_for_letter(config.color_scheme['main'])
     max_match_width = max(len(m) for m in matches)
     words_wide = max(1, (columns - 1) // (max_match_width + 1))
-    if os.path.sep in matches[0]: # filename completion
-        pass
-    elif '.' in matches[0]:
-        matches = [m.rstrip('.').rsplit('.')[-1] for m in matches]
-        if current:
-            current = current.rstrip('.').rsplit('.')[-1]
-    else:
-        pass
+    matches = [format(m) for m in matches]
+    if current:
+        current = format(current)
 
     matches_lines = [fmtstr(' ').join(color(m.ljust(max_match_width))
                                       if m != current
@@ -147,13 +142,13 @@ def formatted_docstring(docstring, columns, config):
     return sum(([color(x) for x in (display_linize(line, columns) if line else fmtstr(''))]
                 for line in docstring.split('\n')), [])
 
-def paint_infobox(rows, columns, matches, argspec, match, docstring, config):
+def paint_infobox(rows, columns, matches, argspec, match, docstring, config, format):
     """Returns painted completions, argspec, match, docstring etc."""
     if not (rows and columns):
         return fsarray(0, 0)
     width = columns - 4
     lines = ((formatted_argspec(argspec, width, config) if argspec else []) +
-             (matches_lines(rows, width, matches, match, config) if matches else []) +
+             (matches_lines(rows, width, matches, match, config, format) if matches else []) +
              (formatted_docstring(docstring, width, config) if docstring else []))
 
     output_lines = []
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -308,8 +308,6 @@ def cur_line(self):
 
     def substitute(self, match):
         """Returns a cursor offset and line with match substituted in"""
-        if match.startswith("'"):
-            raise ValueError(match)
         start, end, word = self.completer.locate(self.orig_cursor_offset, self.orig_line)
         result = start + len(match), self.orig_line[:start] + match + self.orig_line[end:]
         return result
@@ -321,9 +319,12 @@ def substitute_cseq(self):
         """Returns a new line by substituting a common sequence in, and update matches"""
         cseq = os.path.commonprefix(self.matches)
         new_cursor_offset, new_line = self.substitute(cseq)
-        self.update(new_cursor_offset, new_line, self.matches, self.completer)
         if len(self.matches) == 1:
             self.clear()
+        else:
+            self.update(new_cursor_offset, new_line, self.matches, self.completer)
+            if len(self.matches) == 1:
+                self.clear()
         return new_cursor_offset, new_line
 
     def update(self, cursor_offset, current_line, matches, completer):
@@ -335,7 +336,7 @@ def update(self, cursor_offset, current_line, matches, completer):
         assert matches is not None
         self.matches = matches
         self.completer = completer
-        assert self.completer.locate(self.orig_cursor_offset, self.orig_line) is not None
+        assert self.completer.locate(self.orig_cursor_offset, self.orig_line) is not None, (self.completer.locate, self.orig_cursor_offset, self.orig_line)
         self.index = -1
         self.start, self.end, self.current_word = self.completer.locate(self.orig_cursor_offset, self.orig_line)
 
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -131,6 +131,7 @@ def test_simple(self):
         self.assertAccess('asdf[<(1,>|]')
         self.assertAccess('asdf[<(1, >|]')
         self.assertAccess('asdf[<(1, 2)>|]')
+        self.assertAccess('d[d[<12|>')
 
 class TestCurrentDict(LineTestCase):
     def setUp(self):
