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

Fixed unstage hunk not working properly when having context lines inbetween changes

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-12-28 02:01:08 +01:00
parent 2e157aa773
commit ad55f41f58
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/app/git/StatusManager.kt
View File

@ -195,7 +195,9 @@ class StatusManager @Inject constructor(
// Restore previously removed lines to the index
for (line in removedLines) {
textLines.add(line.newLineNumber + linesAdded, line.text.withoutLineEnding)
// Check how many lines before this one have been deleted
val previouslyRemovedLines = addedLines.count { it.newLineNumber <= line.newLineNumber } - 1
textLines.add(line.newLineNumber + linesAdded - previouslyRemovedLines, line.text.withoutLineEnding)
linesAdded++
}