fix 500 in blob_excerpt

Author: wxiaoguang

services/gitdiff/gitdiff.go

@@ -268,7 +268,7 @@ func DiffInlineWithUnicodeEscape(s template.HTML, locale translation.Locale) Dif
 	return DiffInline{EscapeStatus: status, Content: content}
 }
 
-func (diffSection *DiffSection) getLineContentForRender(lineIdx int, diffLine *DiffLine, highlightLines map[int]template.HTML) template.HTML {
+func (diffSection *DiffSection) getLineContentForRender(lineIdx int, diffLine *DiffLine, fileLanguage string, highlightLines map[int]template.HTML) template.HTML {
 	h, ok := highlightLines[lineIdx-1]
 	if ok {
 		return h
@@ -279,20 +279,27 @@ func (diffSection *DiffSection) getLineContentForRender(lineIdx int, diffLine *D
 	if setting.Git.DisableDiffHighlight {
 		return template.HTML(html.EscapeString(diffLine.Content[1:]))
 	}
-
-	h, _ = highlight.Code(diffSection.Name, diffSection.file.Language, diffLine.Content[1:])
+	h, _ = highlight.Code(diffSection.Name, fileLanguage, diffLine.Content[1:])
 	return h
 }
 
 func (diffSection *DiffSection) getDiffLineForRender(diffLineType DiffLineType, leftLine, rightLine *DiffLine, locale translation.Locale) DiffInline {
+	var fileLanguage string
+	var highlightedLeftLines, highlightedRightLines map[int]template.HTML
+	// when a "diff section" is manually prepared by ExcerptBlob, it doesn't have "file" information
+	if diffSection.file != nil {
+		fileLanguage = diffSection.file.Language
+		highlightedLeftLines, highlightedRightLines = diffSection.file.highlightedLeftLines, diffSection.file.highlightedRightLines
+	}
+
 	hcd := newHighlightCodeDiff()
 	var diff1, diff2, lineHTML template.HTML
 	if leftLine != nil {
-		diff1 = diffSection.getLineContentForRender(leftLine.LeftIdx, leftLine, diffSection.file.highlightedLeftLines)
+		diff1 = diffSection.getLineContentForRender(leftLine.LeftIdx, leftLine, fileLanguage, highlightedLeftLines)
 		lineHTML = util.Iif(diffLineType == DiffLinePlain, diff1, "")
 	}
 	if rightLine != nil {
-		diff2 = diffSection.getLineContentForRender(rightLine.RightIdx, rightLine, diffSection.file.highlightedRightLines)
+		diff2 = diffSection.getLineContentForRender(rightLine.RightIdx, rightLine, fileLanguage, highlightedRightLines)
 		lineHTML = util.Iif(diffLineType == DiffLinePlain, diff2, "")
 	}
 	if diffLineType != DiffLinePlain {

tests/integration/pull_commit_test.go

@@ -5,30 +5,33 @@ package integration
 
 import (
 	"net/http"
-	"net/url"
 	"testing"
 
 	pull_service "code.gitea.io/gitea/services/pull"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestListPullCommits(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		session := loginUser(t, "user5")
-		req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits/list")
-		resp := session.MakeRequest(t, req, http.StatusOK)
-
-		var pullCommitList struct {
-			Commits             []pull_service.CommitInfo `json:"commits"`
-			LastReviewCommitSha string                    `json:"last_review_commit_sha"`
-		}
-		DecodeJSON(t, resp, &pullCommitList)
-
-		if assert.Len(t, pullCommitList.Commits, 2) {
-			assert.Equal(t, "985f0301dba5e7b34be866819cd15ad3d8f508ee", pullCommitList.Commits[0].ID)
-			assert.Equal(t, "5c050d3b6d2db231ab1f64e324f1b6b9a0b181c2", pullCommitList.Commits[1].ID)
-		}
-		assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha)
+	session := loginUser(t, "user5")
+	req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits/list")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	var pullCommitList struct {
+		Commits             []pull_service.CommitInfo `json:"commits"`
+		LastReviewCommitSha string                    `json:"last_review_commit_sha"`
+	}
+	DecodeJSON(t, resp, &pullCommitList)
+
+	require.Len(t, pullCommitList.Commits, 2)
+	assert.Equal(t, "985f0301dba5e7b34be866819cd15ad3d8f508ee", pullCommitList.Commits[0].ID)
+	assert.Equal(t, "5c050d3b6d2db231ab1f64e324f1b6b9a0b181c2", pullCommitList.Commits[1].ID)
+	assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha)
+
+	t.Run("CommitBlobExcerpt", func(t *testing.T) {
+		req = NewRequest(t, "GET", "/user2/repo1/blob_excerpt/985f0301dba5e7b34be866819cd15ad3d8f508ee?last_left=0&last_right=0&left=2&right=2&left_hunk_size=2&right_hunk_size=2&path=README.md&style=split&direction=up")
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		assert.Contains(t, resp.Body.String(), `<td class="lines-code lines-code-new"><code class="code-inner"># repo1</code>`)
 	})
 }