chore: fix lint issues

chore: removed unwanted code chore: lint issues
go-gitea · Nov 11, 2024 · ed80303 · ed80303
1 parent 914bed8
commit ed80303
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
@@ -868,7 +868,6 @@ func ExcerptBlob(ctx *context.Context) {
 	lastRightCommentIdx := ctx.FormInt("last_left_comment_idx")
 	rightCommentIdx := ctx.FormInt("left_comment_idx")
 	fileName := ctx.FormString("file_name")
-
 	if ctx.FormBool("pull") {
 		ctx.Data["PageIsPullFiles"] = true
 	}
@@ -891,6 +890,10 @@ func ExcerptBlob(ctx *context.Context) {
 	}
 
 	allComments, err := issues_model.FetchCodeComments(ctx, issue, ctx.Doer, false)
+	if err != nil {
+		ctx.ServerError("FetchCodeComments", err)
+		return
+	}
 	lineCommits := allComments[fileName]
 
 	chunkSize := gitdiff.BlobExcerptChunkSize
@@ -958,30 +961,19 @@ func ExcerptBlob(ctx *context.Context) {
 			section.Lines = append(section.Lines, lineSection)
 		}
 	}
-
 	for _, line := range section.Lines {
 		if line.SectionInfo != nil {
-			//for now considerign only right side.
 			start := int64(line.SectionInfo.LastRightIdx + 1)
 			end := int64(line.SectionInfo.RightIdx - 1)
-
-			//to check section has comments or not.
-			//1.  we can use binary search
-			//2. we can LastRightCommentIdx, RightCommentIdx, LastLeftCommentIdx, LeftCommentIdx(little complex but fast)
-			//3. for demo using linear search
 			for start <= end {
 				if _, ok := lineCommits[start]; ok {
 					if !line.SectionInfo.HasComments {
-						// line.SectionInfo.LastRightCommentIdx = int(start)
-						// line.SectionInfo.RightCommentIdx = int(start)
 						line.SectionInfo.HasComments = true
 						break
 					}
-
 				}
-				start += 1
+				start++
 			}
-
 		}
 		if comments, ok := lineCommits[int64(line.LeftIdx*-1)]; ok {
 			line.Comments = append(line.Comments, comments...)
@@ -994,7 +986,6 @@ func ExcerptBlob(ctx *context.Context) {
 			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 {
@@ -1003,18 +994,15 @@ func ExcerptBlob(ctx *context.Context) {
 			}
 		}
 	}
-
 	ctx.Data["section"] = section
 	ctx.Data["FileNameHash"] = git.HashFilePathForWebUI(filePath)
 	ctx.Data["AfterCommitID"] = commitID
 	ctx.Data["Anchor"] = anchor
 	ctx.Data["Issue"] = issue
 	ctx.Data["issue"] = issue.Index
-	ctx.Data["SignedUserID"] = ctx.Data["SignedUserID"]
 	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
 	}

diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
@@ -485,20 +485,14 @@ func (diff *Diff) LoadComments(ctx context.Context, issue *issues_model.Issue, c
 					if line.SectionInfo != nil {
 						start := int64(line.SectionInfo.LastRightIdx + 1)
 						end := int64(line.SectionInfo.RightIdx - 1)
-
 						for start <= end {
 							if _, ok := lineCommits[start]; ok {
-								if line.SectionInfo.LastRightCommentIdx == 0 {
-									// line.SectionInfo.LastRightCommentIdx = int(start)
-									// line.SectionInfo.RightCommentIdx = int(start)
+								if !line.SectionInfo.HasComments {
 									line.SectionInfo.HasComments = true
-
 									break
 								}
-
 							}
-							start += 1
-
+							start++
 						}
 					}
 					if comments, ok := lineCommits[int64(line.LeftIdx*-1)]; ok {

diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl
@@ -91,19 +91,16 @@
 						<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.PageIsWiki}}&pull={{$.PageIsPullFiles}}&anchor={{$.Anchor}}&file_name={{$.section.FileName}}">
 							{{svg "octicon-fold-down"}}
 						</button>
-						test else down blob {{$line.SectionInfo.HasComments}}
 					{{end}}
 					{{if or (eq $expandDirection 3) (eq $expandDirection 4)}}
 						<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&wiki={{$.PageIsWiki}}&pull={{$.PageIsPullFiles}}&anchor={{$.Anchor}}&file_name={{$.section.FileName}}">
 							{{svg "octicon-fold-up"}}
 						</button>
-						test else up  blob
 					{{end}}
 					{{if eq $expandDirection 2}}
 						<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=&wiki={{$.PageIsWiki}}&pull={{$.PageIsPullFiles}}&anchor={{$.Anchor}}&file_name={{$.section.FileName}}">
 							{{svg "octicon-fold"}}
 						</button>
-						test else both  blob
 					{{end}}
 				</div>
 			 </div>	

diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl
@@ -27,19 +27,16 @@
 								<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptRepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.root.PageIsWiki}}&pull={{$.root.PageIsPullFiles}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}&file_name={{$section.FileName}}">
 									{{svg "octicon-fold-down"}}
 								</button>
-								test down
 							{{end}}
 							{{if or (eq $expandDirection 3) (eq $expandDirection 4)}}
 								<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptRepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&wiki={{$.root.PageIsWiki}}&pull={{$.root.PageIsPullFiles}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}&file_name={{$section.FileName}}">
 									{{svg "octicon-fold-up"}}
 								</button>
-								test up
 							{{end}}
 							{{if eq $expandDirection 2}}
 								<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptRepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=&wiki={{$.root.PageIsWiki}}&pull={{$.root.PageIsPullFiles}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}&file_name={{$section.FileName}}">
 									{{svg "octicon-fold"}}
 								</button>
-								test fold
 							{{end}}
 						</div>
 						</div>