Fix tests according to new PSI structure; move doc comment text calculation from JetQuickDocumentationProvider to KDocTag.getContent()

idea/src/org/jetbrains/kotlin/idea/JetQuickDocumentationProvider.java

@@ -22,13 +22,11 @@ import com.intellij.lang.java.JavaDocumentationProvider;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiWhiteSpace;
-import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.asJava.KotlinLightMethod;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
-import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 import org.jetbrains.kotlin.psi.JetPackageDirective;
@@ -117,36 +115,9 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider
         return null;
     }
 
-    private static String getKDocContent(@NotNull KDoc kDoc) {
-        StringBuilder builder = new StringBuilder();
-
-        boolean contentStarted = false;
-        boolean afterAsterisk = false;
-
-        for (PsiElement element : kDoc.getChildren()) {
-            IElementType type = element.getNode().getElementType();
-
-            if (KDocTokens.CONTENT_TOKENS.contains(type)) {
-                contentStarted = true;
-                builder.append(afterAsterisk ? StringUtil.trimLeading(element.getText()) : element.getText());
-                afterAsterisk = false;
-            }
-
-            if (type == KDocTokens.LEADING_ASTERISK || type == KDocTokens.START) {
-                afterAsterisk = true;
-            }
-
-            if (contentStarted && element instanceof PsiWhiteSpace) {
-                builder.append(StringUtil.repeat("\n", StringUtil.countNewLines(element.getText())));
-            }
-        }
-
-        return builder.toString();
-    }
-
     private static String kDocToHtml(@NotNull KDoc comment) {
         // TODO: Parse and show markdown comments as html
-        String content = getKDocContent(comment);
+        String content = comment.getDefaultSection().getContentWithTags();
         String htmlContent = StringUtil.replace(content, "\n", "<br/>")
                 .replaceAll("(@param)\\s+(\\w+)", "@param - <i>$2</i>")
                 .replaceAll("(@\\w+)", "<b>$1</b>");

idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt

@@ -21,6 +21,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.JetNodeTypes.*
 import org.jetbrains.kotlin.psi.JetContainerNode
 import org.jetbrains.kotlin.idea.JetLanguage
+import org.jetbrains.kotlin.kdoc.parser.KDocElementTypes
 
 public class KotlinWordSelectionFilter : Condition<PsiElement>{
     override fun value(e: PsiElement): Boolean {
@@ -31,7 +32,7 @@ public class KotlinWordSelectionFilter : Condition<PsiElement>{
         if (e.getParent().getFirstChild().getNextSibling() == null && e.getParent() !is JetContainerNode) return false // skip nodes with the same range as their parent
 
         return when (e.getNode().getElementType()) {
-            BLOCK, LITERAL_STRING_TEMPLATE_ENTRY -> false
+            BLOCK, LITERAL_STRING_TEMPLATE_ENTRY, KDocElementTypes.KDOC_SECTION -> false
             else -> true
         }
     }

idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java

@@ -31,6 +31,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
+import org.jetbrains.kotlin.kdoc.parser.KDocElementTypes;
 import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 
@@ -65,6 +66,8 @@ public class JetBlock extends AbstractBlock {
             CLASS_BODY,
             FUNCTION_LITERAL);
 
+    private static final TokenSet KDOC_CONTENT = TokenSet.create(KDocTokens.KDOC, KDocElementTypes.KDOC_SECTION);
+
     // private static final List<IndentWhitespaceRule>
 
     public JetBlock(
@@ -415,7 +418,7 @@ public class JetBlock extends AbstractBlock {
                     .set(Indent.getContinuationWithoutFirstIndent(false)),
 
             strategy("KDoc comment indent")
-                    .in(DOC_COMMENT)
+                    .in(KDOC_CONTENT)
                     .forType(KDocTokens.LEADING_ASTERISK, KDocTokens.END)
                     .set(Indent.getSpaceIndent(KDOC_COMMENT_INDENT)),
 

idea/testData/editor/quickDoc/MethodFromStdLib.kt

@@ -2,4 +2,4 @@ fun test() {
     listOf(1, 2, 4).<caret>filter { it > 0 }
 }
 
-// INFO: inline <b>public</b> <b>fun</b> &lt;T&gt; Iterable&lt;T&gt;.filter(predicate: (T) &rarr; Boolean): List&lt;T&gt;<br/><p>Returns a list containing all elements matching the given *predicate*<br/></p>
+// INFO: inline <b>public</b> <b>fun</b> &lt;T&gt; Iterable&lt;T&gt;.filter(predicate: (T) &rarr; Boolean): List&lt;T&gt;<br/><p>Returns a list containing all elements matching the given *predicate*</p>

idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt

@@ -3,4 +3,4 @@
  */
 class <caret>Some
 
-// INFO: <b>internal</b> <b>final</b> <b>class</b> Some<br/><p>Usefull comment<br/></p>
+// INFO: <b>internal</b> <b>final</b> <b>class</b> Some<br/><p>Usefull comment</p>

idea/testData/editor/quickDoc/TopLevelMethodFromJava.java

@@ -8,4 +8,4 @@ class Testing {
     }
 }
 
-// INFO: <b>internal</b> <b>fun</b> foo(bar: Int): Unit<br/><p>KDoc foo<br/></p>
+// INFO: <b>internal</b> <b>fun</b> foo(bar: Int): Unit<br/><p>KDoc foo</p>