diff options
author | Ryooooooga <eial5q265e5@gmail.com> | 2021-08-04 18:43:34 +0900 |
---|---|---|
committer | Ryooooooga <eial5q265e5@gmail.com> | 2021-08-04 18:43:34 +0900 |
commit | ac609bd37c0b879ce08f0fcff7b1c7ef09d37333 (patch) | |
tree | e402ef4ca8af9929d0c9e1f9caa18ea25d34bb18 /pkg/commands/patch/patch_modifier.go | |
parent | 67cc65930ae62346fcc522f56da59fba5eef1dbe (diff) |
fix backward compatibility
Diffstat (limited to 'pkg/commands/patch/patch_modifier.go')
-rw-r--r-- | pkg/commands/patch/patch_modifier.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkg/commands/patch/patch_modifier.go b/pkg/commands/patch/patch_modifier.go index e5c6d061f..3ab13931b 100644 --- a/pkg/commands/patch/patch_modifier.go +++ b/pkg/commands/patch/patch_modifier.go @@ -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 { |