Docstring should also be evaluated in class definitions. Fixes #631.

jedi/evaluate/docstrings.py

@@ -21,6 +21,7 @@ from textwrap import dedent
 
 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
 
@@ -174,13 +175,21 @@ def _execute_array_values(evaluator, array):
 
 @memoize_default(None, evaluator_is_first_arg=True)
 def follow_param(evaluator, param):
-    func = param.parent_function
+    def eval_docstring(docstring):
-
         return set(
-        [p for param_str in _search_param_in_docstr(func.raw_doc,
+            [p for param_str in _search_param_in_docstr(docstring, str(param.name))
-                                                    str(param.name))
+                for p in _evaluate_for_statement_string(evaluator, param_str, module)]
-            for p in _evaluate_for_statement_string(evaluator, param_str,
+        )
-                                                    param.get_parent_until())])
+    func = param.parent_function
+    module = param.get_parent_until()
+
+    types = eval_docstring(func.raw_doc)
+    if func.name.value == '__init__':
+        cls = func.get_parent_until(Class)
+        if cls.type == 'classdef':
+            types |= eval_docstring(cls.raw_doc)
+
+    return types
 
 
 @memoize_default(None, evaluator_is_first_arg=True)

test/completion/docstring.py

@@ -177,3 +177,44 @@ d = ''
 """ bsdf """
 #? str()
 d.upper()
+
+# -----------------
+# class docstrings
+# -----------------
+
+class InInit():
+    def __init__(self, foo):
+        """
+        :type foo: str
+        """
+        #? str()
+        foo
+
+
+class InClass():
+    """
+    :type foo: str
+    """
+    def __init__(self, foo):
+        #? str()
+        foo
+
+
+class InBoth():
+    """
+    :type foo: str
+    """
+    def __init__(self, foo):
+        """
+        :type foo: int
+        """
+        #? str() int()
+        foo
+
+
+def __init__(foo):
+    """
+    :type foo: str
+    """
+    #? str()
+    foo