From 631934363a02e06b5f7dcb7a8141223c6363f2bb Mon Sep 17 00:00:00 2001
From: bomberaya <bomberaya@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:09:48 +0100
Subject: Fix missing package name in Javadoc format (#2734)

---
 .../javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/utils.kt  | 2 +-
 plugins/javadoc/src/main/resources/views/class.korte                    | 2 +-
 .../kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/javadoc/src')

diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/utils.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/utils.kt
index 2b3005ab..de6193a7 100644
--- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/utils.kt
+++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/utils.kt
@@ -5,7 +5,7 @@ import org.jetbrains.dokka.model.*
 internal fun JavadocFunctionNode.getAnchor(): String =
     "$name(${parameters.joinToString(",") {
         when (val bound = if (it.typeBound is Nullable) it.typeBound.inner else it.typeBound) {
-            is TypeConstructor -> bound.dri.classNames.orEmpty()
+            is TypeConstructor -> listOf(bound.dri.packageName, bound.dri.classNames).joinToString(".")
             is TypeParameter -> bound.name
             is PrimitiveJavaType -> bound.name
             is UnresolvedBound -> bound.name
diff --git a/plugins/javadoc/src/main/resources/views/class.korte b/plugins/javadoc/src/main/resources/views/class.korte
index c9b1d7ef..84e302fb 100644
--- a/plugins/javadoc/src/main/resources/views/class.korte
+++ b/plugins/javadoc/src/main/resources/views/class.korte
@@ -3,7 +3,7 @@
 
 <main role="main">
     <div class="header">
-        <div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">{{ package }}</a></div>
+        <div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">{{ packageName }}</a></div>
         <h2 title="{{ kind|capitalize }} {{ name }}" class="title">{{ kind|capitalize }} {{ name }}</h2>
     </div>
     <div class="contentContainer">
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt
index 94af07af..fe944794 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt
@@ -95,7 +95,7 @@ class JavadocLocationTest : BaseAbstractTest() {
                 .firstChildOfType<JavadocClasslikePageNode> { it.name == "Test" }
             val testFunctionNode = testClassNode.methods.first { it.name == "test2" }
             assertEquals(
-                """<a href=Test.html#test2(String)>test2</a>(<a href=https://docs.oracle.com/javase/8/docs/api/java/lang/String.html>String</a> s)""",
+                """<a href=Test.html#test2(java.lang.String)>test2</a>(<a href=https://docs.oracle.com/javase/8/docs/api/java/lang/String.html>String</a> s)""",
                 transformer.htmlForContentNode(
                     testFunctionNode.signature.signatureWithoutModifiers,
                     testClassNode
-- 
cgit