fine tune

Author: wxiaoguang

services/gitdiff/gitdiff.go

@@ -191,7 +191,7 @@ func (d *DiffLine) RenderBlobExcerptButtons(fileNameHash string, data *DiffBlobE
 			link += fmt.Sprintf("&pull_issue_index=%d", data.PullIssueIndex)
 		}
 		return htmlutil.HTMLFormat(
-			`<button class="code-expander-button" hx-target="closest tr" hx-get="%s" data-hidden-comment-ids="%s">%s</button>`,
+			`<button class="code-expander-button" hx-target="closest tr" hx-get="%s" data-hidden-comment-ids=",%s,">%s</button>`,
 			link, dataHiddenCommentIDs, svg.RenderHTML(svgName),
 		)
 	}
@@ -224,7 +224,7 @@ func FillHiddenCommentIDsForDiffLine(line *DiffLine, lineComments map[int64][]*i
 	var hiddenCommentIDs []int64
 	for commentLineNum, comments := range lineComments {
 		if commentLineNum < 0 {
-			continue // Skip left-side
+			continue // Skip left-side, unchanged lines always use "right (proposed)" side for comments
 		}
 		lineNum := int(commentLineNum)
 		isEndOfFileExpansion := line.SectionInfo.RightHunkSize == 0

services/gitdiff/gitdiff_test.go

@@ -935,7 +935,7 @@ func TestDiffLine_RenderBlobExcerptButtons(t *testing.T) {
 				"octicon-fold-up",
 				"direction=down",
 				"direction=up",
-				"data-hidden-comment-ids=\"200,201\"",
+				`data-hidden-comment-ids=",200,201,"`, // use leading and trailing commas to ensure exact match by CSS selector `attr*=",id,"`
 				"pull_issue_index=42",
 				"2 hidden comment(s)",
 			},

web_src/js/features/repo-diff.ts

@@ -246,7 +246,7 @@ async function onLocationHashChange() {
     const issueCommentPrefix = '#issuecomment-';
     if (currentHash.startsWith(issueCommentPrefix)) {
       const commentId = currentHash.substring(issueCommentPrefix.length);
-      const expandButton = findExpandButtonForComment(commentId);
+      const expandButton = document.querySelector<HTMLElement>(`.code-expander-button[data-hidden-comment-ids*=",${commentId},"]`);
       if (expandButton) {
         // avoid infinite loop, do not re-click the button if already clicked
         const attrAutoLoadClicked = 'data-auto-load-clicked';
@@ -270,20 +270,6 @@ async function onLocationHashChange() {
   }
 }
 
-// Find the expand button that contains the target comment ID
-function findExpandButtonForComment(commentId: string): HTMLElement | null {
-  const expandButtons = document.querySelectorAll('.code-expander-button[data-hidden-comment-ids]');
-  for (const button of expandButtons) {
-    const hiddenIdsAttr = button.getAttribute('data-hidden-comment-ids');
-    if (!hiddenIdsAttr) continue;
-    const hiddenIds = hiddenIdsAttr.split(',').filter(Boolean);
-    if (hiddenIds.includes(commentId)) {
-      return button as HTMLElement;
-    }
-  }
-  return null;
-}
-
 function initRepoDiffHashChangeListener() {
   window.addEventListener('hashchange', onLocationHashChange);
   onLocationHashChange();