go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

Fix bug in LineNumberOfLine

Browse Source 
This fixes a regression that was introduced in 73c7dc9c5d00.
This commit is contained in:
Stefan Haller 2023-08-09 17:28:43 +02:00
parent bf699d3a79
commit 73b68927af
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/patch/patch.go
View File

@ -97,12 +97,12 @@ func (self *Patch) LineNumberOfLine(idx int) int {
idxInHunk := idx - hunkStartIdx idxInHunk := idx - hunkStartIdx
if idxInHunk == 0 { if idxInHunk == 0 {
return hunk.oldStart return hunk.newStart
} }
lines := hunk.bodyLines[:idxInHunk-1] lines := hunk.bodyLines[:idxInHunk-1]
offset := nLinesWithKind(lines, []PatchLineKind{ADDITION, CONTEXT}) offset := nLinesWithKind(lines, []PatchLineKind{ADDITION, CONTEXT})
return hunk.oldStart + offset return hunk.newStart + offset
} }
// Returns hunk index containing the line at the given patch line index // Returns hunk index containing the line at the given patch line index

2
pkg/commands/patch/patch_test.go
View File

@ -599,7 +599,7 @@ func TestLineNumberOfLine(t *testing.T) {
testName: "twoHunksWithMoreAdditionsThanRemovals", testName: "twoHunksWithMoreAdditionsThanRemovals",
patchStr: twoHunksWithMoreAdditionsThanRemovals, patchStr: twoHunksWithMoreAdditionsThanRemovals,
indexes: []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 1000}, indexes: []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 1000},
expecteds: []int{1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16}, expecteds: []int{1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 9, 9, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16},
}, },
} }