From 80bde3cb243b324df162a16d23f9dfd3e0ab2597 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 21 Nov 2017 15:05:04 +0300
Subject: Fix find node by signature when linking to extension with Type Param

---
 .../src/main/kotlin/Kotlin/DocumentationBuilder.kt | 29 ++++++++++++----------
 core/src/test/kotlin/format/MarkdownFormatTest.kt  |  4 +++
 core/testdata/format/extensionScope.kt             | 14 +++++++++++
 core/testdata/format/extensionScope.md             |  8 ++++++
 4 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 core/testdata/format/extensionScope.kt
 create mode 100644 core/testdata/format/extensionScope.md

diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 04993ad4..177c6f50 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -906,18 +906,21 @@ fun CallableMemberDescriptor.getExtensionClassDescriptor(): ClassifierDescriptor
     return null
 }
 
-fun DeclarationDescriptor.signature(): String = when (this) {
-    is ClassDescriptor,
-    is PackageFragmentDescriptor,
-    is PackageViewDescriptor,
-    is TypeAliasDescriptor -> DescriptorUtils.getFqName(this).asString()
-
-    is PropertyDescriptor -> containingDeclaration.signature() + "$" + name + receiverSignature()
-    is FunctionDescriptor -> containingDeclaration.signature() + "$" + name + parameterSignature()
-    is ValueParameterDescriptor -> containingDeclaration.signature() + "/" + name
-    is TypeParameterDescriptor -> containingDeclaration.signature() + "*" + name
-    is ReceiverParameterDescriptor -> containingDeclaration.signature() + "*" + name
-    else -> throw UnsupportedOperationException("Don't know how to calculate signature for $this")
+fun DeclarationDescriptor.signature(): String {
+    if (this != original) return original.signature()
+    return when (this) {
+        is ClassDescriptor,
+        is PackageFragmentDescriptor,
+        is PackageViewDescriptor,
+        is TypeAliasDescriptor -> DescriptorUtils.getFqName(this).asString()
+
+        is PropertyDescriptor -> containingDeclaration.signature() + "$" + name + receiverSignature()
+        is FunctionDescriptor -> containingDeclaration.signature() + "$" + name + parameterSignature()
+        is ValueParameterDescriptor -> containingDeclaration.signature() + "/" + name
+        is TypeParameterDescriptor -> containingDeclaration.signature() + "*" + name
+        is ReceiverParameterDescriptor -> containingDeclaration.signature() + "*" + name
+        else -> throw UnsupportedOperationException("Don't know how to calculate signature for $this")
+    }
 }
 
 fun PropertyDescriptor.receiverSignature(): String {
@@ -934,7 +937,7 @@ fun CallableMemberDescriptor.parameterSignature(): String {
     if (extensionReceiver != null) {
         params.add(0, extensionReceiver.type)
     }
-    return "(" + params.map { it.signature() }.joinToString() + ")"
+    return params.joinToString(prefix = "(", postfix = ")") { it.signature() }
 }
 
 fun KotlinType.signature(): String {
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 97a8ad4b..5fbd80fb 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -384,6 +384,10 @@ class MarkdownFormatTest {
         verifyMarkdownNode("receiverReference")
     }
 
+    @Test fun extensionScope() {
+        verifyMarkdownNodeByName("extensionScope", "test")
+    }
+
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val module = DocumentationModule("test")
         val options = DocumentationOptions("", "html", generateIndexPages = false, noStdlibLink = true)
diff --git a/core/testdata/format/extensionScope.kt b/core/testdata/format/extensionScope.kt
new file mode 100644
index 00000000..9f3130b8
--- /dev/null
+++ b/core/testdata/format/extensionScope.kt
@@ -0,0 +1,14 @@
+/**
+ * Test class with Type-parameter
+ */
+class Foo<T>
+
+/**
+ * Some extension on Foo
+ */
+fun <T> Foo<T>.ext() {}
+
+/**
+ * Correct link: [Foo.ext]
+ */
+fun test() {}
\ No newline at end of file
diff --git a/core/testdata/format/extensionScope.md b/core/testdata/format/extensionScope.md
new file mode 100644
index 00000000..3515ed84
--- /dev/null
+++ b/core/testdata/format/extensionScope.md
@@ -0,0 +1,8 @@
+[test](test/index) / [test](test/test)
+
+# test
+
+`fun test(): Unit`
+
+Correct link: [Foo.ext](test/ext)
+
-- 
cgit