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

fix backward compatibility

Browse Source
This commit is contained in:
Ryooooooga
2021-08-04 18:43:34 +09:00
parent 67cc65930a
commit ac609bd37c
11 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,17 +137,19 @@ 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, error) {
func (hunk *PatchHunk) LineNumberOfLine(idx int) int {
n := idx - hunk.FirstLineIdx - 1
if n < 0 || len(hunk.bodyLines) <= n {
return -1, fmt.Errorf("line index out of range")
if n < 0 {
n = 0
} else if n >= len(hunk.bodyLines) {
n = len(hunk.bodyLines) - 1
}
lines := hunk.bodyLines[0:n]
offset := nLinesWithPrefix(lines, []string{"+", " "})
return hunk.newStart + offset, nil
return hunk.newStart + offset
}
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)
}