Merge PR #5978: Bugzilla autolink: avoid linking inside links (fix #5974).

1 files changed, 40 insertions, 6 deletions

diff --git a/dev/Coq_Bugzilla_autolink.user.js b/dev/Coq_Bugzilla_autolink.user.js
index 371c5adc00..5ff618a839 100644
--- a/dev/Coq_Bugzilla_autolink.user.js
+++ b/dev/Coq_Bugzilla_autolink.user.js
@@ -10,25 +10,59 @@
 var regex = /BZ#(\d+)/g;
 var substr = '<a href="https://coq.inria.fr/bugs/show_bug.cgi?id=$1">$&</a>';
 
-function doNode(node)
+function doTitle(node)
 {
     node.innerHTML = node.innerHTML.replace(regex,substr);
 }
 
+function filter(node)
+{
+  if (node.nodeName == '#text')
+    {
+      return NodeFilter.FILTER_ACCEPT;
+    }
+  else if(node.nodeName == 'A')
+    {
+      return NodeFilter.FILTER_REJECT;
+    }
+  return NodeFilter.FILTER_SKIP;
+}
 var comments = document.getElementsByClassName("comment-body");
 
-for(var i=0; i<comments.length; i++)
+function doNode(parent)
 {
-    var pars = comments[i].getElementsByTagName("p");
-    for(var j=0; j<pars.length; j++)
+    var nodes = document.createTreeWalker(parent,NodeFilter.SHOW_ALL,{ acceptNode : filter },false);
+    var node;
+    while(node=nodes.nextNode())
     {
-        doNode(pars[j]);
+      var content = node.textContent;
+      var matches = regex.exec(content);
+
+      if(matches && matches.length > 1)
+      {
+        var range = document.createRange();
+        var start = content.search(regex);
+        var end = start + matches[0].length;
+        range.setStart(node, start);
+        range.setEnd(node, end);
+        var linkNode = document.createElement("a");
+        linkNode.href = "https://coq.inria.fr/bugs/show_bug.cgi?id=" + matches[1];
+        range.surroundContents(linkNode);
+
+        //handle multiple matches in one text node
+        doNode(linkNode.parentNode);
+      }
     }
 }
 
+for(var i=0; i<comments.length; i++)
+{
+  doNode(comments[i]);
+}
+
 // usually 1 or 0 titles...
 var titles = document.getElementsByClassName("js-issue-title");
 for(var i=0; i<titles.length; i++)
 {
-    doNode(titles[i]);
+    doTitle(titles[i]);
 }