Fix linking to declarations in companion objects in old dokka formats

2 files changed, 33 insertions, 0 deletions

diff --git a/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt b/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt
index 1a2a45d7..31ffa0b3 100644
--- a/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt
+++ b/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt
@@ -71,4 +71,36 @@ class Dokka010ExternalLocationProviderTest : AbstractCoreTest() {
 
         assertEquals("$kotlinLang/kotlin/java.math.-big-decimal/minus.html", locationProvider.resolve(dri))
     }
+
+    @Test
+    fun `#1268 companion part should be stripped`() {
+        val locationProvider = getTestLocationProvider()
+        val dri = DRI(
+            "kotlin",
+            "Int.Companion",
+            Callable(
+                "MIN_VALUE",
+                null,
+                emptyList()
+            )
+        )
+
+        assertEquals("$kotlinLang/kotlin/-int/-m-i-n_-v-a-l-u-e.html", locationProvider.resolve(dri))
+    }
+
+    @Test
+    fun `companion part should be stripped in relocations`() {
+        val locationProvider = getTestLocationProvider()
+        val dri = DRI(
+            "kotlin",
+            "Int.Companion",
+            Callable(
+                "MAX_VALUE",
+                null,
+                emptyList()
+            )
+        )
+
+        assertEquals("$kotlinLang/kotlin/-int/max-value.html", locationProvider.resolve(dri))
+    }
 }
diff --git a/plugins/base/src/test/resources/locationProvider/old-package-list b/plugins/base/src/test/resources/locationProvider/old-package-list
index e2dfc92a..d05b4535 100644
--- a/plugins/base/src/test/resources/locationProvider/old-package-list
+++ b/plugins/base/src/test/resources/locationProvider/old-package-list
@@ -2,6 +2,7 @@ $dokka.format:kotlin-website-html
 $dokka.linkExtension:html
 $dokka.location:kotlin.text.StringBuilderkotlin.relocated.text/-string-builder/index.html
 $dokka.location:kotlin$minus(java.math.BigDecimal, java.math.BigDecimal)kotlin/java.math.-big-decimal/minus.html
+$dokka.location:kotlin.Int$MAX_VALUE()kotlin/-int/max-value.html
 kotlin
 kotlin.text
 kotlin.reflect