Skip to content

Commit 85bf170

Browse files
silverwindearl-warren
authored andcommitted
Fix incorrect diff expander for deletion of last lines in a file (#29501)
Fixes: go-gitea/gitea#29498 I don't quite understand this code, but this change does seem to fix the issue and I tested a number of diffs with it and saw no issue. The function gets such value if last line is an addition: ``` LastLeftIdx: (int) 0, LastRightIdx: (int) 47, LeftIdx: (int) 47, RightIdx: (int) 48, ``` If it's a deletion, it gets: ``` LastLeftIdx: (int) 47, LastRightIdx: (int) 0, LeftIdx: (int) 48, RightIdx: (int) 47, ``` So I think it's correct to make this check respect both left and right side. (cherry picked from commit 3b99066aa866e51e6a610716eaddfd1ea3645a67)
1 parent 08a4aa5 commit 85bf170

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

services/gitdiff/gitdiff.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (d *DiffLine) GetBlobExcerptQuery() string {
152152

153153
// GetExpandDirection gets DiffLineExpandDirection
154154
func (d *DiffLine) GetExpandDirection() DiffLineExpandDirection {
155-
if d.Type != DiffLineSection || d.SectionInfo == nil || d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 {
155+
if d.Type != DiffLineSection || d.SectionInfo == nil || d.SectionInfo.LeftIdx-d.SectionInfo.LastLeftIdx <= 1 || d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 {
156156
return DiffLineExpandNone
157157
}
158158
if d.SectionInfo.LastLeftIdx <= 0 && d.SectionInfo.LastRightIdx <= 0 {

0 commit comments

Comments
 (0)