Allow global completion in brackets

thomasballinger · thomasballinger · commit 58f3edfb2687 · 2015-11-28T15:21:22.000-05:00
Make DictKeyCompletion return None when no matches found so other
completers can take over. Perhaps ideal would be comulative, but
this seems like good behavior -- it's clear to the user in most cases
that what's now being completed are keys, then other completion.
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -387,12 +387,13 @@ def matches(self, cursor_offset, line, **kwargs):
         try:
             obj = safe_eval(dexpr, locals_)
         except EvaluationError:
-            return set()
+            return None
         if isinstance(obj, dict) and obj.keys():
-            return set("{0!r}]".format(k) for k in obj.keys()
-                       if repr(k).startswith(r.word))
+            matches = set("{0!r}]".format(k) for k in obj.keys()
+                          if repr(k).startswith(r.word))
+            return matches if matches else None
         else:
-            return set()
+            return None
 
     def locate(self, current_offset, line):
         return lineparts.current_dict_key(current_offset, line)
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -190,20 +190,25 @@ def test_set_of_keys_returned_when_matches_found(self):
         self.assertSetEqual(com.matches(2, "d[", locals_=local),
                             set(["'ab']", "'cd']"]))
 
-    def test_empty_set_returned_when_eval_error(self):
+    def test_none_returned_when_eval_error(self):
         com = autocomplete.DictKeyCompletion()
         local = {'e': {"ab": 1, "cd": 2}}
-        self.assertSetEqual(com.matches(2, "d[", locals_=local), set())
+        self.assertEqual(com.matches(2, "d[", locals_=local), None)
 
-    def test_empty_set_returned_when_not_dict_type(self):
+    def test_none_returned_when_not_dict_type(self):
         com = autocomplete.DictKeyCompletion()
         local = {'l': ["ab", "cd"]}
-        self.assertSetEqual(com.matches(2, "l[", locals_=local), set())
+        self.assertEqual(com.matches(2, "l[", locals_=local), None)
+
+    def test_none_returned_when_no_matches_left(self):
+        com = autocomplete.DictKeyCompletion()
+        local = {'d': {"ab": 1, "cd": 2}}
+        self.assertEqual(com.matches(3, "d[r", locals_=local), None)
 
     def test_obj_that_does_not_allow_conversion_to_bool(self):
         com = autocomplete.DictKeyCompletion()
         local = {'mNumPy': MockNumPy()}
-        self.assertSetEqual(com.matches(7, "mNumPy[", locals_=local), set())
+        self.assertEqual(com.matches(7, "mNumPy[", locals_=local), None)
 
 
 class Foo(object):
