Merge pull request #1861 from qmmp123/master

Fix: #1847

jedi/inference/value/instance.py

@@ -1,6 +1,7 @@
 from abc import abstractproperty
 
 from parso.tree import search_ancestor
+from parso.python.tree import Name
 
 from jedi import debug
 from jedi import settings
@@ -231,6 +232,8 @@ class _BaseTreeInstance(AbstractInstanceValue):
             func_node = new
             new = search_ancestor(new, 'funcdef', 'classdef')
             if class_context.tree_node is new:
+                if isinstance(func_node, Name):
+                    func_node = new
                 func = FunctionValue.from_context(class_context, func_node)
                 bound_method = BoundMethod(self, class_context, func)
                 if func_node.name.value == '__init__':
@@ -582,6 +585,11 @@ class SelfAttributeFilter(ClassFilter):
                     #      filter.
                     if self._is_in_right_scope(trailer.parent.children[0], name):
                         yield name
+            elif trailer.type == "expr_stmt" \
+                and len(trailer.parent.children) == 2:
+                if name.is_definition() and self._access_possible(name):
+                    if trailer.children[1].type == "annassign":
+                        yield name
 
     def _is_in_right_scope(self, self_name, name):
         self_context = self._node_context.create_context(self_name)