Merged in mjzffr/bpython (pull request bpython#41)

sebastinas · sebastinas · commit e2e9b8fadd49 · 2014-05-09T17:43:29.000+02:00
Autocomplete for dictionary keys (Fixes bpython#226)
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -54,6 +54,49 @@ def __init__(self, namespace = None, config = None):
         else:
             self.autocomplete_mode = SUBSTRING
 
+    def complete(self, text, state):
+        """Return the next possible completion for 'text'.
+
+        This is called successively with state == 0, 1, 2, ... until it
+        returns None.  The completion should begin with 'text'.
+
+        """
+        if self.use_main_ns:
+            self.namespace = __main__.__dict__
+
+        dictpattern = re.compile('[^\[\]]+\[$')
+        def complete_dict(text):
+            lastbracket_index = text.rindex('[')
+            dexpr = text[:lastbracket_index].lstrip()
+            obj = eval(dexpr, self.locals)
+            if obj and isinstance(obj, type({})) and obj.keys():
+                self.matches = [dexpr + "[{!r}]".format(k) for k in obj.keys()]
+            else:
+                # empty dictionary
+                self.matches = []
+
+        if state == 0:
+            if "." in text:
+                if dictpattern.match(text):
+                    complete_dict(text)
+                else:
+                    # Examples: 'foo.b' or 'foo[bar.'
+                    for i in range(1, len(text) + 1):
+                        if text[-i] == '[':
+                            i -= 1
+                            break
+                    methodtext = text[-i:]
+                    self.matches = [''.join([text[:-i], m]) for m in
+                                    self.attr_matches(methodtext)]
+            elif dictpattern.match(text):
+                complete_dict(text)
+            else:
+                self.matches = self.global_matches(text)
+        try:
+            return self.matches[state]
+        except IndexError:
+            return None
+
     def attr_matches(self, text):
         """Taken from rlcompleter.py and bent to my will.
         """
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -512,15 +512,18 @@ def cw(self):
         # isn't at the end of the line, but that's what this does for now.
         if self.cpos: return
 
-        # look from right to left for a bad method character
+        # look from right to left for a bad method or dictionary character
         l = len(self.s)
         is_method_char = lambda c: c.isalnum() or c in ('.', '_')
+        dict_chars = ['[']
 
-        if not self.s or not is_method_char(self.s[l-1]):
+        if not self.s or not (is_method_char(self.s[-1])
+                                or self.s[-1] in dict_chars):
             return
 
         for i in range(1, l+1):
-            if not is_method_char(self.s[-i]):
+            c = self.s[-i]
+            if not (is_method_char(c) or c in dict_chars):
                 i -= 1
                 break
 
@@ -1281,15 +1284,22 @@ def show_list(self, items, topline=None, current_item=None):
             max_h = y + 1
         max_w = int(w * self.config.cli_suggestion_width)
         self.list_win.erase()
+
         if items:
             sep = '.'
-            if os.path.sep in items[0]:
-                # Filename completion
-                sep = os.path.sep
-            if sep in items[0]:
-                items = [x.rstrip(sep).rsplit(sep)[-1] for x in items]
+            separators = ['.', os.path.sep, '[']
+            lastindex = max([items[0].rfind(c) for c in separators])
+            if lastindex > -1:
+                sep = items[0][lastindex]
+            items = [x.rstrip(sep).rsplit(sep)[-1] for x in items]
+            if current_item:
+                current_item = current_item.rstrip(sep).rsplit(sep)[-1]
+
+            if items[0].endswith(']'):
+                # dictionary key suggestions
+                items = [x.rstrip(']') for x in items]
                 if current_item:
-                    current_item = current_item.rstrip(sep).rsplit(sep)[-1]
+                    current_item = current_item.rstrip(']')
 
         if topline:
             height_offset = self.mkargspec(topline, down) + 1
