Fix handling of multiple nodes in list item

JetBrains · Apr 22, 2023 · eb827c4 · eb827c4
1 parent 6c9239e
commit eb827c4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+### Fixed
+- No-longer discard all but the last paragraph in list items [#133](../../issues/133) [#147](../../issues/147)
+
 ## [2.0.0] - 2022-10-28
 
 ### Added

diff --git a/src/main/kotlin/org/jetbrains/changelog/Changelog.kt b/src/main/kotlin/org/jetbrains/changelog/Changelog.kt
@@ -364,6 +364,17 @@ data class Changelog(
         HTML,
     }
 
+    private fun ASTNode?.textAsIs(customContent: String? = null) = this
+        ?.getTextInNode(customContent ?: content)
+        ?.let {
+            when (type) {
+                EOL -> lineSeparator
+                else -> it
+            }
+        }
+        ?.toString()
+        .orEmpty()
+
     private fun ASTNode?.text(customContent: String? = null) = this
         ?.getTextInNode(customContent ?: content)
         ?.let {
@@ -431,7 +442,11 @@ data class Changelog(
                     .flatMap { list ->
                         list.children
                             .filter { it.type == org.intellij.markdown.MarkdownElementTypes.LIST_ITEM }
-                            .map { it.children.last().text(content) }
+                            .map { listItem ->
+                                listItem.children
+                                    .drop(1) // MarkdownTokenTypes.LIST_BULLET or LIST_NUMBER
+                                    .joinToString("") { it.textAsIs(content) }
+                            }
                             .toSet()
                     }
                     .toSet()
@@ -445,7 +460,11 @@ data class Changelog(
                 .associate { (left, right) ->
                     left.text(content) to right.children
                         .filter { it.type == org.intellij.markdown.MarkdownElementTypes.LIST_ITEM }
-                        .map { it.children.last().text(content) }
+                        .map { listItem ->
+                            listItem.children
+                                .drop(1) // MarkdownTokenTypes.LIST_BULLET or LIST_NUMBER
+                                .joinToString("") { it.textAsIs(content) }
+                        }
                         .toSet()
                 }