From 0d2ee179b6563020874db9f60906fb16b6ae1556 Mon Sep 17 00:00:00 2001
From: Marcin Aman <marcin.aman@gmail.com>
Date: Wed, 7 Oct 2020 14:40:09 +0200
Subject: Add information about content kind and sourceset to anchor

---
 .../base/src/main/kotlin/resolvers/anchors/AnchorsHint.kt  | 14 ++++++++------
 .../main/kotlin/resolvers/local/DokkaLocationProvider.kt   |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'plugins/base/src/main/kotlin/resolvers')

diff --git a/plugins/base/src/main/kotlin/resolvers/anchors/AnchorsHint.kt b/plugins/base/src/main/kotlin/resolvers/anchors/AnchorsHint.kt
index 0b68db10..8f633b70 100644
--- a/plugins/base/src/main/kotlin/resolvers/anchors/AnchorsHint.kt
+++ b/plugins/base/src/main/kotlin/resolvers/anchors/AnchorsHint.kt
@@ -3,11 +3,13 @@ package org.jetbrains.dokka.base.resolvers.anchors
 import org.jetbrains.dokka.model.Documentable
 import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.pages.ContentNode
+import org.jetbrains.dokka.pages.Kind
 
-data class SymbolAnchorHint(val anchorName: String): ExtraProperty<ContentNode> {
-    object SymbolAnchorHintKey : ExtraProperty.Key<ContentNode, SymbolAnchorHint>
-    override val key: ExtraProperty.Key<ContentNode, SymbolAnchorHint> = SymbolAnchorHintKey
-    companion object: ExtraProperty.Key<ContentNode, SymbolAnchorHint> {
-        fun from(d: Documentable): SymbolAnchorHint? = d.name?.let { SymbolAnchorHint(it) }
+data class SymbolAnchorHint(val anchorName: String, val contentKind: Kind) : ExtraProperty<ContentNode> {
+    override val key: ExtraProperty.Key<ContentNode, SymbolAnchorHint> = SymbolAnchorHint
+
+    companion object : ExtraProperty.Key<ContentNode, SymbolAnchorHint> {
+        fun from(d: Documentable, contentKind: Kind): SymbolAnchorHint? =
+            d.name?.let { SymbolAnchorHint(it, contentKind) }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt
index a89aed9a..fe8c8f84 100644
--- a/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt
@@ -44,7 +44,7 @@ open class DokkaLocationProvider(
         pageGraphRoot.withDescendants().filterIsInstance<ContentPage>()
             .flatMap { page ->
                 page.content.withDescendants()
-                    .filter { it.extra[SymbolAnchorHint.SymbolAnchorHintKey] != null }
+                    .filter { it.extra[SymbolAnchorHint] != null }
                     .mapNotNull { it.dci.dri.singleOrNull() }
                     .distinct()
                     .flatMap { dri ->
-- 
cgit