From b0310f8f3e242ffc64c56e8fd95710b25b37dfff Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Fri, 23 Nov 2018 19:50:49 +0300
Subject: Fix constant values for Java

---
 core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt')

diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
index 332afffb..f0b3a56b 100644
--- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
+++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
@@ -220,11 +220,11 @@ class JavaPsiDocumentationBuilder : JavaDocumentationBuilder {
     private fun DocumentationNode.appendConstantValueIfAny(field: PsiField) {
         val modifierList = field.modifierList ?: return
         val initializer = field.initializer ?: return
-        if (field.type is PsiPrimitiveType &&
-            modifierList.hasExplicitModifier(PsiModifier.FINAL) &&
+        if (modifierList.hasExplicitModifier(PsiModifier.FINAL) &&
             modifierList.hasExplicitModifier(PsiModifier.STATIC)) {
             val value = JavaConstantExpressionEvaluator.computeConstantExpression(initializer, false)
             val text = when(value) {
+                null -> return // No value found
                 is String ->
                     "\"" + StringUtil.escapeStringCharacters(value) + "\""
                 else -> value.toString()
-- 
cgit