Add alternate autocomplete_mode

jasonLaster · jasonLaster · commit 34155ab6b3ee · 2012-07-07T15:11:23.000-04:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -56,6 +56,7 @@ def loadini(struct, configfile):
             'color_scheme': 'default',
             'complete_magic_methods' : True,
             'magic_methods' : MAGIC_METHODS,
+            'autocomplete_mode':2,
             'dedent_after': 1,
             'flush_output': True,
             'highlight_show_source': True,
@@ -147,6 +148,7 @@ def loadini(struct, configfile):
                                                       'complete_magic_methods')
     methods = config.get('general', 'magic_methods')
     struct.magic_methods = [meth.strip() for meth in methods.split(",")]
+    struct.autocomplete_mode = config.get('general', 'autocomplete_mode')
 
     struct.gtk_font = config.get('gtk', 'font')
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -22,6 +22,9 @@
 #
 
 from __future__ import with_statement
+import __builtin__
+import __main__
+
 import code
 import codecs
 import errno
@@ -384,6 +387,7 @@ def __init__(self, interp, config):
         # instance instead of the type, so we monkeypatch to prevent
         # side-effects (__getattr__/__getattribute__)
         self.completer._callable_postfix = self._callable_postfix
+        self.completer.global_matches = self.global_matches
         self.matches = []
         self.matches_iter = MatchesIterator()
         self.argspec = None
@@ -455,7 +459,7 @@ def attr_lookup(self, obj, expr, attr):
         matches = []
         n = len(attr)
         for word in words:
-            if word[:n] == attr and word != "__builtins__":
+            if self.method_match(word, n, attr) and word != "__builtins__":
                 matches.append("%s.%s" % (expr, word))
         return matches
 
@@ -495,6 +499,33 @@ def current_string(self, concatenate=False):
             return ''
         return ''.join(string)
 
+    def global_matches(self, text):
+        """Compute matches when text is a simple name.
+        Return a list of all keywords, built-in functions and names currently
+        defined in self.namespace that match.
+        """
+
+        hash = {}
+        n = len(text)
+        import keyword
+        for word in keyword.kwlist:
+            if self.method_match(word, n, text):
+                hash[word] = 1
+        for nspace in [__builtin__.__dict__, __main__.__dict__]:
+            for word, val in nspace.items():
+                if self.method_match(word, len(text), text) and word != "__builtins__":
+                    hash[self._callable_postfix(val, word)] = 1
+        matches = hash.keys()
+        matches.sort()
+        return matches
+
+    def method_match(self, word, size, text):
+        if self.config.autocomplete_mode == "1":
+            return word[:size] == text
+        else:
+            s = r'.*%s.*' % '.*'.join(list(text))
+            return re.search(s, word)
+
     def get_object(self, name):
         attributes = name.split('.')
         obj = eval(attributes.pop(0), self.interp.locals)
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -130,19 +130,26 @@ def test_update(self):
         self.assertNotEqual(list(slice), self.matches)
         self.assertEqual(list(newslice), newmatches)
 
-class TestRepl(repl.Repl):
+
+class FakeRepl(repl.Repl):
     def __init__(self):
         config_struct = config.Struct()
         config.loadini(config_struct, os.devnull)
         repl.Repl.__init__(self, repl.Interpreter(), config_struct)
         self.input_line = ""
+        self.current_word = ""
+        self.cpos = 0
 
     def current_line(self):
         return self.input_line
 
+    def cw(self):
+        return self.current_word
+
+
 class TestArgspec(unittest.TestCase):
     def setUp(self):
-        self.repl = TestRepl()
+        self.repl = FakeRepl()
         self.repl.push("def spam(a, b, c):\n", False)
         self.repl.push("    pass\n", False)
         self.repl.push("\n", False)
@@ -195,6 +202,32 @@ def test_nonexistent_name(self):
         self.setInputLine("spamspamspam(")
         self.assertFalse(self.repl.get_args())
 
+class TestRepl(unittest.TestCase):
+    def setUp(self):
+        self.repl = FakeRepl()
+        self.repl.config.autocomplete_mode = "1"
+
+
+    def test_default_complete(self):
+        self.repl.input_line = "d"
+        self.repl.current_word = "d"
+
+        self.assertTrue(self.repl.complete())
+        self.assertTrue(hasattr(self.repl.completer,'matches'))
+        self.assertEqual(self.repl.completer.matches,
+            ['def', 'del', 'delattr(', 'dict(', 'dir(', 'divmod('])
+
+    def test_alternate_complete(self):
+        self.repl.input_line = "doc"
+        self.repl.current_word = "doc"
+        self.repl.config.autocomplete_mode = "2"
+
+        self.assertTrue(self.repl.complete())
+        self.assertTrue(hasattr(self.repl.completer,'matches'))
+        self.assertEqual(self.repl.completer.matches,
+            ['UnboundLocalError(', '__doc__'])
+
+
 
 if __name__ == '__main__':
     unittest.main()
