Merge branch 'array-item-autocomplete'

thomasballinger · thomasballinger · commit 4d9767b04864 · 2015-11-28T14:45:44.000-05:00
This implementation modifies the interpreter locals dictionary,
which was required to reuse more code.
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -335,6 +335,44 @@ def list_attributes(self, obj):
                 return dir(obj)
 
 
+class ArrayItemMembersCompletion(BaseCompletionType):
+
+    def __init__(self, shown_before_tab=True, mode=SIMPLE):
+        self._shown_before_tab = shown_before_tab
+        self.completer = AttrCompletion(mode=mode)
+
+    def matches(self, cursor_offset, line, **kwargs):
+        if 'locals_' not in kwargs:
+            return None
+        locals_ = kwargs['locals_']
+
+        r = self.locate(cursor_offset, line)
+        if r is None:
+            return None
+        member_part = r[2]
+        _, _, dexpr = lineparts.current_array_with_indexer(cursor_offset, line)
+        try:
+            locals_['temp_val_from_array'] = safe_eval(dexpr, locals_)
+        except (EvaluationError, IndexError):
+            return set()
+
+        temp_line = line.replace(member_part, 'temp_val_from_array.')
+
+        matches = self.completer.matches(len(temp_line), temp_line, **kwargs)
+        matches_with_correct_name = \
+            set(match.replace('temp_val_from_array.', member_part) for match in matches)
+
+        del locals_['temp_val_from_array']
+
+        return matches_with_correct_name
+
+    def locate(self, current_offset, line):
+        return lineparts.current_array_item_member_name(current_offset, line)
+
+    def format(self, match):
+        return after_last_dot(match)
+
+
 class DictKeyCompletion(BaseCompletionType):
 
     def matches(self, cursor_offset, line, **kwargs):
@@ -565,6 +603,7 @@ def get_default_completer(mode=SIMPLE):
         MagicMethodCompletion(mode=mode),
         MultilineJediCompletion(mode=mode),
         GlobalCompletion(mode=mode),
+        ArrayItemMembersCompletion(mode=mode),
         CumulativeCompleter((AttrCompletion(mode=mode),
                              ParameterNameCompletion(mode=mode)),
                             mode=mode)
diff --git a/bpython/line.py b/bpython/line.py
@@ -226,3 +226,27 @@ def current_string_literal_attr(cursor_offset, line):
         if m.start(4) <= cursor_offset and m.end(4) >= cursor_offset:
             return LinePart(m.start(4), m.end(4), m.group(4))
     return None
+
+
+current_array_with_indexer_re = LazyReCompile(
+    r'''([\w_][\w0-9._]*(?:\[[a-zA-Z0-9_"']+\])+)\.(.*)''')
+
+
+def current_array_with_indexer(cursor_offset, line):
+    """an array and indexer, e.g. foo[1]"""
+    matches = current_array_with_indexer_re.finditer(line)
+    for m in matches:
+        if m.start(1) <= cursor_offset and m.end(1) <= cursor_offset:
+            return LinePart(m.start(1), m.end(1), m.group(1))
+
+
+current_array_item_member_name_re = LazyReCompile(
+    r'''([\w_][\w0-9._]*(?:\[[a-zA-Z0-9_"']+\])+\.)(.*)''')
+
+
+def current_array_item_member_name(cursor_offset, line):
+    """the member name after an array indexer, e.g. foo[1].bar"""
+    matches = current_array_item_member_name_re.finditer(line)
+    for m in matches:
+        if m.start(2) <= cursor_offset and m.end(2) >= cursor_offset:
+            return LinePart(m.start(1), m.end(2), m.group(1))
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -263,6 +263,22 @@ def __getattr__(self, attr):
                       self.com.matches(4, 'a.__', locals_=locals_))
 
 
+class TestArrayItemCompletion(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.com = autocomplete.ArrayItemMembersCompletion()
+
+    def test_att_matches_found_on_instance(self):
+        self.assertSetEqual(self.com.matches(5, 'a[0].', locals_={'a': [Foo()]}),
+                            set(['a[0].method', 'a[0].a', 'a[0].b']))
+
+    @skip_old_style
+    def test_att_matches_found_on_old_style_instance(self):
+        self.assertSetEqual(self.com.matches(5, 'a[0].',
+                                             locals_={'a': [OldStyleFoo()]}),
+                            set(['a[0].method', 'a[0].a', 'a[0].b']))
+
+
 class TestMagicMethodCompletion(unittest.TestCase):
 
     def test_magic_methods_complete_after_double_underscores(self):
