azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

as a workaround for KT-4502, wrap KDoc rendering functions in an object

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-02-05 12:44:26 +01:00
parent 6eead1b1a1
commit 2bdb222516
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/JetQuickDocumentationProvider.java
+2 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.asJava.KotlinLightMethod;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.idea.kdoc.KDocRenderer;
import org.jetbrains.kotlin.kdoc.KdocPackage; import org.jetbrains.kotlin.kdoc.KdocPackage;
import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag; import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag;
import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetDeclaration;
@@ -92,7 +93,7 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider
KDocTag comment = KdocPackage.findKDoc(declarationDescriptor); KDocTag comment = KdocPackage.findKDoc(declarationDescriptor);
if (comment != null) { if (comment != null) {
renderedDecl = renderedDecl + "<br/>" + org.jetbrains.kotlin.idea.kdoc.KdocPackage.renderKDoc(comment); renderedDecl = renderedDecl + "<br/>" + KDocRenderer.INSTANCE$.renderKDoc(comment);
} }
return renderedDecl; return renderedDecl;
idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
+2
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.kotlin.kdoc.psi.impl.KDocSection import org.jetbrains.kotlin.kdoc.psi.impl.KDocSection
object KDocRenderer {
fun renderKDoc(docComment: KDocTag): String { fun renderKDoc(docComment: KDocTag): String {
val content = docComment.getContent() val content = docComment.getContent()
val result = StringBuilder("<p>") val result = StringBuilder("<p>")
@@ -64,3 +65,4 @@ fun markdownToHtml(markdown: String): String {
// TODO Integrate a real Markdown parser // TODO Integrate a real Markdown parser
return StringUtil.replace(markdown, "\n", "<br/>"); return StringUtil.replace(markdown, "\n", "<br/>");
} }
}