hotfix incorrect diff for descriptions/comments default tip

Sun, 14 Sep 2025 16:45:05 +0200

author
Mike Becker <universe@uap-core.de>
date
Sun, 14 Sep 2025 16:45:05 +0200
changeset 389
9d7f34e06d8d
parent 388
698541f09380

hotfix incorrect diff for descriptions/comments

relates to #719

src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt file | annotate | diff | comparison | revisions
--- a/src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt	Sun Sep 14 16:37:47 2025 +0200
+++ b/src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt	Sun Sep 14 16:45:05 2025 +0200
@@ -59,18 +59,18 @@
         .build()
     )
 
-    fun calculateDiff(earlier: String, later: String): String {
-        val diff = diffGenerator.generateDiffRows(
-            listOf(earlier.replace("\r", "")),
-            listOf(later.replace("\r", ""))
-        )[0]
-        return when (diff.tag) {
-            DiffRow.Tag.CHANGE -> diff.oldLine
-            DiffRow.Tag.DELETE -> "<strike style=\"color:red\">${diff.oldLine}</strike>"
-            DiffRow.Tag.INSERT -> "<i style=\"color: green\">${diff.newLine}</i>"
-            DiffRow.Tag.EQUAL -> diff.oldLine
-        }
-    }
+    fun calculateDiff(earlier: String, later: String): String =
+        diffGenerator.generateDiffRows(
+            earlier.replace("\r", "").split("\n"),
+            later.replace("\r", "").split("\n")
+        ).joinToString(separator = "\n", transform = { diff ->
+            when (diff.tag) {
+                DiffRow.Tag.CHANGE -> diff.oldLine
+                DiffRow.Tag.DELETE -> "<strike style=\"color:red\">${diff.oldLine}</strike>"
+                DiffRow.Tag.INSERT -> "<i style=\"color: green\">${diff.newLine}</i>"
+                DiffRow.Tag.EQUAL -> diff.oldLine
+            }
+        })
 
     private fun fullContent(data: IssueCommentHistoryEntry) =
         CommentDiff(

mercurial