Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added line jump at the end of each diff line

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-10-10 03:00:56 +02:00
parent 0e7a682cdb
commit 4b4644bc73
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/app/git/DiffManager.kt
View File

@ -7,6 +7,8 @@ import org.eclipse.jgit.diff.DiffEntry
import org.eclipse.jgit.diff.DiffFormatter import org.eclipse.jgit.diff.DiffFormatter
import org.eclipse.jgit.dircache.DirCacheIterator import org.eclipse.jgit.dircache.DirCacheIterator
import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.lib.Repository
import org.eclipse.jgit.revplot.PlotCommit
import org.eclipse.jgit.revplot.PlotCommitList
import org.eclipse.jgit.revwalk.RevCommit import org.eclipse.jgit.revwalk.RevCommit
import org.eclipse.jgit.revwalk.RevTree import org.eclipse.jgit.revwalk.RevTree
import org.eclipse.jgit.revwalk.RevWalk import org.eclipse.jgit.revwalk.RevWalk
@ -39,8 +41,15 @@ class DiffManager @Inject constructor() {
// TODO This is just a workaround, try to find properly which lines have to be displayed by using a custom diff // TODO This is just a workaround, try to find properly which lines have to be displayed by using a custom diff
val containsWindowsNewLine = diff.contains("\r\n")
return@withContext diff.split("\n", "\r\n").filterNot { return@withContext diff.split("\n", "\r\n").filterNot {
it.startsWith("diff --app.git") it.startsWith("diff --git")
}.map {
if (containsWindowsNewLine)
"$it\r\n"
else
"$it\n"
} }
} }