Remove ArrayItemMembersCompletion

thomasballinger · thomasballinger · commit ce0bd0a3fa60 · 2015-12-14T17:39:19.000-05:00
functionality taken over by more general ExpressionAttributeCompletion
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -340,63 +340,6 @@ 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_']
-
-        full = self.locate(cursor_offset, line)
-        if full is None:
-            return None
-
-        arr = lineparts.current_indexed_member_access_identifier(
-                cursor_offset, line)
-        index = lineparts.current_indexed_member_access_identifier_with_index(
-                cursor_offset, line)
-        member = lineparts.current_indexed_member_access_member(
-                cursor_offset, line)
-
-        try:
-            obj = safe_eval(arr.word, locals_)
-        except EvaluationError:
-            return None
-        if type(obj) not in (list, tuple) + string_types:
-            # then is may be unsafe to do attribute lookup on it
-            return None
-
-        try:
-            locals_['temp_val_from_array'] = safe_eval(index.word, locals_)
-        except (EvaluationError, IndexError):
-            return None
-
-        temp_line = line.replace(index.word, 'temp_val_from_array.')
-
-        matches = self.completer.matches(len(temp_line), temp_line, **kwargs)
-        if matches is None:
-            return None
-
-        matches_with_correct_name = \
-            set(match.replace('temp_val_from_array.', index.word+'.')
-                for match in matches if match[20:].startswith(member.word))
-
-        del locals_['temp_val_from_array']
-
-        return matches_with_correct_name
-
-    def locate(self, current_offset, line):
-        a = lineparts.current_indexed_member_access(current_offset, line)
-        return a
-
-    def format(self, match):
-        return after_last_dot(match)
-
-
 class DictKeyCompletion(BaseCompletionType):
 
     def matches(self, cursor_offset, line, **kwargs):
@@ -526,8 +469,7 @@ def locate(self, current_offset, line):
 
 
 class ExpressionAttributeCompletion(AttrCompletion):
-    # could replace ArrayItemMember completion and attr completion
-    # as a more general case
+    # could replace attr completion as a more general case with some work
     def locate(self, current_offset, line):
         return lineparts.current_expression_attribute(current_offset, line)
 
@@ -676,7 +618,6 @@ def get_default_completer(mode=SIMPLE):
                             mode=mode),
         AttrCompletion(mode=mode),
         ExpressionAttributeCompletion(mode=mode),
-        ArrayItemMembersCompletion(mode=mode),
     )
 
 
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -268,20 +268,20 @@ def __getattr__(self, attr):
                       self.com.matches(4, 'a.__', locals_=locals_))
 
 
-class TestArrayItemCompletion(unittest.TestCase):
+class TestExpressionAttributeCompletion(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.com = autocomplete.ArrayItemMembersCompletion()
+        cls.com = autocomplete.ExpressionAttributeCompletion()
 
     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']))
+                            set(['method', 'a', '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']))
+                            set(['method', 'a', 'b']))
 
     def test_other_getitem_methods_not_called(self):
         class FakeList(object):
@@ -293,14 +293,14 @@ def __getitem__(inner_self, i):
     def test_tuples_complete(self):
         self.assertSetEqual(self.com.matches(5, 'a[0].',
                             locals_={'a': (Foo(),)}),
-                            set(['a[0].method', 'a[0].a', 'a[0].b']))
+                            set(['method', 'a', 'b']))
 
     @unittest.skip('TODO, subclasses do not complete yet')
     def test_list_subclasses_complete(self):
         class ListSubclass(list): pass
         self.assertSetEqual(self.com.matches(5, 'a[0].',
                             locals_={'a': ListSubclass([Foo()])}),
-                            set(['a[0].method', 'a[0].a', 'a[0].b']))
+                            set(['method', 'a', 'b']))
 
     def test_getitem_not_called_in_list_subclasses_overriding_getitem(self):
         class FakeList(list):
