always include type parameters in the signature of a type

2 files changed, 12 insertions, 7 deletions

diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index e3de493a..f92d15f9 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -633,10 +633,7 @@ fun CallableMemberDescriptor.parameterSignature(): String {
 fun KotlinType.signature(): String {
     val declarationDescriptor = constructor.declarationDescriptor ?: return "<null>"
     val typeName = DescriptorUtils.getFqName(declarationDescriptor).asString()
-    if (typeName == "Array" && arguments.size == 1) {
-        return "Array<" + arguments.first().type.signature() + ">"
-    }
-    return typeName
+    return typeName + arguments.joinToString(prefix = "<", postfix = ">") { it.type.signature() }
 }
 
 fun DeclarationDescriptor.signatureWithSourceLocation(): String {
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 5ec2b637..81e0cb6b 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -215,9 +215,11 @@ public class MarkdownFormatTest {
     }
 
     @Test fun inheritedExtensions() {
-        verifyOutput("testdata/format/inheritedExtensions.kt", ".md") { model, output ->
-            markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
-        }
+        verifyMarkdownNodeByName("inheritedExtensions", "Bar")
+    }
+
+    @Test fun arrayAverage() {
+        verifyMarkdownNodeByName("arrayAverage", "XArray")
     }
 
     private fun verifyMarkdownPackage(fileName: String, withKotlinRuntime: Boolean = false) {
@@ -231,4 +233,10 @@ public class MarkdownFormatTest {
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
+
+    private fun verifyMarkdownNodeByName(fileName: String, name: String) {
+        verifyOutput("testdata/format/$fileName.kt", ".md") { model, output ->
+            markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == name })
+        }
+    }
 }