diff options
| author | silverwind <me@silverwind.io> | 2024-03-01 17:12:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 16:12:21 +0000 |
| commit | 3b99066aa866e51e6a610716eaddfd1ea3645a67 (patch) | |
| tree | 7441a989c40f67aab6823b5b51e21459f502a546 | |
| parent | 6841e58d1fae33311fa0239823def9dd8fba4c1f (diff) | |
| download | gitea-3b99066aa866e51e6a610716eaddfd1ea3645a67.tar.gz gitea-3b99066aa866e51e6a610716eaddfd1ea3645a67.zip | |
Fix incorrect diff expander for deletion of last lines in a file (#29501)
Fixes: https://github.com/go-gitea/gitea/issues/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.
| -rw-r--r-- | services/gitdiff/gitdiff.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 740c748347..b05c210a0c 100644 --- 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.LeftIdx-d.SectionInfo.LastLeftIdx <= 1 || d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 { return DiffLineExpandNone } if d.SectionInfo.LastLeftIdx <= 0 && d.SectionInfo.LastRightIdx <= 0 { |