feat: phase 1 changes: add comments feat to unchanged lines in the pullrequest

routers/web/repo/compare.go

@@ -14,6 +14,7 @@ import (
 	"net/http"
 	"net/url"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"code.gitea.io/gitea/models/db"
@@ -39,6 +40,7 @@ import (
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/context/upload"
 	"code.gitea.io/gitea/services/gitdiff"
+	user_service "code.gitea.io/gitea/services/user"
 )
 
 const (
@@ -863,6 +865,10 @@ func ExcerptBlob(ctx *context.Context) {
 	direction := ctx.FormString("direction")
 	filePath := ctx.FormString("path")
 	gitRepo := ctx.Repo.GitRepo
+	if ctx.FormBool("pull") {
+		ctx.Data["PageIsPullFiles"] = true
+	}
+
 	if ctx.FormBool("wiki") {
 		var err error
 		gitRepo, err = gitrepo.OpenWikiRepository(ctx, ctx.Repo.Repository)
@@ -881,6 +887,7 @@ func ExcerptBlob(ctx *context.Context) {
 	section := &gitdiff.DiffSection{
 		FileName: filePath,
 		Name:     filePath,
+		Lines:    []*gitdiff.DiffLine{},
 	}
 	if direction == "up" && (idxLeft-lastLeft) > chunkSize {
 		idxLeft -= chunkSize
@@ -917,25 +924,88 @@ func ExcerptBlob(ctx *context.Context) {
 			Type:    gitdiff.DiffLineSection,
 			Content: lineText,
 			SectionInfo: &gitdiff.DiffLineSectionInfo{
-				Path:          filePath,
-				LastLeftIdx:   lastLeft,
-				LastRightIdx:  lastRight,
-				LeftIdx:       idxLeft,
-				RightIdx:      idxRight,
-				LeftHunkSize:  leftHunkSize,
-				RightHunkSize: rightHunkSize,
+				Path:                filePath,
+				LastLeftIdx:         lastLeft,
+				LastRightIdx:        lastRight,
+				LeftIdx:             idxLeft,
+				RightIdx:            idxRight,
+				LeftHunkSize:        leftHunkSize,
+				RightHunkSize:       rightHunkSize,
+				HasComments:         false,
+				LastRightCommentIdx: 0,
+				RightCommentIdx:     0,
 			},
+			Comments: nil,
 		}
 		if direction == "up" {
 			section.Lines = append([]*gitdiff.DiffLine{lineSection}, section.Lines...)
 		} else if direction == "down" {
 			section.Lines = append(section.Lines, lineSection)
 		}
 	}
+	issueIndex := ctx.FormInt64("issue_index")
+	if ctx.FormBool("pull") && issueIndex > 0 {
+		issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, issueIndex)
+		if issue == nil {
+			ctx.ServerError("GetIssueByIndex", err)
+			return
+		}
+		allComments, err := issues_model.FetchCodeComments(ctx, issue, ctx.Doer, false)
+		if err != nil {
+			ctx.ServerError("FetchCodeComments", err)
+			return
+		}
+		lineCommits := allComments[filePath]
+		for index, line := range section.Lines {
+			if line.SectionInfo != nil && line.Type == 4 && !(line.SectionInfo.LastRightIdx == 0 && index+1 == len(section.Lines)) {
+				start := int64(line.SectionInfo.LastRightIdx + 1)
+				end := int64(line.SectionInfo.RightIdx - 1)
+				for start <= end {
+					if _, ok := lineCommits[start]; ok {
+						if !line.SectionInfo.HasComments {
+							line.SectionInfo.HasComments = true
+							break
+						}
+					}
+					start++
+				}
+			}
+			if comments, ok := lineCommits[int64(line.LeftIdx*-1)]; ok {
+				line.Comments = append(line.Comments, comments...)
+			}
+			if comments, ok := lineCommits[int64(line.RightIdx)]; ok {
+				line.Comments = append(line.Comments, comments...)
+			}
+
+			sort.SliceStable(line.Comments, func(i, j int) bool {
+				return line.Comments[i].CreatedUnix < line.Comments[j].CreatedUnix
+			})
+		}
+		for _, line := range section.Lines {
+			for _, comment := range line.Comments {
+				if err := comment.LoadAttachments(ctx); err != nil {
+					ctx.ServerError("LoadAttachments", err)
+					return
+				}
+			}
+		}
+		ctx.Data["Issue"] = issue
+		ctx.Data["IssueIndex"] = issue.Index
+	}
 	ctx.Data["section"] = section
 	ctx.Data["FileNameHash"] = git.HashFilePathForWebUI(filePath)
 	ctx.Data["AfterCommitID"] = commitID
 	ctx.Data["Anchor"] = anchor
+	ctx.Data["CanBlockUser"] = func(blocker, blockee *user_model.User) bool {
+		return user_service.CanBlockUser(ctx, ctx.Doer, blocker, blockee)
+	}
+	if ctx.Data["SignedUserID"] == nil {
+		ctx.Data["SignedUserID"] = ctx.Doer.ID
+	}
+	ctx.Data["SignedUser"] = ctx.Doer
+	ctx.Data["IsSigned"] = ctx.Doer != nil
+	ctx.Data["Repository"] = ctx.Repo.Repository
+	ctx.Data["Permission"] = &ctx.Repo.Permission
 	ctx.HTML(http.StatusOK, tplBlobExcerpt)
 }
 
@@ -964,6 +1034,7 @@ func getExcerptLines(commit *git.Commit, filePath string, idxLeft, idxRight, chu
 			RightIdx: line + 1,
 			Type:     gitdiff.DiffLinePlain,
 			Content:  " " + lineText,
+			Comments: []*issues_model.Comment{},
 		}
 		diffLines = append(diffLines, diffLine)
 	}

routers/web/repo/pull.go

@@ -128,6 +128,7 @@ func getPullInfo(ctx *context.Context) (issue *issues_model.Issue, ok bool) {
 	}
 	ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, emoji.ReplaceAliases(issue.Title))
 	ctx.Data["Issue"] = issue
+	ctx.Data["IssueIndex"] = issue.Index
 
 	if !issue.IsPull {
 		ctx.NotFound("ViewPullCommits", nil)

routers/web/web.go

@@ -1521,6 +1521,10 @@ func registerRoutes(m *web.Router) {
 			m.Get("/{sha}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ExcerptBlob)
 		}, func(ctx *context.Context) gocontext.CancelFunc {
 			// FIXME: refactor this function, use separate routes for wiki/code
+			if ctx.FormBool("pull") {
+				ctx.Data["PageIsPullFiles"] = true
+			}
+
 			if ctx.FormBool("wiki") {
 				ctx.Data["PageIsWiki"] = true
 				repo.MustEnableWiki(ctx)

services/gitdiff/gitdiff.go

@@ -86,13 +86,16 @@ type DiffLine struct {
 
 // DiffLineSectionInfo represents diff line section meta data
 type DiffLineSectionInfo struct {
-	Path          string
-	LastLeftIdx   int
-	LastRightIdx  int
-	LeftIdx       int
-	RightIdx      int
-	LeftHunkSize  int
-	RightHunkSize int
+	Path                string
+	LastLeftIdx         int
+	LastRightIdx        int
+	LeftIdx             int
+	RightIdx            int
+	LeftHunkSize        int
+	RightHunkSize       int
+	HasComments         bool
+	LastRightCommentIdx int
+	RightCommentIdx     int
 }
 
 // BlobExcerptChunkSize represent max lines of excerpt
@@ -143,10 +146,12 @@ func (d *DiffLine) GetBlobExcerptQuery() string {
 		"last_left=%d&last_right=%d&"+
 			"left=%d&right=%d&"+
 			"left_hunk_size=%d&right_hunk_size=%d&"+
+			"last_rightt_comment_idx=%d&right_comment_idx=%d&"+
 			"path=%s",
 		d.SectionInfo.LastLeftIdx, d.SectionInfo.LastRightIdx,
 		d.SectionInfo.LeftIdx, d.SectionInfo.RightIdx,
 		d.SectionInfo.LeftHunkSize, d.SectionInfo.RightHunkSize,
+		d.SectionInfo.LastRightCommentIdx, d.SectionInfo.RightCommentIdx,
 		url.QueryEscape(d.SectionInfo.Path))
 	return query
 }
@@ -170,13 +175,16 @@ func getDiffLineSectionInfo(treePath, line string, lastLeftIdx, lastRightIdx int
 	leftLine, leftHunk, rightLine, righHunk := git.ParseDiffHunkString(line)
 
 	return &DiffLineSectionInfo{
-		Path:          treePath,
-		LastLeftIdx:   lastLeftIdx,
-		LastRightIdx:  lastRightIdx,
-		LeftIdx:       leftLine,
-		RightIdx:      rightLine,
-		LeftHunkSize:  leftHunk,
-		RightHunkSize: righHunk,
+		Path:                treePath,
+		LastLeftIdx:         lastLeftIdx,
+		LastRightIdx:        lastRightIdx,
+		LeftIdx:             leftLine,
+		RightIdx:            rightLine,
+		LeftHunkSize:        leftHunk,
+		RightHunkSize:       righHunk,
+		HasComments:         false,
+		LastRightCommentIdx: 0,
+		RightCommentIdx:     0,
 	}
 }
 
@@ -396,11 +404,14 @@ func (diffFile *DiffFile) GetTailSection(gitRepo *git.Repository, leftCommit, ri
 		Type:    DiffLineSection,
 		Content: " ",
 		SectionInfo: &DiffLineSectionInfo{
-			Path:         diffFile.Name,
-			LastLeftIdx:  lastLine.LeftIdx,
-			LastRightIdx: lastLine.RightIdx,
-			LeftIdx:      leftLineCount,
-			RightIdx:     rightLineCount,
+			Path:                diffFile.Name,
+			LastLeftIdx:         lastLine.LeftIdx,
+			LastRightIdx:        lastLine.RightIdx,
+			LeftIdx:             leftLineCount,
+			RightIdx:            rightLineCount,
+			HasComments:         false,
+			LastRightCommentIdx: 0,
+			RightCommentIdx:     0,
 		},
 	}
 	tailSection := &DiffSection{FileName: diffFile.Name, Lines: []*DiffLine{tailDiffLine}}
@@ -458,16 +469,32 @@ type Diff struct {
 	NumViewedFiles               int // user-specific
 }
 
+// function (section *DiffSection) GetType() int {
+
 // LoadComments loads comments into each line
 func (diff *Diff) LoadComments(ctx context.Context, issue *issues_model.Issue, currentUser *user_model.User, showOutdatedComments bool) error {
 	allComments, err := issues_model.FetchCodeComments(ctx, issue, currentUser, showOutdatedComments)
 	if err != nil {
 		return err
 	}
+
 	for _, file := range diff.Files {
 		if lineCommits, ok := allComments[file.Name]; ok {
 			for _, section := range file.Sections {
-				for _, line := range section.Lines {
+				for index, line := range section.Lines {
+					if line.SectionInfo != nil && line.Type == 4 && !(line.SectionInfo.LastRightIdx == 0 && index+1 == len(section.Lines)) {
+						start := int64(line.SectionInfo.LastRightIdx + 1)
+						end := int64(line.SectionInfo.RightIdx - 1)
+						for start <= end {
+							if _, ok := lineCommits[start]; ok {
+								if !line.SectionInfo.HasComments {
+									line.SectionInfo.HasComments = true
+									break
+								}
+							}
+							start++
+						}
+					}
 					if comments, ok := lineCommits[int64(line.LeftIdx*-1)]; ok {
 						line.Comments = append(line.Comments, comments...)
 					}

services/repository/files/diff_test.go

@@ -59,13 +59,16 @@ func TestGetDiffPreview(t *testing.T) {
 								Content:  "@@ -1,3 +1,4 @@",
 								Comments: nil,
 								SectionInfo: &gitdiff.DiffLineSectionInfo{
-									Path:          "README.md",
-									LastLeftIdx:   0,
-									LastRightIdx:  0,
-									LeftIdx:       1,
-									RightIdx:      1,
-									LeftHunkSize:  3,
-									RightHunkSize: 4,
+									Path:                "README.md",
+									LastLeftIdx:         0,
+									LastRightIdx:        0,
+									LeftIdx:             1,
+									RightIdx:            1,
+									LeftHunkSize:        3,
+									RightHunkSize:       4,
+									HasComments:         false,
+									LastRightCommentIdx: 0,
+									RightCommentIdx:     0,
 								},
 							},
 							{