Fix one array usage.

jedi/api/classes.py

@@ -153,7 +153,7 @@ class BaseDefinition(object):
 
         if isinstance(stripped, (compiled.CompiledObject, mixed.MixedObject)):
             return stripped.api_type()
-        elif isinstance(stripped, iterable.Array):
+        elif isinstance(stripped, iterable.ArrayLiteralContext):
             return 'instance'
         elif isinstance(stripped, tree.Import):
             return 'import'
@@ -577,7 +577,7 @@ class Definition(use_metaclass(CachedMetaClass, BaseDefinition)):
             if typ == 'instance':
                 typ = 'class'  # The description should be similar to Py objects.
             d = typ + ' ' + d.name.get_code()
-        elif isinstance(d, iterable.Array):
+        elif isinstance(d, iterable.ArrayLiteralContext):
             d = 'class ' + d.type
         elif isinstance(d, (tree.Class, er.ClassContext, er.Instance)):
             d = 'class ' + unicode(d.name)

jedi/evaluate/__init__.py

@@ -386,7 +386,7 @@ class Evaluator(object):
 
                 if comp_for.type == 'comp_for':
                     return set([iterable.Comprehension.from_atom(self, atom)])
-            return set([iterable.Array(self, atom)])
+            return set([iterable.ArrayLiteralContext(self, context, atom)])
 
     def eval_trailer(self, context, types, trailer):
         trailer_op, node = trailer.children[:2]
@@ -395,7 +395,7 @@ class Evaluator(object):
 
         new_types = set()
         if trailer_op == '[':
-            new_types |= iterable.py__getitem__(self, types, trailer)
+            new_types |= iterable.py__getitem__(self, context, types, trailer)
         else:
             for typ in types:
                 debug.dbg('eval_trailer: %s in scope %s', trailer, typ)

jedi/evaluate/docstrings.py

@@ -23,7 +23,7 @@ from jedi.evaluate.cache import memoize_default
 from jedi.parser import ParserWithRecovery, load_grammar
 from jedi.parser.tree import Class
 from jedi.common import indent_block
-from jedi.evaluate.iterable import Array, FakeSequence, AlreadyEvaluated
+from jedi.evaluate.iterable import ArrayLiteralContext, FakeSequence, AlreadyEvaluated
 
 
 DOCSTRING_PARAM_PATTERNS = [
@@ -163,7 +163,7 @@ def _execute_array_values(evaluator, array):
     Tuples indicate that there's not just one return value, but the listed
     ones.  `(str, int)` means that it returns a tuple with both types.
     """
-    if isinstance(array, Array):
+    if isinstance(array, ArrayLiteralContext):
         values = []
         for types in array.py__iter__():
             objects = set(chain.from_iterable(_execute_array_values(evaluator, typ) for typ in types))

jedi/evaluate/filters.py

@@ -192,6 +192,7 @@ def get_global_filters(evaluator, context, until_position, origin_scope):
     """
     Returns all filters in order of priority for name resolution.
     """
+    from jedi.evaluate.representation import FunctionExecutionContext
     in_func = False
     while context is not None:
         if not (context.type == 'classdef' and in_func):
@@ -201,7 +202,7 @@ def get_global_filters(evaluator, context, until_position, origin_scope):
                     until_position=until_position,
                     origin_scope=origin_scope):
                 yield filter
-            if context.type == 'funcdef':
+            if isinstance(context, FunctionExecutionContext):
                 # The position should be reset if the current scope is a function.
                 until_position = None
                 in_func = True

jedi/evaluate/iterable.py

@@ -32,6 +32,12 @@ from jedi.evaluate import analysis
 from jedi.evaluate import pep0484
 from jedi import common
 from jedi.evaluate.filters import DictFilter
+from jedi.evaluate.context import Context
+
+
+class AbstractArrayContext(Context):
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        raise NotImplementedError
 
 
 class IterableWrapper(tree.Base):
@@ -40,6 +46,7 @@ class IterableWrapper(tree.Base):
 
     @memoize_default()
     def _get_names_dict(self, names_dict):
+        raise NotImplementedError
         builtin_methods = {}
         for cls in reversed(type(self).mro()):
             try:
@@ -339,26 +346,27 @@ class GeneratorComprehension(Comprehension, GeneratorMixin):
     pass
 
 
-class Array(IterableWrapper, ArrayMixin):
+class ArrayLiteralContext(AbstractArrayContext, ArrayMixin):
     mapping = {'(': 'tuple',
                '[': 'list',
                '{': 'dict'}
 
-    def __init__(self, evaluator, atom):
+    def __init__(self, evaluator, parent_context, atom):
-        self._evaluator = evaluator
+        super(ArrayLiteralContext, self).__init__(evaluator, parent_context)
         self.atom = atom
-        self.type = Array.mapping[atom.children[0]]
+        self._array_type = ArrayLiteralContext.mapping[atom.children[0]]
         """The builtin name of the array (list, set, tuple or dict)."""
 
         c = self.atom.children
         array_node = c[1]
-        if self.type == 'dict' and array_node != '}' \
+        if self._array_type == 'dict' and array_node != '}' \
-                and (not hasattr(array_node, 'children')
+                and (not hasattr(array_node, 'children') or ':' not in array_node.children):
-                     or ':' not in array_node.children):
+            self._array_type = 'set'
-            self.type = 'set'
 
     @property
     def name(self):
+        raise NotImplementedError
+        #return compiled.CompiledContextName(
         return helpers.FakeName(self.type, parent=self)
 
     def py__getitem__(self, index):
@@ -375,7 +383,7 @@ class Array(IterableWrapper, ArrayMixin):
         if isinstance(index, slice):
             return set([self])
         else:
-            return self._evaluator.eval_element(self._items()[index])
+            return self.parent_context.eval_node(self._items()[index])
 
     def __getattr__(self, name):
         if name not in ['start_pos', 'get_only_subelement', 'parent',
@@ -440,7 +448,7 @@ class Array(IterableWrapper, ArrayMixin):
         return "<%s of %s>" % (type(self).__name__, self.atom)
 
 
-class _FakeArray(Array):
+class _FakeArray(ArrayLiteralContext):
     def __init__(self, evaluator, container, type):
         self.type = type
         self._evaluator = evaluator
@@ -595,8 +603,8 @@ def py__iter__types(evaluator, types, node=None):
     return unite(py__iter__(evaluator, types, node))
 
 
-def py__getitem__(evaluator, types, trailer):
+def py__getitem__(evaluator, context, types, trailer):
-    from jedi.evaluate.representation import Class
+    from jedi.evaluate.representation import ClassContext
     result = set()
 
     trailer_op, node, trailer_cl = trailer.children
@@ -606,7 +614,7 @@ def py__getitem__(evaluator, types, trailer):
     # special case: PEP0484 typing module, see
     # https://github.com/davidhalter/jedi/issues/663
     for typ in list(types):
-        if isinstance(typ, Class):
+        if isinstance(typ, ClassContext):
             typing_module_types = \
                 pep0484.get_types_for_typing_module(evaluator, typ, node)
             if typing_module_types is not None:
@@ -617,7 +625,7 @@ def py__getitem__(evaluator, types, trailer):
         # all consumed by special cases
         return result
 
-    for index in create_index_types(evaluator, node):
+    for index in create_index_types(evaluator, context, node):
         if isinstance(index, (compiled.CompiledObject, Slice)):
             index = index.obj
 
@@ -849,7 +857,7 @@ class Slice(object):
             return slice(None, None, None)
 
 
-def create_index_types(evaluator, index):
+def create_index_types(evaluator, context, index):
     """
     Handles slices in subscript nodes.
     """
@@ -873,4 +881,4 @@ def create_index_types(evaluator, index):
         return set([Slice(evaluator, *result)])
 
     # No slices
-    return evaluator.eval_element(index)
+    return context.eval_node(index)