sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

fix out of range error

Browse Source
This commit is contained in:
Ryooooooga
2021-08-03 22:00:28 +09:00
parent 4f66093335
commit 67cc65930a
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/commands/patch/patch_modifier.go
View File

@ -137,12 +137,17 @@ func ModifiedPatchForLines(log *logrus.Entry, filename string, diffText string,
}
// I want to know, given a hunk, what line a given index is on
func (hunk *PatchHunk) LineNumberOfLine(idx int) int {
lines := hunk.bodyLines[0 : idx-hunk.FirstLineIdx-1]
func (hunk *PatchHunk) LineNumberOfLine(idx int) (int, error) {
n := idx - hunk.FirstLineIdx - 1
if n < 0 || len(hunk.bodyLines) <= n {
return -1, fmt.Errorf("line index out of range")
}
lines := hunk.bodyLines[0:n]
offset := nLinesWithPrefix(lines, []string{"+", " "})
return hunk.newStart + offset
return hunk.newStart + offset, nil
}
func nLinesWithPrefix(lines []string, chars []string) int {

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

@ -539,7 +539,7 @@ func TestLineNumberOfLine(t *testing.T) {
for _, s := range scenarios {
t.Run(s.testName, func(t *testing.T) {
result := s.hunk.LineNumberOfLine(s.idx)
result, _ := s.hunk.LineNumberOfLine(s.idx)
if !assert.Equal(t, s.expected, result) {
fmt.Println(result)
}