From bfa5afa56468218d091a3773823ca91382986b7f Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Wed, 6 Jun 2018 20:34:03 +0300
Subject: [PATCH] KT-22815: Cut Java signatures off properly

---
 .../kotlin/idea/KotlinQuickDocumentationProvider.kt      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
index 1f94ab01fd2..02859d07ce4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
@@ -328,8 +328,13 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
                             val lightElement = LightClassUtil.getLightClassMethod(psi) // Light method for super's scan in javadoc info gen
                             val javaDocInfoGenerator = JavaDocInfoGeneratorFactory.create(psi.project, lightElement)
                             val builder = StringBuilder()
-                            if (javaDocInfoGenerator.generateDocInfoCore(builder, false))
-                                renderedHtml += builder.toString().substringAfter("</PRE>") // Cut off light method signature
+                            if (javaDocInfoGenerator.generateDocInfoCore(builder, false)) {
+                                val renderedJava = builder.toString()
+                                renderedHtml += renderedJava.removeRange(
+                                    renderedJava.indexOf(DocumentationMarkup.DEFINITION_START),
+                                    renderedJava.indexOf(DocumentationMarkup.DEFINITION_END)
+                                ) // Cut off light method signature
+                            }
                         }
                     }
                 }