Move predefine_names to context

jedi/inference/value/function.py

@@ -7,7 +7,6 @@ from jedi.inference import compiled
 from jedi.inference import recursion
 from jedi.inference import docstrings
 from jedi.inference import flow_analysis
-from jedi.inference import helpers
 from jedi.inference.signature import TreeSignature
 from jedi.inference.arguments import AnonymousArguments
 from jedi.inference.filters import ParserTreeFilter, FunctionExecutionFilter
@@ -274,7 +273,7 @@ class FunctionExecutionContext(ValueContext, TreeContextMixin):
                 ordered = list(ordered)
                 for lazy_value in ordered:
                     dct = {str(for_stmt.children[1].value): lazy_value.infer()}
-                    with helpers.predefine_names(self, for_stmt, dct):
+                    with self.predefine_names(for_stmt, dct):
                         for yield_in_same_for_stmt in yields:
                             for result in self._get_yield_lazy_value(yield_in_same_for_stmt):
                                 yield result

jedi/inference/value/iterable.py

@@ -31,8 +31,7 @@ from jedi.inference import recursion
 from jedi.inference.lazy_value import LazyKnownValue, LazyKnownValues, \
     LazyTreeValue
 from jedi.inference.helpers import get_int_or_none, is_string, \
-    predefine_names, infer_call_of_leaf, reraise_getitem_errors, \
-    SimpleGetItemNotFound
+    infer_call_of_leaf, reraise_getitem_errors, SimpleGetItemNotFound
 from jedi.inference.utils import safe_property, to_list
 from jedi.inference.cache import inference_state_method_cache
 from jedi.inference.filters import LazyAttributeOverwrite, publish_method
@@ -173,7 +172,7 @@ class ComprehensionMixin(object):
                 parent_context,
                 comp_for,
             )
-            with predefine_names(context, comp_for, dct):
+            with context.predefine_names(comp_for, dct):
                 try:
                     for result in self._nested(comp_fors[1:], context):
                         yield result