Fix tests after bad rebase

3 files changed, 38 insertions, 36 deletions

diff --git a/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt
index ca2332db..096104cc 100644
--- a/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka.base.resolvers.local
 
 import org.jetbrains.dokka.base.resolvers.anchors.SymbolAnchorHint
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.PointingToDeclaration
 import org.jetbrains.dokka.model.DisplaySourceSet
 import org.jetbrains.dokka.model.withDescendants
 import org.jetbrains.dokka.pages.*
@@ -25,30 +26,38 @@ open class DokkaLocationProvider(
         pageGraphRoot.children.forEach { registerPath(it, emptyList()) }
     }
 
-    protected open val pagesIndex: Map<DRI, ContentPage> = pageGraphRoot.withDescendants().filterIsInstance<ContentPage>()
-        .flatMap { it.dri.map { dri -> dri to it } }
-        .groupingBy { it.first }
-        .aggregate { dri, _, (_, page), first ->
-            if (first) page else throw AssertionError("Multiple pages associated with dri: $dri")
-        }
-
-    protected open val anchorsIndex: Map<DRI, ContentPage> = pageGraphRoot.withDescendants().filterIsInstance<ContentPage>()
-        .flatMap { page ->
-            page.content.withDescendants()
-                .filter { it.extra[SymbolAnchorHint] != null }
-                .mapNotNull { it.dci.dri.singleOrNull() }
-                .distinct()
-                .map { it to page }
-        }.toMap()
+    protected open val pagesIndex: Map<DRI, ContentPage> =
+        pageGraphRoot.withDescendants().filterIsInstance<ContentPage>()
+            .flatMap { it.dri.map { dri -> dri to it } }
+            .groupingBy { it.first }
+            .aggregate { dri, _, (_, page), first ->
+                if (first) page else throw AssertionError("Multiple pages associated with dri: $dri")
+            }
+
+    protected open val anchorsIndex: Map<DRI, ContentPage> =
+        pageGraphRoot.withDescendants().filterIsInstance<ContentPage>()
+            .flatMap { page ->
+                page.content.withDescendants()
+                    .filter { it.extra[SymbolAnchorHint] != null }
+                    .mapNotNull { it.dci.dri.singleOrNull() }
+                    .distinct()
+                    .map { it to page }
+            }.toMap()
 
     override fun resolve(node: PageNode, context: PageNode?, skipExtension: Boolean) =
         pathTo(node, context) + if (!skipExtension) extension else ""
 
     override fun resolve(dri: DRI, sourceSets: Set<DisplaySourceSet>, context: PageNode?) =
-        pagesIndex[dri]?.let { resolve(it, context) }
-            ?: anchorsIndex[dri]?.let { resolve(it, context) + "#$dri" }
+        getLocalLocation(dri, context)
+            ?: getLocalLocation(dri.copy(target = PointingToDeclaration), context)
             // Not found in PageGraph, that means it's an external link
             ?: getExternalLocation(dri, sourceSets)
+            ?: getExternalLocation(dri.copy(target = PointingToDeclaration), sourceSets)
+
+    private fun getLocalLocation(dri: DRI, context: PageNode?): String? =
+        pagesIndex[dri]?.let { resolve(it, context) }
+            ?: anchorsIndex[dri]?.let { resolve(it, context) + "#$dri" }
+
 
     override fun pathToRoot(from: PageNode): String =
         pathTo(pageGraphRoot, from).removeSuffix(PAGE_WITH_CHILDREN_SUFFIX)
diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
index f33ad5bd..52211998 100644
--- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
+++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
@@ -453,15 +453,6 @@ class SignatureTest : AbstractCoreTest() {
     @Test
     fun `generic constructor params`() {
 
-        val configuration = dokkaConfiguration {
-            sourceSets {
-                sourceSet {
-                    moduleName = "test"
-                    name = "common"
-                    sourceRoots = listOf("src/main/kotlin/common/Test.kt")
-                }
-            }
-        }
 
         val writerPlugin = TestOutputWriterPlugin()
 
@@ -470,8 +461,6 @@ class SignatureTest : AbstractCoreTest() {
                 |/src/main/kotlin/common/Test.kt
                 |package example
                 |
-                |import java.util.*
-                |
                 |class GenericClass<T>(val x: Int) {
                 |    constructor(x: T) : this(1)
                 |
@@ -481,7 +470,7 @@ class SignatureTest : AbstractCoreTest() {
                 |
                 |    constructor(x: Boolean, y: Int, z: String) : this(1)
                 |
-                |    constructor(x: List<Comparable<ServiceLoader<T>>>?) : this(1)
+                |    constructor(x: List<Comparable<Lazy<T>>>?) : this(1)
                 |}
                 |
             """.trimMargin(),
@@ -489,16 +478,15 @@ class SignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("test/example/-generic-class/-generic-class.html").signature().zip(
+                writerPlugin.writer.renderedContent("root/example/-generic-class/-generic-class.html").signature().zip(
                     listOf(
                         arrayOf("fun <", A("T"), "> ", A("GenericClass"), "(x: ", A("T"), ")", Span()),
                         arrayOf("fun ", A("GenericClass"), "(x: ", A("Int"), ", y: ", A("String"), ")", Span()),
                         arrayOf("fun <", A("T"), "> ", A("GenericClass"), "(x: ", A("Int"), ", y: ", A("List"), "<", A("T"), ">)", Span()),
                         arrayOf("fun ", A("GenericClass"), "(x: ", A("Boolean"), ", y: ", A("Int"), ", z:", A("String"), ")", Span()),
                         arrayOf("fun <", A("T"), "> ", A("GenericClass"), "(x: ", A("List"), "<", A("Comparable"),
-                            "<", A("ServiceLoader"), "<", A("T"), ">>>?)", Span()),
+                            "<", A("Lazy"), "<", A("T"), ">>>?)", Span()),
                         arrayOf("fun ", A("GenericClass"), "(x: ", A("Int"), ")", Span()),
-
                     )
                 ).forEach {
                     it.first.match(*it.second)
diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationProvider.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationProvider.kt
index 359cfef0..e8913922 100644
--- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationProvider.kt
+++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationProvider.kt
@@ -1,10 +1,10 @@
 package org.jetbrains.dokka.javadoc.location
 
-import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
 import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProvider
 import org.jetbrains.dokka.javadoc.pages.*
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.Nullable
+import org.jetbrains.dokka.links.PointingToDeclaration
 import org.jetbrains.dokka.links.parent
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.pages.ContentPage
@@ -67,7 +67,14 @@ class JavadocLocationProvider(pageRoot: RootPageNode, dokkaContext: DokkaContext
     private fun JavadocClasslikePageNode.findAnchorableByDRI(dri: DRI): AnchorableJavadocNode? =
         (constructors + methods + entries + properties).firstOrNull { it.dri == dri }
 
-    override fun resolve(dri: DRI, sourceSets: Set<DisplaySourceSet>, context: PageNode?) =
+    override fun resolve(dri: DRI, sourceSets: Set<DisplaySourceSet>, context: PageNode?): String? =
+        getLocalLocation(dri, context)
+            ?: getLocalLocation(dri.copy(target = PointingToDeclaration), context)
+            // Not found in PageGraph, that means it's an external link
+            ?: getExternalLocation(dri, sourceSets)
+            ?: getExternalLocation(dri.copy(target = PointingToDeclaration), sourceSets)
+
+    private fun getLocalLocation(dri: DRI, context: PageNode?): String? =
         nodeIndex[dri]?.let { resolve(it, context) }
             ?: nodeIndex[dri.parent]?.takeIf { it is JavadocClasslikePageNode }?.let {
                 val anchor = when (val anchorElement = (it as? JavadocClasslikePageNode)?.findAnchorableByDRI(dri)) {
@@ -78,8 +85,6 @@ class JavadocLocationProvider(pageRoot: RootPageNode, dokkaContext: DokkaContext
                 }
                 "${resolve(it, context, skipExtension = true)}.html#$anchor"
             }
-            ?: getExternalLocation(dri, sourceSets)
-
 
     private fun JavadocFunctionNode.getAnchor(): String =
         "$name(" +