diff --git a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
index 69728726e65..0a90ce35765 100644
--- a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
+++ b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
@@ -5,4 +5,4 @@ fun testing() {
 //INFO: <div class='definition'><pre>public class <b>SomeClass</b>&lt;T extends <a href="psi_element://java.util.List"><code>List</code></a>&gt;
 //INFO: extends <a href="psi_element://java.lang.Object"><code>Object</code></a></pre></div><div class='content'>
 //INFO:    Some Java Class
-//INFO:    </div><table class='sections'><p><tr><td valign='top' class='section'><p>Type parameters:</td><td>&lt;T&gt; &ndash; </td></table>
+//INFO:    </div><table class='sections'><p><tr><td valign='top' class='section'><p>Type parameters:</td><td valign='top'>&lt;T&gt; &ndash; </td></table>
diff --git a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt.181 b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt.181
new file mode 100644
index 00000000000..69728726e65
--- /dev/null
+++ b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt.181
@@ -0,0 +1,8 @@
+fun testing() {
+    <caret>SomeClass<List<String>>()
+}
+
+//INFO: <div class='definition'><pre>public class <b>SomeClass</b>&lt;T extends <a href="psi_element://java.util.List"><code>List</code></a>&gt;
+//INFO: extends <a href="psi_element://java.lang.Object"><code>Object</code></a></pre></div><div class='content'>
+//INFO:    Some Java Class
+//INFO:    </div><table class='sections'><p><tr><td valign='top' class='section'><p>Type parameters:</td><td>&lt;T&gt; &ndash; </td></table>
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt
index 6cb3af1c474..d771381a3f6 100644
--- a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt
+++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt
@@ -4,6 +4,6 @@ class A : OverrideMe() {
 }
 
 
-//INFO: <div class='definition'><pre><a href="psi_element://A"><code>A</code></a><br>protected open fun <b>overrideMe</b>(): Unit</pre></div></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Description copied from class:</td><td><p><a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
+//INFO: <div class='definition'><pre><a href="psi_element://A"><code>A</code></a><br>protected open fun <b>overrideMe</b>(): Unit</pre></div></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Description copied from class:</td><td valign='top'><p><a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
 //INFO:        Some comment
-//INFO:      </td><tr><td valign='top' class='section'><p>Overrides:</td><td><p><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in class <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></td></table>
+//INFO:      </td><tr><td valign='top' class='section'><p>Overrides:</td><td valign='top'><p><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in class <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></td></table>
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt.181 b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt.181
new file mode 100644
index 00000000000..6cb3af1c474
--- /dev/null
+++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt.181
@@ -0,0 +1,9 @@
+class A : OverrideMe() {
+    override fun <caret>overrideMe() {
+    }
+}
+
+
+//INFO: <div class='definition'><pre><a href="psi_element://A"><code>A</code></a><br>protected open fun <b>overrideMe</b>(): Unit</pre></div></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Description copied from class:</td><td><p><a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
+//INFO:        Some comment
+//INFO:      </td><tr><td valign='top' class='section'><p>Overrides:</td><td><p><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in class <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></td></table>
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt
index b2a033087c4..6c24dca926f 100644
--- a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt
+++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt
@@ -4,6 +4,6 @@ class A : OverrideMe {
 }
 
 
-//INFO: <div class='definition'><pre><a href="psi_element://A"><code>A</code></a><br>public open fun <b>overrideMe</b>(): Unit</pre></div></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Description copied from interface:</td><td><p><a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
+//INFO: <div class='definition'><pre><a href="psi_element://A"><code>A</code></a><br>public open fun <b>overrideMe</b>(): Unit</pre></div></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Description copied from interface:</td><td valign='top'><p><a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
 //INFO:        Some comment
-//INFO:      </td><tr><td valign='top' class='section'><p>Specified by:</td><td><p><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in interface <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></td></table>
+//INFO:      </td><tr><td valign='top' class='section'><p>Specified by:</td><td valign='top'><p><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in interface <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></td></table>
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt.181 b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt.181
new file mode 100644
index 00000000000..b2a033087c4
--- /dev/null
+++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt.181
@@ -0,0 +1,9 @@
+class A : OverrideMe {
+    override fun <caret>overrideMe() {
+    }
+}
+
+
+//INFO: <div class='definition'><pre><a href="psi_element://A"><code>A</code></a><br>public open fun <b>overrideMe</b>(): Unit</pre></div></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Description copied from interface:</td><td><p><a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
+//INFO:        Some comment
+//INFO:      </td><tr><td valign='top' class='section'><p>Specified by:</td><td><p><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in interface <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></td></table>
diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
index 236c74ac245..a8cfef316a5 100644
--- a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
+++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
@@ -2,8 +2,8 @@ fun ktTest() {
     Test.<caret>foo("SomeTest")
 }
 
-//INFO: <div class='definition'><pre><a href="psi_element://Test"><code>Test</code></a><br><i>@Contract(pure = true)</i>&nbsp;
+//INFO: <div class='definition'><pre><a href="psi_element://Test"><code>Test</code></a><br><i>@Contract(value = &quot;_ -&gt; new&quot;,&nbsp;pure = true)</i>&nbsp;
 //INFO: <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>NotNull</code></a></i>&nbsp;
 //INFO: public static&nbsp;<a href="psi_element://java.lang.Object"><code>Object</code></a>[]&nbsp;<b>foo</b>(<a href="psi_element://java.lang.String"><code>String</code></a>&nbsp;param)</pre></div><div class='content'>
 //INFO:        Java Method
-//INFO:      <p></div><table class='sections'><p><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@org.jetbrains.annotations.Contract(pure = true)</i> <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>org.jetbrains.annotations.NotNull</code></a></i></td></table>
+//INFO:      <p></div><table class='sections'><p><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td valign='top'><p><i>@org.jetbrains.annotations.Contract(value = &quot;_ -&gt; new&quot;,&nbsp;pure = true)</i> <i>@<a href="psi_element://org.jetbrains.annotations.NotNull">org.jetbrains.annotations.NotNull</a></i></td></table>
diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt.181 b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt.181
new file mode 100644
index 00000000000..236c74ac245
--- /dev/null
+++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt.181
@@ -0,0 +1,9 @@
+fun ktTest() {
+    Test.<caret>foo("SomeTest")
+}
+
+//INFO: <div class='definition'><pre><a href="psi_element://Test"><code>Test</code></a><br><i>@Contract(pure = true)</i>&nbsp;
+//INFO: <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>NotNull</code></a></i>&nbsp;
+//INFO: public static&nbsp;<a href="psi_element://java.lang.Object"><code>Object</code></a>[]&nbsp;<b>foo</b>(<a href="psi_element://java.lang.String"><code>String</code></a>&nbsp;param)</pre></div><div class='content'>
+//INFO:        Java Method
+//INFO:      <p></div><table class='sections'><p><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@org.jetbrains.annotations.Contract(pure = true)</i> <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>org.jetbrains.annotations.NotNull</code></a></i></td></table>
diff --git a/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt b/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt
index d8ce65d9d5a..aaf0f58b762 100644
--- a/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt
+++ b/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt
@@ -9,4 +9,4 @@ fun use() {
 
 //INFO: <div class='definition'><pre><a href="psi_element://E"><code>E</code></a><br>public final fun <b>valueOf</b>(
 //INFO:     value: String
-//INFO: ): <a href="psi_element://E">E</a></pre></div><div class='content'><p>Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)</p></div><table class='sections'><tr><td valign='top' class='section'><p>Throws:</td><td><p><code>IllegalArgumentException</code> - if this enum type has no constant with the specified name</td></table>
+//INFO: ): <a href="psi_element://E">E</a></pre></div><div class='content'><p>Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)</p></div><table class='sections'><tr><td valign='top' class='section'><p>Throws:</td><td valign='top'><p><code>IllegalArgumentException</code> - if this enum type has no constant with the specified name</td></table>
diff --git a/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt.181 b/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt.181
new file mode 100644
index 00000000000..d8ce65d9d5a
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt.181
@@ -0,0 +1,12 @@
+enum class E {
+    A
+}
+
+fun use() {
+    E.valueOf<caret>("A")
+}
+
+
+//INFO: <div class='definition'><pre><a href="psi_element://E"><code>E</code></a><br>public final fun <b>valueOf</b>(
+//INFO:     value: String
+//INFO: ): <a href="psi_element://E">E</a></pre></div><div class='content'><p>Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)</p></div><table class='sections'><tr><td valign='top' class='section'><p>Throws:</td><td><p><code>IllegalArgumentException</code> - if this enum type has no constant with the specified name</td></table>
diff --git a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
index 8d41702eade..abd712497d5 100644
--- a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
+++ b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
@@ -15,4 +15,4 @@ fun <caret>testFun(first: String, second: Int) = 12
 //INFO: <div class='definition'><pre><a href="psi_element://test"><code>test</code></a> <font color="808080"><i>OnFunctionDeclarationWithPackage.kt</i></font><br>public fun <b>testFun</b>(
 //INFO:     first: String,
 //INFO:     second: Int
-//INFO: ): Int</pre></div><div class='content'><p>Test function</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>first</code> - Some<p><code>second</code> - Other</td></table>
+//INFO: ): Int</pre></div><div class='content'><p>Test function</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>first</code> - Some<p><code>second</code> - Other</td></table>
diff --git a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt.181 b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt.181
new file mode 100644
index 00000000000..8d41702eade
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt.181
@@ -0,0 +1,18 @@
+package test
+
+/**
+
+ *
+ *
+ * Test function
+
+ *
+ * @param first Some
+ * @param second Other
+ */
+fun <caret>testFun(first: String, second: Int) = 12
+
+//INFO: <div class='definition'><pre><a href="psi_element://test"><code>test</code></a> <font color="808080"><i>OnFunctionDeclarationWithPackage.kt</i></font><br>public fun <b>testFun</b>(
+//INFO:     first: String,
+//INFO:     second: Int
+//INFO: ): Int</pre></div><div class='content'><p>Test function</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>first</code> - Some<p><code>second</code> - Other</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsage.kt b/idea/testData/editor/quickDoc/OnMethodUsage.kt
index aa3e96d39bc..c95c404a7da 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsage.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsage.kt
@@ -15,4 +15,4 @@ fun test() {
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsage.kt</i></font><br>public fun <b>testMethod</b>(
 //INFO:     a: Int,
 //INFO:     b: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>a</code> - Some int<p><code>b</code> - String</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsage.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsage.kt.181
new file mode 100644
index 00000000000..aa3e96d39bc
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsage.kt.181
@@ -0,0 +1,18 @@
+/**
+Some documentation
+
+ * @param a Some int
+ * @param b String
+ */
+fun testMethod(a: Int, b: String) {
+
+}
+
+fun test() {
+    <caret>testMethod(1, "value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsage.kt</i></font><br>public fun <b>testMethod</b>(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
index 06514ff6314..5fbda0490e1 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
@@ -15,4 +15,4 @@ fun test() {
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithBracketsInParam.kt</i></font><br>public fun <b>testMethod</b>(
 //INFO:     a: Int,
 //INFO:     b: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>a</code> - Some int<p><code>b</code> - String</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt.181
new file mode 100644
index 00000000000..06514ff6314
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt.181
@@ -0,0 +1,18 @@
+/**
+Some documentation
+
+ * @param[a] Some int
+ * @param[b] String
+ */
+fun testMethod(a: Int, b: String) {
+
+}
+
+fun test() {
+    <caret>testMethod(1, "value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithBracketsInParam.kt</i></font><br>public fun <b>testMethod</b>(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt
index e998be01014..5a7b0e05f07 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt
@@ -14,4 +14,4 @@ fun test() {
 
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithMultilineParam.kt</i></font><br>public fun <b>testMethod</b>(
 //INFO:     test: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation on two lines.</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>test</code> - String on two lines</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation on two lines.</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>test</code> - String on two lines</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt.181
new file mode 100644
index 00000000000..e998be01014
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt.181
@@ -0,0 +1,17 @@
+/**
+ * Some documentation
+ * on two lines.
+ *
+ * @param test String
+ * on two lines
+ */
+fun testMethod(test: String) {
+}
+
+fun test() {
+    <caret>testMethod("")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithMultilineParam.kt</i></font><br>public fun <b>testMethod</b>(
+//INFO:     test: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation on two lines.</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>test</code> - String on two lines</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
index 5714d922cd4..f40bda065dc 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
@@ -15,4 +15,4 @@ fun test() {
 
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithReceiver.kt</i></font><br>public fun Int.<b>testMethod</b>(
 //INFO:     b: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Receiver:</td><td>Some int</td><tr><td valign='top' class='section'><p>Params:</td><td><p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td>Return <a href="psi_element://a">a</a> and nothing else</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Receiver:</td><td valign='top'>Some int</td><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td valign='top'>Return <a href="psi_element://a">a</a> and nothing else</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt.181
new file mode 100644
index 00000000000..5714d922cd4
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt.181
@@ -0,0 +1,18 @@
+/**
+Some documentation
+
+ * @receiver Some int
+ * @param b String
+ * @return Return [a] and nothing else
+ */
+fun Int.testMethod(b: String) {
+
+}
+
+fun test() {
+    1.<caret>testMethod("value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithReceiver.kt</i></font><br>public fun Int.<b>testMethod</b>(
+//INFO:     b: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Receiver:</td><td>Some int</td><tr><td valign='top' class='section'><p>Params:</td><td><p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td>Return <a href="psi_element://a">a</a> and nothing else</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
index d3486f55442..87c03f8636e 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
@@ -16,4 +16,4 @@ fun test() {
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithReturnAndLink.kt</i></font><br>public fun <b>testMethod</b>(
 //INFO:     a: Int,
 //INFO:     b: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td>Return <a href="psi_element://a">a</a> and nothing else</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>a</code> - Some int<p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td valign='top'>Return <a href="psi_element://a">a</a> and nothing else</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt.181
new file mode 100644
index 00000000000..d3486f55442
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt.181
@@ -0,0 +1,19 @@
+/**
+Some documentation
+
+ * @param a Some int
+ * @param b String
+ * @return Return [a] and nothing else
+ */
+fun testMethod(a: Int, b: String) {
+
+}
+
+fun test() {
+    <caret>testMethod(1, "value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithReturnAndLink.kt</i></font><br>public fun <b>testMethod</b>(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td>Return <a href="psi_element://a">a</a> and nothing else</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
index 910718215c6..41d0846cf7e 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
@@ -17,4 +17,4 @@ fun test() {
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithReturnAndThrows.kt</i></font><br>public fun <b>testMethod</b>(
 //INFO:     a: Int,
 //INFO:     b: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td>Return value</td><tr><td valign='top' class='section'><p>Throws:</td><td><p><code>IllegalArgumentException</code> - if the weather is bad</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>a</code> - Some int<p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td valign='top'>Return value</td><tr><td valign='top' class='section'><p>Throws:</td><td valign='top'><p><code>IllegalArgumentException</code> - if the weather is bad</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt.181
new file mode 100644
index 00000000000..910718215c6
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt.181
@@ -0,0 +1,20 @@
+/**
+Some documentation
+
+ * @param a Some int
+ * @param b String
+ * @return Return value
+ * @throws IllegalArgumentException if the weather is bad
+ */
+fun testMethod(a: Int, b: String) {
+
+}
+
+fun test() {
+    <caret>testMethod(1, "value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithReturnAndThrows.kt</i></font><br>public fun <b>testMethod</b>(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>a</code> - Some int<p><code>b</code> - String</td><tr><td valign='top' class='section'><p>Returns:</td><td>Return value</td><tr><td valign='top' class='section'><p>Throws:</td><td><p><code>IllegalArgumentException</code> - if the weather is bad</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
index c0489661507..543ffa7a097 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
@@ -17,4 +17,4 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithSee.kt</i></font><br>public fun <b>testMethod</b>(): Unit</pre></div><div class='content'></div><table class='sections'><tr><td valign='top' class='section'><p>See Also:</td><td><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a>, <a href="http://kotl.in">kotlin</a></td></table>
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithSee.kt</i></font><br>public fun <b>testMethod</b>(): Unit</pre></div><div class='content'></div><table class='sections'><tr><td valign='top' class='section'><p>See Also:</td><td valign='top'><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a>, <a href="http://kotl.in">kotlin</a></td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181
new file mode 100644
index 00000000000..c0489661507
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181
@@ -0,0 +1,20 @@
+/**
+ * @see C
+ * @see D
+ * @see <a href="http://kotl.in">kotlin</a>
+ */
+fun testMethod() {
+
+}
+
+class C {
+}
+
+class D {
+}
+
+fun test() {
+    <caret>testMethod(1, "value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithSee.kt</i></font><br>public fun <b>testMethod</b>(): Unit</pre></div><div class='content'></div><table class='sections'><tr><td valign='top' class='section'><p>See Also:</td><td><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a>, <a href="http://kotl.in">kotlin</a></td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
index 05920c5e641..7d14a692d3c 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
@@ -16,4 +16,4 @@ fun test() {
 //INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithTypeParameter.kt</i></font><br>public fun &lt;T&gt; <b>testMethod</b>(
 //INFO:     a: Int,
 //INFO:     b: String
-//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>T</code> - the type parameter<p><code>a</code> - Some int<p><code>b</code> - String</td></table>
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><p><code>T</code> - the type parameter<p><code>a</code> - Some int<p><code>b</code> - String</td></table>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt.181
new file mode 100644
index 00000000000..05920c5e641
--- /dev/null
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt.181
@@ -0,0 +1,19 @@
+/**
+Some documentation
+
+ * @param T the type parameter
+ * @param a Some int
+ * @param b String
+ */
+fun <T> testMethod(a: Int, b: String) {
+
+}
+
+fun test() {
+    <caret>testMethod(1, "value")
+}
+
+//INFO: <div class='definition'><pre><font color="808080"><i>OnMethodUsageWithTypeParameter.kt</i></font><br>public fun &lt;T&gt; <b>testMethod</b>(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit</pre></div><div class='content'><p>Some documentation</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td><p><code>T</code> - the type parameter<p><code>a</code> - Some int<p><code>b</code> - String</td></table>
diff --git a/idea/testData/editor/quickDoc/Samples.kt b/idea/testData/editor/quickDoc/Samples.kt
index 9ac8dbc7cb1..bc732ca17b9 100644
--- a/idea/testData/editor/quickDoc/Samples.kt
+++ b/idea/testData/editor/quickDoc/Samples.kt
@@ -21,7 +21,7 @@ fun <caret>castTextSpell(spell: String) {
 
 //INFO: <div class='definition'><pre><a href="psi_element://magic"><code>magic</code></a> <font color="808080"><i>Samples.kt</i></font><br>public fun <b>castTextSpell</b>(
 //INFO:     spell: String
-//INFO: ): Unit</pre></div><div class='content'></div><table class='sections'><tr><td valign='top' class='section'><p>Samples:</td><td><p><a href="psi_element://Samples.sampleMagic"><code>Samples.sampleMagic</code></a><pre><code>
+//INFO: ): Unit</pre></div><div class='content'></div><table class='sections'><tr><td valign='top' class='section'><p>Samples:</td><td valign='top'><p><a href="psi_element://Samples.sampleMagic"><code>Samples.sampleMagic</code></a><pre><code>
 //INFO: castTextSpell("[asd] [dse] [asz]")
 //INFO: </code></pre><p><a href="psi_element://sampleScroll"><code>sampleScroll</code></a><pre><code>
 //INFO: val reader = Scroll("[asd] [dse] [asz]").reader()
diff --git a/idea/testData/editor/quickDoc/Samples.kt.181 b/idea/testData/editor/quickDoc/Samples.kt.181
new file mode 100644
index 00000000000..9ac8dbc7cb1
--- /dev/null
+++ b/idea/testData/editor/quickDoc/Samples.kt.181
@@ -0,0 +1,29 @@
+package magic
+
+object Samples {
+    fun sampleMagic() {
+        castTextSpell("[asd] [dse] [asz]")
+    }
+}
+
+fun sampleScroll() {
+    val reader = Scroll("[asd] [dse] [asz]").reader()
+    castTextSpell(reader.readAll())
+}
+
+/**
+ * @sample Samples.sampleMagic
+ * @sample sampleScroll
+ */
+fun <caret>castTextSpell(spell: String) {
+    throw SecurityException("Magic prohibited outside Hogwarts")
+}
+
+//INFO: <div class='definition'><pre><a href="psi_element://magic"><code>magic</code></a> <font color="808080"><i>Samples.kt</i></font><br>public fun <b>castTextSpell</b>(
+//INFO:     spell: String
+//INFO: ): Unit</pre></div><div class='content'></div><table class='sections'><tr><td valign='top' class='section'><p>Samples:</td><td><p><a href="psi_element://Samples.sampleMagic"><code>Samples.sampleMagic</code></a><pre><code>
+//INFO: castTextSpell("[asd] [dse] [asz]")
+//INFO: </code></pre><p><a href="psi_element://sampleScroll"><code>sampleScroll</code></a><pre><code>
+//INFO: val reader = Scroll("[asd] [dse] [asz]").reader()
+//INFO: castTextSpell(reader.readAll())
+//INFO: </code></pre></td></table>