From 609914fb4a9795ec2fc39c1c62958d89de550d32 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 21 Jan 2015 17:23:24 +0100 Subject: [PATCH] code review; add test for brackets around subject name in tag --- .../jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt | 2 +- .../jetbrains/kotlin/idea/kdoc/KDocRenderer.kt | 2 +- .../quickDoc/OnMethodUsageWithBracketsInParam.kt | 15 +++++++++++++++ .../JetQuickDocProviderTestGenerated.java | 7 +++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt index 85ef149d855..620cd0cc76a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt @@ -22,7 +22,7 @@ public class KDocLink(node: ASTNode) : KDocElementImpl(node) { fun getLinkText(): String { val text = getText() if (text.startsWith('[') && text.endsWith(']')) { - return text.substring(1, text.length()-1) + return text.substring(1, text.length() - 1) } return text } diff --git a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt index 271aecacac0..3a1d35900f3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt @@ -42,7 +42,7 @@ fun renderKDoc(docComment: KDocTag): String { } private fun renderTagList(tags: List, title: String, to: StringBuilder) { - if (tags.size() == 0) { + if (tags.isEmpty()) { return } to.append("
${title}:
") diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt new file mode 100644 index 00000000000..59df5c27d7e --- /dev/null +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt @@ -0,0 +1,15 @@ +/** + Some documentation + + * @param[a] Some int + * @param[b] String + */ +fun testMethod(a: Int, b: String) { + +} + +fun test() { + testMethod(1, "value") +} + +// INFO: internal fun testMethod(a: Int, b: String): Unit

Some documentation

Parameters:
a - Some int
b - String

\ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java index 9a8f1a7e5ef..98d5f3348a0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.editor.quickDoc; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -107,6 +108,12 @@ public class JetQuickDocProviderTestGenerated extends AbstractJetQuickDocProvide doTest(fileName); } + @TestMetadata("OnMethodUsageWithBracketsInParam.kt") + public void testOnMethodUsageWithBracketsInParam() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt"); + doTest(fileName); + } + @TestMetadata("OnMethodUsageWithReturnAndThrows.kt") public void testOnMethodUsageWithReturnAndThrows() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt");