From d8326c5f33bf2504e41431a1bac5326d2ccd83e3 Mon Sep 17 00:00:00 2001
From: Bojan Radivojevic <bomberaya@gmail.com>
Date: Sat, 29 Oct 2022 00:25:28 +0200
Subject: [PATCH 1/2] Fixed wrong Javadoc links in Android Studio (IntelliJ);
 Fixed missing package names in html files.

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

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 2b3005ab27..de6193a750 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 c9b1d7eff8..84e302fb98 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">

From 2385ce4efd86c6a7ab1a40c8efd11fb717387a4a Mon Sep 17 00:00:00 2001
From: Bojan Radivojevic <bomberaya@gmail.com>
Date: Mon, 7 Nov 2022 00:20:45 +0100
Subject: [PATCH 2/2] Update failing test

---
 .../org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 94af07affe..fe94479472 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