Suggest full list of literal dictionary keys upon typing opening '['. Dict may be global, object attribute, etc. Method autocomplete unchanged

mjzffr · mjzffr · commit 37906c086f0b · 2014-04-22T17:40:05.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -63,26 +63,39 @@ def complete(self, text, state):
         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:
-                self.matches = self.attr_matches(text)
-                #print self.matches
-             # MAJA TODO: what if there's a dict in an object...?
-            elif "[" in text:
-                expr = text[:text.rindex('[')].lstrip()
-                obj = eval(expr, self.locals)
-                # use type() instead of hasattr?
-                if obj and hasattr(obj,'keys') and obj.keys():
-                    self.matches = [expr + "[%r]" % k for k in obj.keys()]
+                if dictpattern.match(text):
+                    complete_dict(text)
                 else:
-                    # empty dictionary
-                    self.matches = []
+                    # 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
@@ -505,19 +505,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)
-        #MAJA  is_method_or_dict_character, [ and \' major problem
-        is_method_char = lambda c: c.isalnum() or c in ('.',
-                                                        '_', '[', '\'', ']')
+        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
 
-        #MAJA only dictionaries should have \' (TODO)
-
         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
 
