Append (comment) when a link points at a comment rather than the whole issue

modules/markup/html.go

@@ -97,6 +97,12 @@ var issueFullPattern *regexp.Regexp
 // Once for to prevent races
 var issueFullPatternOnce sync.Once
 
+// regexp for full links to hash comment in pull request files changed tab
+var filesChangedFullPattern *regexp.Regexp
+
+// Once for to prevent races
+var filesChangedFullPatternOnce sync.Once
+
 func getIssueFullPattern() *regexp.Regexp {
 	issueFullPatternOnce.Do(func() {
 		issueFullPattern = regexp.MustCompile(regexp.QuoteMeta(setting.AppURL) +
@@ -105,6 +111,14 @@ func getIssueFullPattern() *regexp.Regexp {
 	return issueFullPattern
 }
 
+func getFilesChangedFullPattern() *regexp.Regexp {
+	filesChangedFullPatternOnce.Do(func() {
+		filesChangedFullPattern = regexp.MustCompile(regexp.QuoteMeta(setting.AppURL) +
+			`[\w_.-]+/[\w_.-]+/pulls/((?:\w{1,10}-)?[1-9][0-9]*)/files([\?|#](\S+)?)?\b`)
+	})
+	return filesChangedFullPattern
+}
+
 // CustomLinkURLSchemes allows for additional schemes to be detected when parsing links within text
 func CustomLinkURLSchemes(schemes []string) {
 	schemes = append(schemes, "http", "https")
@@ -797,21 +811,32 @@ func fullIssuePatternProcessor(ctx *RenderContext, node *html.Node) {
 	next := node.NextSibling
 	for node != nil && node != next {
 		m := getIssueFullPattern().FindStringSubmatchIndex(node.Data)
+		filesChangedm := getFilesChangedFullPattern().FindStringSubmatchIndex(node.Data)
 		if m == nil {
 			return
 		}
+
+		// if the link is from files changed tab in pull requests, leave it as it is
+		if filesChangedm != nil {
+			return
+		}
+
 		link := node.Data[m[0]:m[1]]
 		id := "#" + node.Data[m[2]:m[3]]
 
+		// if m[4] and m[5] is not -1, then link is to a comment
+		// indicate that in the text by appending (comment)
+		if m[4] != -1 && m[5] != -1 {
+			id += " (comment)"
+		}
+
 		// extract repo and org name from matched link like
 		// http://localhost:3000/gituser/myrepo/issues/1
 		linkParts := strings.Split(link, "/")
 		matchOrg := linkParts[len(linkParts)-4]
 		matchRepo := linkParts[len(linkParts)-3]
 
 		if matchOrg == ctx.Metas["user"] && matchRepo == ctx.Metas["repo"] {
-			// TODO if m[4]:m[5] is not nil, then link is to a comment,
-			// and we should indicate that in the text somehow
 			replaceContent(node, m[0], m[1], createLink(link, id, "ref-issue"))
 		} else {
 			orgRepoID := matchOrg + "/" + matchRepo + id

modules/markup/html_internal_test.go

@@ -330,13 +330,17 @@ func TestRender_FullIssueURLs(t *testing.T) {
 	test("Look here http://localhost:3000/person/repo/issues/4",
 		`Look here <a href="http://localhost:3000/person/repo/issues/4" class="ref-issue">person/repo#4</a>`)
 	test("http://localhost:3000/person/repo/issues/4#issuecomment-1234",
-		`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4</a>`)
+		`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4 (comment)</a>`)
 	test("http://localhost:3000/gogits/gogs/issues/4",
 		`<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a>`)
 	test("http://localhost:3000/gogits/gogs/issues/4 test",
 		`<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a> test`)
 	test("http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test",
-		`<a href="http://localhost:3000/gogits/gogs/issues/4?a=1&amp;b=2#comment-123" class="ref-issue">#4</a> test`)
+		`<a href="http://localhost:3000/gogits/gogs/issues/4?a=1&amp;b=2#comment-123" class="ref-issue">#4 (comment)</a> test`)
+	test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24",
+		"http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24")
+	test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files",
+		"http://localhost:3000/testOrg/testOrgRepo/pulls/2/files")
 }
 
 func TestRegExp_sha1CurrentPattern(t *testing.T) {

web_src/js/features/comp/MarkupContentPreview.js

@@ -1,5 +1,6 @@
 import $ from 'jquery';
 import {initMarkupContent} from '../../markup/content.js';
+import {attachTippyToRefIssues} from '../contextpopup.js';
 
 const {csrfToken} = window.config;
 
@@ -15,8 +16,12 @@ export function initCompMarkupContentPreviewTab($form) {
       text: $form.find(`.tab[data-tab="${$tabMenu.data('write')}"] textarea`).val()
     }, (data) => {
       const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`);
+      const refIssues = $previewPanel.find('p .ref-issue');
       $previewPanel.html(data);
       initMarkupContent();
+      if (refIssues) {
+        attachTippyToRefIssues(refIssues);
+      }
     });
   });
 }

web_src/js/features/contextpopup.js

@@ -7,7 +7,10 @@ import {createTippy} from '../modules/tippy.js';
 export function initContextPopups() {
   const refIssues = $('.ref-issue');
   if (!refIssues.length) return;
+  attachTippyToRefIssues(refIssues);
+}
 
+export function attachTippyToRefIssues(refIssues) {
   refIssues.each(function () {
     if ($(this).hasClass('ref-external-issue')) {
       return;

web_src/js/features/repo-legacy.js

@@ -26,6 +26,7 @@ import {initCompReactionSelector} from './comp/ReactionSelector.js';
 import {initRepoSettingBranches} from './repo-settings.js';
 import {initRepoPullRequestMergeForm} from './repo-issue-pr-form.js';
 import {hideElem, showElem} from '../utils/dom.js';
+import {attachTippyToRefIssues} from './contextpopup.js';
 
 const {csrfToken} = window.config;
 
@@ -439,6 +440,12 @@ async function onEditContent(event) {
         } else {
           $renderContent.html(data.content);
           $rawContent.text($textarea.val());
+          // check if the content contains ref-issue
+          // if there are ref issues, attach the tippy
+          const refIssues = $renderContent.find('p .ref-issue');
+          if (refIssues) {
+            attachTippyToRefIssues(refIssues);
+          }
         }
         const $content = $segment;
         if (!$content.find('.dropzone-attachments').length) {