# HG changeset patch # User Mike Becker # Date 1757861105 -7200 # Node ID 9d7f34e06d8d511e3a8a1fd4190c0cd33ed7c518 # Parent 698541f09380d771e81c8255ff4cfa9c5a51e163 hotfix incorrect diff for descriptions/comments relates to #719 diff -r 698541f09380 -r 9d7f34e06d8d src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt --- 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 -> "${diff.oldLine}" - DiffRow.Tag.INSERT -> "${diff.newLine}" - 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 -> "${diff.oldLine}" + DiffRow.Tag.INSERT -> "${diff.newLine}" + DiffRow.Tag.EQUAL -> diff.oldLine + } + }) private fun fullContent(data: IssueCommentHistoryEntry) = CommentDiff(