Autocomplete dictionary keys if dictionary is declared globally.

mjzffr · mjzffr · commit 66a117c710d0 · 2014-03-29T16:05:48.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -53,6 +53,36 @@ 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__
+
+        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()]
+                else:
+                    # empty dictionary
+                    self.matches = []
+            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
@@ -507,11 +507,15 @@ def cw(self):
 
         # look from right to left for a bad method character
         l = len(self.s)
-        is_method_char = lambda c: c.isalnum() or c in ('.', '_')
+        #MAJA  is_method_or_dict_character, [ and \' major problem
+        is_method_char = lambda c: c.isalnum() or c in ('.',
+                                                        '_', '[', '\'', ']')
 
         if not self.s or not is_method_char(self.s[l-1]):
             return
 
+        #MAJA only dictionaries should have \' (TODO)
+
         for i in range(1, l+1):
             if not is_method_char(self.s[-i]):
                 i -= 1
@@ -1420,7 +1424,7 @@ def suspend(self):
             os.kill(os.getpid(), signal.SIGSTOP)
 
     def tab(self, back=False):
-        """Process the tab key being hit. 
+        """Process the tab key being hit.
 
         If there's only whitespace
         in the line or the line is blank then process a normal tab,
