From 4d70b056adbba3e23a2a3d06472c117077700ad8 Mon Sep 17 00:00:00 2001
From: SIkebe <SIkebe@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:59:03 +0900
Subject: [PATCH] Show issue/PR title as a tooltip (#2532)

* Show issue/PR title as a tooltip
* Enable title for issue/PR on activities
---
 .../gitbucket/core/view/LinkConverter.scala   | 20 +++++++++++--------
 .../scala/gitbucket/core/view/helpers.scala   | 10 ++++++----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/gitbucket/core/view/LinkConverter.scala b/src/main/scala/gitbucket/core/view/LinkConverter.scala
index dbc76cc94..34f5019e4 100644
--- a/src/main/scala/gitbucket/core/view/LinkConverter.scala
+++ b/src/main/scala/gitbucket/core/view/LinkConverter.scala
@@ -54,12 +54,14 @@ trait LinkConverter { self: RequestCache =>
       .replaceBy(("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)/([a-zA-Z0-9\\-_\\.]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r) {
         m =>
           getIssueFromCache(m.group(2), m.group(3), m.group(4)) match {
-            case Some(issue) if (issue.isPullRequest) =>
-              Some(s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/pull/${m.group(4)}">${m.group(2)}/${m.group(
+            case Some(pull) if (pull.isPullRequest) =>
+              Some(s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/pull/${m
+                .group(4)}" title="${pull.title}">${m.group(2)}/${m.group(
                 3
               )}#${m.group(4)}</a>""")
-            case Some(_) =>
-              Some(s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/issues/${m.group(4)}">${m.group(2)}/${m
+            case Some(issue) =>
+              Some(s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/issues/${m
+                .group(4)}" title="${issue.title}">${m.group(2)}/${m
                 .group(3)}#${m.group(4)}</a>""")
             case None =>
               Some(s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
@@ -93,11 +95,13 @@ trait LinkConverter { self: RequestCache =>
       .replaceBy(("(?<=(^|\\W))(GH-|(?<!&)" + issueIdPrefix + ")([0-9]+)(?=(\\W|$))").r) { m =>
         val prefix = if (m.group(2) == "issue:") "#" else m.group(2)
         getIssueFromCache(repository.owner, repository.name, m.group(3)) match {
-          case Some(issue) if (issue.isPullRequest) =>
-            Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(3)}">${prefix}${m
+          case Some(pull) if (pull.isPullRequest) =>
+            Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m
+              .group(3)}" title="${pull.title}">${prefix}${m
               .group(3)}</a>""")
-          case Some(_) =>
-            Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(3)}">${prefix}${m
+          case Some(issue) =>
+            Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m
+              .group(3)}"  title="${issue.title}">${prefix}${m
               .group(3)}</a>""")
           case None =>
             Some(s"""${m.group(2)}${m.group(3)}""")
diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index db353565a..11cff99c5 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -208,15 +208,17 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     Html(
       message
         .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"){ m =>
-          if (getRepositoryInfoFromCache(m.group(1), m.group(2)).isDefined) {
-            s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/issues/${m.group(3)}">${m.group(1)}/${m.group(2)}#${m.group(3)}</a>"""
+          val issue = getIssueFromCache(m.group(1), m.group(2), m.group(3))
+          if (issue.isDefined) {
+            s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/issues/${m.group(3)}" title="${issue.get.title}">${m.group(1)}/${m.group(2)}#${m.group(3)}</a>"""
           } else {
             s"${m.group(1)}/${m.group(2)}#${m.group(3)}"
           }
         }
         .replaceAll("\\[pullreq:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"){ m =>
-          if (getRepositoryInfoFromCache(m.group(1), m.group(2)).isDefined) {
-            s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/pull/${m.group(3)}">${m.group(1)}/${m.group(2)}#${m.group(3)}</a>"""
+          val pullreq = getIssueFromCache(m.group(1), m.group(2), m.group(3))
+          if (pullreq.isDefined) {
+            s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/pull/${m.group(3)}" title="${pullreq.get.title}">${m.group(1)}/${m.group(2)}#${m.group(3)}</a>"""
           } else {
             s"${m.group(1)}/${m.group(2)}#${m.group(3)}"
           }