diff --git a/python/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java b/python/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java
index d0214d3f1675..5bdedc78e38d 100644
--- a/python/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java
+++ b/python/src/com/jetbrains/python/documentation/PyDocumentationBuilder.java
@@ -190,13 +190,14 @@ public class PyDocumentationBuilder {
private void buildFromParameter(@NotNull PyNamedParameter parameter) {
final PyFunction func = PsiTreeUtil.getParentOfType(parameter, PyFunction.class, true, PyLambdaExpression.class);
- final String funcName = func == null ? PyNames.UNNAMED_ELEMENT : func.getName();
- myProlog
- .addItem("Parameter ")
- .addWith(TagBold, $().addWith(TagCode, $(parameter.getName())))
- .addItem(" of ")
- // TODO links to functions
- .addWith(TagCode, $(funcName));
+ final String link = func != null ? getLinkToFunction(func, true) : PyNames.UNNAMED_ELEMENT;
+ if (link != null) {
+ myProlog
+ .addItem("Parameter ")
+ .addWith(TagBold, $(parameter.getName()))
+ .addItem(" of ")
+ .addItem(link);
+ }
if (func != null) {
final PyStringLiteralExpression docString = getEffectiveDocStringExpression(func);
@@ -420,22 +421,7 @@ public class PyDocumentationBuilder {
if (docstringElement != null) {
final String inheritedDoc = docstringElement.getStringValue();
if (inheritedDoc.length() > 1) {
- final String ancestorName = ancestor.getName();
-
- final String ancestorLink;
- if (!isFromClass) {
- final String qualified = inherited.getQualifiedName();
- if (qualified != null) {
- ancestorLink = PyDocumentationLink.toFunction(inherited);
- }
- else {
- // TODO add a way to reference such local methods
- ancestorLink = ancestorName + "." + inherited.getName();
- }
- }
- else {
- ancestorLink = getLinkToClass(ancestor, false);
- }
+ final String ancestorLink = isFromClass ? getLinkToClass(ancestor, false) : getLinkToFunction(inherited, false);
if (ancestorLink != null) {
mySectionsMap.get(PyBundle.message("QDOC.documentation.is.copied.from")).addWith(TagCode, $(ancestorLink));
}
@@ -553,6 +539,24 @@ public class PyDocumentationBuilder {
return linkText;
}
+ @Nullable
+ private String getLinkToFunction(@NotNull PyFunction function, boolean preferQualifiedName) {
+ final String qualifiedName = function.getQualifiedName();
+ final PyClass pyClass = function.getContainingClass();
+ // Preserve name of a containing class even if the whole qualified name can't be constructed
+ final String shortName = pyClass == null ? function.getName() : pyClass.getName() + "." + function.getName();
+
+ final String linkText = preferQualifiedName && qualifiedName != null ? qualifiedName : shortName;
+ if (linkText == null || function.getName() == null || (pyClass != null && pyClass.getName() == null)) {
+ return null;
+ }
+
+ if (qualifiedName != null) {
+ return PyDocumentationLink.toFunction(linkText, function);
+ }
+ return linkText;
+ }
+
@Nullable
static PyStringLiteralExpression getEffectiveDocStringExpression(@NotNull PyDocStringOwner owner) {
final PyStringLiteralExpression expression = owner.getDocStringExpression();
diff --git a/python/testData/quickdoc/ClassUndocumentedEmptyConstructor.html b/python/testData/quickdoc/ClassUndocumentedEmptyConstructor.html
index 8147fc46fb30..396d7df0ccf2 100644
--- a/python/testData/quickdoc/ClassUndocumentedEmptyConstructor.html
+++ b/python/testData/quickdoc/ClassUndocumentedEmptyConstructor.html
@@ -1 +1 @@
-Doc of Moo()
\ No newline at end of file
+Doc of Moo()
\ No newline at end of file
diff --git a/python/testData/quickdoc/InheritedMethod.html b/python/testData/quickdoc/InheritedMethod.html
index de21f58b8511..c30c155f3cd3 100644
--- a/python/testData/quickdoc/InheritedMethod.html
+++ b/python/testData/quickdoc/InheritedMethod.html
@@ -1 +1 @@
-Doc from A.foo.
\ No newline at end of file
+Doc from A.foo.
Documentation is copied from: | A.foo |
\ No newline at end of file
diff --git a/python/testData/quickdoc/Param.html b/python/testData/quickdoc/Param.html
index 7063e0918a68..ebfcc1643c55 100644
--- a/python/testData/quickdoc/Param.html
+++ b/python/testData/quickdoc/Param.html
@@ -1 +1 @@
-Parameter name of foo
name: str
The name to convert to a label. This must be a string which could be used as a Python identifier. Strings which do not take this form will result in unpredictable behavior.
\ No newline at end of file
+The name to convert to a label. This must be a string which could be used as a Python identifier. Strings which do not take this form will result in unpredictable behavior.
\ No newline at end of file