fix dictionary autocompletion

thomasballinger · thomasballinger · commit 22e013137194 · 2014-07-27T13:18:01.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -68,19 +68,19 @@ def get_completer(cursor_offset, current_line, locals_, argspec, full_code, mode
     kwargs = {'locals_':locals_, 'argspec':argspec, 'full_code':full_code,
               'mode':mode, 'complete_magic_methods':complete_magic_methods}
 
+    # mutually exclusive if matches: If one of these returns [], try the next one
+    for completer in [DictKeyCompletion]:
+        matches = completer.matches(cursor_offset, current_line, **kwargs)
+        if matches:
+            return sorted(set(matches)), completer
+
     # mutually exclusive matchers: if one returns [], don't go on
     for completer in [StringLiteralAttrCompletion, ImportCompletion,
             FilenameCompletion, MagicMethodCompletion, GlobalCompletion]:
         matches = completer.matches(cursor_offset, current_line, **kwargs)
         if matches is not None:
             return sorted(set(matches)), completer
 
-    # mutually exclusive if matches: If one of these returns [], try the next one
-    for completer in [DictKeyCompletion]:
-        matches = completer.matches(cursor_offset, current_line, **kwargs)
-        if matches:
-            return sorted(set(matches)), completer
-
     matches = AttrCompletion.matches(cursor_offset, current_line, **kwargs)
 
     # cumulative completions - try them all
