Fix source link to the line with name

Kotlin · Oct 20, 2022 · 725ea9d · 725ea9d
1 parent 40da670
commit 725ea9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
@@ -16,6 +16,7 @@ import org.jetbrains.dokka.plugability.plugin
 import org.jetbrains.dokka.plugability.querySingle
 import org.jetbrains.dokka.transformers.pages.PageTransformer
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
+import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.resolve.source.getPsi
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import java.io.File
@@ -92,8 +93,9 @@ class SourceLinksTransformer(val context: DokkaContext) : PageTransformer {
     }
 
     private fun PsiElement.lineNumber(): Int? {
+        val skippedKDoc = children.firstOrNull { it !is KDoc } ?: this
         // synthetic and some light methods might return null
-        val textRange = textRange ?: return null
+        val textRange = skippedKDoc.textRange ?: return null
 
         val doc = PsiDocumentManager.getInstance(project).getDocument(containingFile)
         // IJ uses 0-based line-numbers; external source browsers use 1-based

diff --git a/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt b/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt
@@ -398,6 +398,9 @@ class KotlinEnumsTest : BaseAbstractTest() {
             |/src/main/kotlin/basic/KotlinEnum.kt
             |package testpackage
             |
+            |/**
+            |* Doc
+            |*/
             |enum class KotlinEnum {
             |    ONE, TWO, THREE
             |}
@@ -412,7 +415,7 @@ class KotlinEnumsTest : BaseAbstractTest() {
                     .attr("href")
 
                 assertEquals(
-                    "https://github.com/user/repo/tree/master/src/main/kotlin/basic/KotlinEnum.kt#L3",
+                    "https://github.com/user/repo/tree/master/src/main/kotlin/basic/KotlinEnum.kt#L6",
                     sourceLink
                 )
             }