Merge remote-tracking branch 'origin/0.9.14/BlankLines'

# Conflicts:
#	core/src/test/kotlin/format/HtmlFormatTest.kt
#	core/src/test/kotlin/format/MarkdownFormatTest.kt

4 files changed, 8 insertions, 9 deletions

diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt
index 3cfc96a2..6e887c05 100644
--- a/core/src/main/kotlin/Formats/StructuredFormatService.kt
+++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt
@@ -153,12 +153,9 @@ abstract class StructuredOutputBuilder(val to: StringBuilder,
             is ContentBlockSampleCode, is ContentBlockCode -> {
                 content as ContentBlockCode
                 fun ContentBlockCode.appendBlockCodeContent() {
-                    for ((index, contentNode) in this.children.withIndex()) {
-                        appendContent(contentNode)
-                        if (index < this.children.size - 1) {
-                            to.append("\n")
-                        }
-                    }
+                    children
+                            .dropWhile { it is ContentText && it.text.isBlank() }
+                            .forEach { appendContent(it) }
                 }
                 when (content) {
                     is ContentBlockSampleCode ->
diff --git a/core/src/main/kotlin/Kotlin/ContentBuilder.kt b/core/src/main/kotlin/Kotlin/ContentBuilder.kt
index 53afebaf..9c081d17 100644
--- a/core/src/main/kotlin/Kotlin/ContentBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/ContentBuilder.kt
@@ -148,7 +148,7 @@ fun buildContentTo(tree: MarkdownNode, target: ContentBlock, linkResolver: (Stri
 
 private fun MarkdownNode.getLabelText() = children.filter { it.type == MarkdownTokenTypes.TEXT || it.type == MarkdownTokenTypes.EMPH }.joinToString("") { it.text }
 
-private fun keepWhitespace(node: ContentNode) = node is ContentParagraph || node is ContentSection
+private fun keepWhitespace(node: ContentNode) = node is ContentParagraph || node is ContentSection || node is ContentBlockCode
 
 fun buildInlineContentTo(tree: MarkdownNode, target: ContentBlock, linkResolver: (String) -> ContentBlock) {
     val inlineContent = tree.children.singleOrNull { it.type == MarkdownElementTypes.PARAGRAPH }?.children ?: listOf(tree)
diff --git a/core/src/main/kotlin/Markdown/MarkdownProcessor.kt b/core/src/main/kotlin/Markdown/MarkdownProcessor.kt
index 46b72c03..d1d40dd4 100644
--- a/core/src/main/kotlin/Markdown/MarkdownProcessor.kt
+++ b/core/src/main/kotlin/Markdown/MarkdownProcessor.kt
@@ -4,13 +4,14 @@ import org.intellij.markdown.IElementType
 import org.intellij.markdown.MarkdownElementTypes
 import org.intellij.markdown.ast.ASTNode
 import org.intellij.markdown.ast.LeafASTNode
+import org.intellij.markdown.ast.getTextInNode
 import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor
 import org.intellij.markdown.parser.MarkdownParser
 
 class MarkdownNode(val node: ASTNode, val parent: MarkdownNode?, val markdown: String) {
     val children: List<MarkdownNode> = node.children.map { MarkdownNode(it, this, markdown) }
     val type: IElementType get() = node.type
-    val text: String get() = markdown.substring(node.startOffset, node.endOffset)
+    val text: String get() = node.getTextInNode(markdown).toString()
     fun child(type: IElementType): MarkdownNode? = children.firstOrNull { it.type == type }
 
     override fun toString(): String = StringBuilder().apply { presentTo(this) }.toString()
@@ -30,6 +31,7 @@ fun MarkdownNode.toTestString(): String {
     visit { node, visitChildren ->
         sb.append(" ".repeat(level * 2))
         node.presentTo(sb)
+        sb.appendln()
         level++
         visitChildren()
         level--
@@ -40,7 +42,6 @@ fun MarkdownNode.toTestString(): String {
 private fun MarkdownNode.presentTo(sb: StringBuilder) {
     sb.append(type.toString())
     sb.append(":" + text.replace("\n", "\u23CE"))
-    sb.appendln()
 }
 
 fun parseMarkdown(markdown: String): MarkdownNode {
diff --git a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt
index 864033f0..ca857aaa 100644
--- a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt
+++ b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt
@@ -68,6 +68,7 @@ open class KotlinWebsiteSampleProcessingService
         val psiFile = psiElement.containingFile
         if (psiFile is KtFile) {
             return ContentBlockCode("kotlin").apply {
+                append(ContentText("\n"))
                 psiFile.importList?.let {
                     it.children.filter {
                         it !is KtImportDirective || it.importPath !in importsToIgnore