update tab method to support new complete types

jasonLaster · jasonLaster · commit faab6a89967f · 2012-07-18T23:56:52.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -27,7 +27,15 @@
 import re
 from bpython import inspection
 
-
+# Needed for special handling of __abstractmethods__
+# abc only exists since 2.6, so check both that it exists and that it's
+# the one we're expecting
+try:
+    import abc
+    abc.ABCMeta
+    has_abc = True
+except (ImportError, AttributeError):
+    has_abc = False
 
 class Autocomplete(rlcompleter.Completer):
     """
@@ -102,7 +110,7 @@ def global_matches(self, text):
         for word in keyword.kwlist:
             if self.method_match(word, n, text):
                 hash[word] = 1
-        for nspace in [__builtin__.__dict__, __main__.__dict__]:
+        for nspace in [__builtin__.__dict__, self.namespace]:
             for word, val in nspace.items():
                 if self.method_match(word, len(text), text) and word != "__builtins__":
                     hash[self._callable_postfix(val, word)] = 1
@@ -111,8 +119,11 @@ def global_matches(self, text):
         return matches
 
     def method_match(self, word, size, text):
-        if self.autocomplete_mode == "1":
+        if self.autocomplete_mode == 1:
             return word[:size] == text
+        elif self.autocomplete_mode == 2:
+            s = r'.*%s.*' % text
+            return re.search(s, word)
         else:
             s = r'.*%s.*' % '.*'.join(list(text))
             return re.search(s, word)
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1089,7 +1089,7 @@ def repl(self):
         """Initialise the repl and jump into the loop. This method also has to
         keep a stack of lines entered for the horrible "undo" feature. It also
         tracks everything that would normally go to stdout in the normal Python
-        interpreter so it can quickly write it to stdout on exit after
+        interpreter so it can quickly write it to st on exit after
         curses.endwin(), as well as a history of lines entered for using
         up/down to go back and forth (which has to be separate to the
         evaluation history, which will be truncated when undoing."""
@@ -1404,6 +1404,8 @@ def tab(self, back=False):
         and don't indent if there are only whitespace in the line.
         """
 
+        mode = self.config.autocomplete_mode
+
         # 1. check if we should add a tab character
         if self.atbol() and not back:
             x_pos = len(self.s) - self.cpos
@@ -1427,21 +1429,29 @@ def tab(self, back=False):
         else:
             cw = self.matches_iter.current_word
 
-        # check to see if we can expand the current word
-        b = os.path.commonprefix(self.matches)
-        if b and self.config.autocomplete_mode == 1:
-            expanded_string = b[len(cw):]
+        # 3. check to see if we can expand the current word
+        cseq = None
+        if mode == 2:
+            if all([len(match.split(cw)) == 2 for match in self.matches]):
+                seq = [cw + match.split(cw)[1] for match in self.matches]
+                cseq = os.path.commonprefix(seq)
+        else:
+            seq = self.matches
+            cseq = os.path.commonprefix(seq)
+
+        if cseq and mode != 3:
+            expanded_string = cseq[len(cw):]
             self.s += expanded_string
             expanded = bool(expanded_string)
             self.print_line(self.s)
             if len(self.matches) == 1 and self.config.auto_display_list:
                 self.scr.touchwin()
             if expanded:
-                self.matches_iter.update(b, self.matches)
+                self.matches_iter.update(cseq, self.matches)
         else:
             expanded = False
 
-        # swap current word for a match list item
+        # 4. swap current word for a match list item
         if not expanded and self.matches:
             # reset s if this is the nth result
             if self.matches_iter:
@@ -1464,7 +1474,7 @@ def tab(self, back=False):
                 if self.config.autocomplete_mode == 1:
                     self.s += current_match[len(cw):]
                 else:
-                    self.s = current_match
+                    self.s = self.s[:-len(cw)] + current_match
 
                 self.print_line(self.s, True)
         return True
diff --git a/bpython/config.py b/bpython/config.py
@@ -148,7 +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.autocomplete_mode = config.getint('general', 'autocomplete_mode')
 
     struct.gtk_font = config.get('gtk', 'font')
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -49,16 +49,6 @@
 from bpython.formatter import Parenthesis
 from bpython.autocomplete import Autocomplete
 
-# Needed for special handling of __abstractmethods__
-# abc only exists since 2.6, so check both that it exists and that it's
-# the one we're expecting
-try:
-    import abc
-    abc.ABCMeta
-    has_abc = True
-except (ImportError, AttributeError):
-    has_abc = False
-
 py3 = sys.version_info[0] == 3
 
 
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
