Fix incorrect diff expander for deletion of last lines in a file

silverwind · silverwind · commit 4f9979ad21b4 · 2024-02-29T17:39:20.000+01:00
Fixes: go-gitea#29498
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
@@ -154,7 +154,7 @@ func (d *DiffLine) GetBlobExcerptQuery() string {
 
 // GetExpandDirection gets DiffLineExpandDirection
 func (d *DiffLine) GetExpandDirection() DiffLineExpandDirection {
-	if d.Type != DiffLineSection || d.SectionInfo == nil || d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 {
+	if d.Type != DiffLineSection || d.SectionInfo == nil || d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 || d.SectionInfo.LeftIdx-d.SectionInfo.LastLeftIdx <= 1 {
 		return DiffLineExpandNone
 	}
 	if d.SectionInfo.LastLeftIdx <= 0 && d.SectionInfo.LastRightIdx <= 0 {

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func (d *DiffLine) GetBlobExcerptQuery() string {`
`154`	`154`
`155`	`155`	`// GetExpandDirection gets DiffLineExpandDirection`
`156`	`156`	`func (d *DiffLine) GetExpandDirection() DiffLineExpandDirection {`
`157`		`- if d.Type != DiffLineSection \|\| d.SectionInfo == nil \|\| d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 {`
	`157`	`+ if d.Type != DiffLineSection \|\| d.SectionInfo == nil \|\| d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 \|\| d.SectionInfo.LeftIdx-d.SectionInfo.LastLeftIdx <= 1 {`
`158`	`158`	`return DiffLineExpandNone`
`159`	`159`	`}`
`160`	`160`	`if d.SectionInfo.LastLeftIdx <= 0 && d.SectionInfo.LastRightIdx <= 0 {`