Implement Self, fixes #2023, fixes #2068

jedi/inference/value/function.py

@@ -338,7 +338,7 @@ class BaseFunctionExecutionContext(ValueContext, TreeContextMixin):
                 return ValueSet(
                     GenericClass(c, TupleGenericManager(generics))
                     for c in async_generator_classes
-                ).execute_annotation()
+                ).execute_annotation(None)
             else:
                 async_classes = inference_state.typing_module.py__getattribute__('Coroutine')
                 return_values = self.get_return_values()
@@ -346,7 +346,7 @@ class BaseFunctionExecutionContext(ValueContext, TreeContextMixin):
                 generics = (return_values.py__class__(), NO_VALUES, NO_VALUES)
                 return ValueSet(
                     GenericClass(c, TupleGenericManager(generics)) for c in async_classes
-                ).execute_annotation()
+                ).execute_annotation(None)
         else:
             # If there are annotations, prefer them over anything else.
             if self.is_generator() and not self.infer_annotations():

jedi/inference/value/instance.py

@@ -506,7 +506,7 @@ class SelfName(TreeNameDefinition):
                 from jedi.inference.gradual.annotation import infer_annotation
                 values = infer_annotation(
                     self.parent_context, stmt.children[1].children[1]
-                ).execute_annotation()
+                ).execute_annotation(None)
                 if values:
                     return values
         return super().infer()

jedi/inference/value/iterable.py

@@ -44,7 +44,7 @@ class GeneratorBase(LazyAttributeOverwrite, IterableMixin):
     array_type = None
 
     def _get_wrapped_value(self):
-        instance, = self._get_cls().execute_annotation()
+        instance, = self._get_cls().execute_annotation(None)
         return instance
 
     def _get_cls(self):
@@ -214,7 +214,7 @@ class Sequence(LazyAttributeOverwrite, IterableMixin):
         c, = GenericClass(
             klass,
             TupleGenericManager(self._cached_generics())
-        ).execute_annotation()
+        ).execute_annotation(None)
         return c
 
     def py__bool__(self):