Respect relocated declarations

5 files changed, 39 insertions, 5 deletions

diff --git a/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProvider.kt
index 18f52cce..b92b5330 100644
--- a/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProvider.kt
@@ -10,8 +10,10 @@ open class DefaultExternalLocationProvider(
     val extension: String,
     val dokkaContext: DokkaContext
 ) : ExternalLocationProvider {
-    override fun resolve(dri: DRI): String? { // TODO: classes without packages?
+    override fun resolve(dri: DRI): String? {
         val docURL = externalDocumentation.documentationURL.toString().removeSuffix("/") + "/"
+        externalDocumentation.packageList.locations[dri.toString()]?.let { path -> return "$docURL$path" }
+
         val classNamesChecked = dri.classNames ?: return "$docURL${dri.packageName ?: ""}/index$extension"
         val classLink = (listOfNotNull(dri.packageName) + classNamesChecked.split('.'))
             .joinToString("/", transform = ::identifierToFilename)
diff --git a/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProviderFactory.kt b/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProviderFactory.kt
index bb9fb563..9f8f62da 100644
--- a/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProviderFactory.kt
+++ b/plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProviderFactory.kt
@@ -10,7 +10,7 @@ class DefaultExternalLocationProviderFactory(val context: DokkaContext) :
             override fun getExternalLocationProvider(doc: ExternalDocumentation): ExternalLocationProvider? =
                 when (doc.packageList.linkFormat) {
                     RecognizedLinkFormat.KotlinWebsiteHtml,
-                    RecognizedLinkFormat.DokkaOldHtml,
+                    RecognizedLinkFormat.DokkaOldHtml -> Dokka010ExternalLocationProvider(doc, ".html", context)
                     RecognizedLinkFormat.DokkaHtml -> DefaultExternalLocationProvider(doc, ".html", context)
                     RecognizedLinkFormat.DokkaGFM,
                     RecognizedLinkFormat.DokkaJekyll -> DefaultExternalLocationProvider(doc, ".md", context)
diff --git a/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt
new file mode 100644
index 00000000..33bc96d8
--- /dev/null
+++ b/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt
@@ -0,0 +1,30 @@
+package org.jetbrains.dokka.base.resolvers.external
+
+import org.jetbrains.dokka.base.resolvers.local.DokkaLocationProvider.Companion.identifierToFilename
+import org.jetbrains.dokka.base.resolvers.shared.ExternalDocumentation
+import org.jetbrains.dokka.links.Callable
+import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.plugability.DokkaContext
+
+open class Dokka010ExternalLocationProvider(
+    val externalDocumentation: ExternalDocumentation,
+    val extension: String,
+    val dokkaContext: DokkaContext
+) : ExternalLocationProvider {
+    override fun resolve(dri: DRI): String? {
+        val docURL = externalDocumentation.documentationURL.toString().removeSuffix("/") + "/"
+
+        val relocationId =
+            "${dri.packageName}.${dri.classNames}".let { if (dri.callable != null) it + "$" + dri.callable!!.toOldString() else it }
+        externalDocumentation.packageList.locations[relocationId]?.let { path -> return "$docURL$path" }
+
+        val classNamesChecked = dri.classNames ?: return "$docURL${dri.packageName ?: ""}/index$extension"
+        val classLink = (listOfNotNull(dri.packageName) + classNamesChecked.split('.'))
+            .joinToString("/", transform = ::identifierToFilename)
+
+        val callableChecked = dri.callable ?: return "$docURL$classLink/index$extension"
+        return "$docURL$classLink/" + identifierToFilename(callableChecked.name) + extension
+    }
+
+    private fun Callable.toOldString() = name + params.joinToString(", ", "(", ")") + receiver?.let { "#$it" }
+}
diff --git a/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProvider.kt
index 48cf554c..60aa540a 100644
--- a/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProvider.kt
@@ -15,6 +15,8 @@ class JavadocExternalLocationProvider(
 
     override fun resolve(dri: DRI): String? {
         val docURL = externalDocumentation.documentationURL.toString().removeSuffix("/") + "/"
+        externalDocumentation.packageList.locations[dri.toString()]?.let { path -> return "$docURL$path" }
+
         val packageLink = dri.packageName?.replace(".", "/")
         if (dri.classNames == null) {
             return "$docURL$packageLink/package-summary$extension".htmlEscape()
diff --git a/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProviderFactory.kt b/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProviderFactory.kt
index 6fe39d35..27e0cd02 100644
--- a/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProviderFactory.kt
+++ b/plugins/base/src/main/kotlin/resolvers/external/javadoc/JavadocExternalLocationProviderFactory.kt
@@ -14,10 +14,10 @@ class JavadocExternalLocationProviderFactory(val context: DokkaContext) :
                 when (doc.packageList.linkFormat) {
                     RecognizedLinkFormat.Javadoc1 ->
                         JavadocExternalLocationProvider(doc, "()", ", ", context) // Covers JDK 1 - 7
-                    RecognizedLinkFormat.Javadoc8,
-                    RecognizedLinkFormat.DokkaJavadoc ->
+                    RecognizedLinkFormat.Javadoc8 ->
                         JavadocExternalLocationProvider(doc, "--", "-", context) // Covers JDK 8 - 9
-                    RecognizedLinkFormat.Javadoc10 ->
+                    RecognizedLinkFormat.Javadoc10,
+                    RecognizedLinkFormat.DokkaJavadoc ->
                         JavadocExternalLocationProvider(doc, "()", ",", context) // Covers JDK 10
                     else -> null
                 }