From 85d2ea3a100001d3e5555786202e64ef3ea1679e Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Sat, 20 Jan 2018 17:26:00 +0300
Subject: [backport] Support constants from Java in KK mode

Original: 7723826
---
 core/src/main/kotlin/Kotlin/DocumentationBuilder.kt | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'core/src')

diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 39202173..d22c48f9 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka
 
 import com.google.inject.Inject
 import com.intellij.openapi.util.text.StringUtil
+import com.intellij.psi.PsiField
 import com.intellij.psi.PsiJavaFile
 import org.jetbrains.dokka.DokkaConfiguration.*
 import org.jetbrains.dokka.Kotlin.DescriptorDocumentationParser
@@ -782,12 +783,18 @@ class DocumentationBuilder
             if (isVar) {
                 node.appendTextNode("var", NodeKind.Modifier)
             }
+
             if (isConst) {
-                val psi = sourcePsi() as? KtVariableDeclaration
-                val text = psi?.initializer?.text
-                text?.let { node.appendTextNode(it, NodeKind.Value) }
+                val psi = sourcePsi()
+                val valueText = when (psi) {
+                    is KtVariableDeclaration -> psi.initializer?.text
+                    is PsiField -> psi.initializer?.text
+                    else -> null
+                }
+                valueText?.let { node.appendTextNode(it, NodeKind.Value) }
             }
 
+
             getter?.let {
                 if (!it.isDefault) {
                     node.addAccessorDocumentation(descriptorDocumentationParser.parseDocumentation(it), "Getter")
-- 
cgit