Better signature support for docstrings

jedi/api/classes.py

@@ -678,6 +678,13 @@ class CallSignature(Definition):
         )
 
 
+def _format_signatures(context):
+    return '\n'.join(
+        signature.to_string()
+        for signature in context.get_signatures()
+    )
+
+
 class _Help(object):
     """
     Temporary implementation, will be used as `Script.help() or something in
@@ -702,15 +709,29 @@ class _Help(object):
 
         See :attr:`doc` for example.
         """
+        full_doc = ''
         # Using the first docstring that we see.
         for context in self._get_contexts(fast=fast):
-            doc = context.py__doc__(include_call_signature=not raw)
+            if full_doc:
-            if doc:
+                # In case we have multiple contexts, just return all of them
-                return doc
+                # separated by a few dashes.
-            if not context.is_stub():
+                full_doc += '\n' + '-' * 30 + '\n'
-                for c in stub_to_actual_context_set(context):
-                    doc = c.py__doc__(include_call_signature=not raw)
-                    if doc:
-                        return doc
 
-        return ''
+            doc = context.py__doc__()
+
+            if raw:
+                signature_text = ''
+            else:
+                signature_text = _format_signatures(context)
+            if not doc and context.is_stub():
+                for c in stub_to_actual_context_set(context):
+                    doc = c.py__doc__()
+                    if doc:
+                        break
+
+            if signature_text and doc:
+                full_doc += signature_text + '\n\n' + doc
+            else:
+                full_doc += signature_text + doc
+
+        return full_doc

jedi/api/keywords.py

@@ -44,7 +44,7 @@ class Keyword(object):
         """ For a `parsing.Name` like comparision """
         return [self.name]
 
-    def py__doc__(self, include_call_signature=False):
+    def py__doc__(self):
         return imitate_pydoc(self.name.string_name)
 
     def __repr__(self):

jedi/evaluate/base_context.py

@@ -12,7 +12,7 @@ from parso.python.tree import ExprStmt, CompFor
 
 from jedi import debug
 from jedi._compatibility import Python3Method, zip_longest, unicode
-from jedi.parser_utils import clean_scope_docstring, get_doc_with_call_signature
+from jedi.parser_utils import clean_scope_docstring
 from jedi.common import BaseContextSet, BaseContext
 from jedi.evaluate.helpers import SimpleGetItemNotFound, execute_evaluated
 from jedi.evaluate.utils import safe_property
@@ -168,16 +168,13 @@ class Context(HelperContextMixin, BaseContext):
         """
         return True
 
-    def py__doc__(self, include_call_signature=False):
+    def py__doc__(self):
         try:
             self.tree_node.get_doc_node
         except AttributeError:
             return ''
         else:
-            if include_call_signature:
+            return clean_scope_docstring(self.tree_node)
-                return get_doc_with_call_signature(self.tree_node)
-            else:
-                return clean_scope_docstring(self.tree_node)
         return None
 
     def py__stop_iteration_returns(self):

jedi/evaluate/compiled/access.py

@@ -197,7 +197,7 @@ class DirectObjectAccess(object):
         except AttributeError:
             return None
 
-    def py__doc__(self, include_call_signature=False):
+    def py__doc__(self):
         return force_unicode(inspect.getdoc(self._obj)) or u''
 
     def py__name__(self):

jedi/evaluate/compiled/context.py

@@ -108,7 +108,7 @@ class CompiledObject(Context):
     def is_stub(self):
         return False
 
-    def py__doc__(self, include_call_signature=False):
+    def py__doc__(self):
         return self.access_handle.py__doc__()
 
     def get_param_names(self):

jedi/evaluate/context/klass.py

@@ -32,8 +32,7 @@ py__package__() -> List[str]           Only on modules. For the import system.
 py__path__()                           Only on modules. For the import system.
 py__get__(call_object)                 Only on instances. Simulates
                                        descriptors.
-py__doc__(include_call_signature:      Returns the docstring for a context.
+py__doc__()                            Returns the docstring for a context.
-          bool)
 ====================================== ========================================
 
 """

jedi/evaluate/context/namespace.py

@@ -53,5 +53,8 @@ class ImplicitNamespaceContext(Context, SubModuleDictMixin):
     def py__name__(self):
         return self._fullname
 
+    def is_stub(self):
+        return False
+
     def __repr__(self):
         return '<%s: %s>' % (self.__class__.__name__, self._fullname)

jedi/evaluate/signature.py

@@ -1,4 +1,5 @@
 from abc import abstractproperty
+from jedi.parser_utils import get_call_signature
 
 
 class AbstractSignature(object):
@@ -38,7 +39,7 @@ class TreeSignature(AbstractSignature):
         return self._function_context.tree_node.annotation
 
     def to_string(self, normalize=False):
-        return self._function_context.tree_node
+        return get_call_signature(self._function_context.tree_node)
 
 
 class BuiltinSignature(AbstractSignature):

jedi/parser_utils.py

@@ -181,19 +181,6 @@ def get_call_signature_for_any(any_node):
     return call_signature
 
 
-def get_doc_with_call_signature(scope_node):
-    """
-    Return a document string including call signature.
-    """
-    call_signature = get_call_signature_for_any(scope_node)
-    doc = clean_scope_docstring(scope_node)
-    if call_signature is None:
-        return doc
-    if not doc:
-        return call_signature
-    return '%s\n\n%s' % (call_signature, doc)
-
-
 def move(node, line_offset):
     """
     Move the `Node` start_pos.