Add ability to linkify substituted string

third_party/WebKit/Source/devtools/front_end/components/Linkifier.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 582 matching lines @@
    * @return {?UI.Icon}
    */
   linkIcon(uiSourceCode) {}
 };
 
 Components.LinkDecorator.Events = {
   LinkIconChanged: Symbol('LinkIconChanged')
 };
 
 /**
+ * @param {string} url
+ * @param {string} text
+ * @param {function(string,string,number=,number=):!Node} linkifier
+ * @return {!Node}
+ */
+Components.Linkifier.createLinkNodeWithCustomLinkifier = function(url, text, linkifier) {

[pfeldman, 2017/01/27 19:10:07]

It looks like this method is doing nothing. Linkifier should be capable of
splitting line and column itself.

[karabur, 2017/01/27 21:21:04]

It does not, this method called with three different linkifiers. From Linkifier
itself, from ConsoleViewMessage._buildMessage and from
TerminalWidget._linkifyTerminalLine. If i should make all of them capable of
splitting line and column, it will be copypasted logic. 

I can move that logic to another place but it still be as helper method, used in
Linkifier.linkifyScriptLocation and in createLinkNode(or linkifyURLsInNode
should it be replaced). Perhaps it will result in less code after all, will try.

+  var realURL = (url.startsWith('www.') ? 'http://' + url : url);
+  var splitResult = Common.ParsedURL.splitLineAndColumn(realURL);
+  var linkNode;
+  if (splitResult)
+    linkNode = linkifier(text, splitResult.url, splitResult.lineNumber, splitResult.columnNumber);
+  else
+    linkNode = linkifier(text, splitResult.url);
+
+  return linkNode;
+};
+
+/**
+ * @param {string} url
+ * @param {string} text
+ * @return {!Node}
+ */
+Components.Linkifier.createLinkNode = function(url, text) {

[pfeldman, 2017/01/27 19:10:07]

This method also does not do much.

+  /**
+   * @param {string} title
+   * @param {string} url
+   * @param {number=} lineNumber
+   * @param {number=} columnNumber
+   * @return {!Node}
+   */
+  function linkifier(title, url, lineNumber, columnNumber) {
+    return Components.Linkifier.linkifyURL(url, title, undefined, lineNumber, columnNumber);
+  }
+
+  return Components.Linkifier.createLinkNodeWithCustomLinkifier(url, text, linkifier);
+};
+
+/**
+ * @return {!RegExp}
+ */
+Components.Linkifier.getLinkRegExp = function() {

[pfeldman, 2017/01/27 19:10:07]

Does this need to be public? Start method with _ if not.

+  var linkStringRegEx =
+      /(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\/\/|data:|www\.)[\w$\-_+*'=\|\/\\(){}[\]^%@&#~,:;.!?]{2,}[\w$\-_+*=\|\/\\({^%@&#~]/;
+  var pathLineRegex = /(?:\/[\w\.-]*)+\:[\d]+/;
+
+  return new RegExp(linkStringRegEx.source + '|' + pathLineRegex, 'g');
+};
+
+/**
+ * @param {string} string
+ * @return {!Array.<!Common.SourceRange>}
+ */
+Components.Linkifier.getLinkRanges = function(string) {

[pfeldman, 2017/01/27 19:10:07]

Do we need this public?

+  var regExp = Components.Linkifier.getLinkRegExp();
+  var match = regExp.exec(string);
+  var ranges = [];
+  while (match) {
+    ranges.push(new Common.SourceRange(match.index, match[0].length));
+    match = regExp.exec(string);
+  }
+  return ranges;
+};
+
+/**
  * @param {string} string
  * @param {function(string,string,number=,number=):!Node} linkifier
  * @return {!DocumentFragment}
  */
 Components.linkifyStringAsFragmentWithCustomLinkifier = function(string, linkifier) {
   var container = createDocumentFragment();
-  var linkStringRegEx =
-      /(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\/\/|data:|www\.)[\w$\-_+*'=\|\/\\(){}[\]^%@&#~,:;.!?]{2,}[\w$\-_+*=\|\/\\({^%@&#~]/;
-  var pathLineRegex = /(?:\/[\w\.-]*)+\:[\d]+/;
 
   while (string && string.length < Components.Linkifier.MaxLengthToIgnoreLinkifier) {
-    var linkString = linkStringRegEx.exec(string) || pathLineRegex.exec(string);
-    if (!linkString)
+    var match = Components.Linkifier.getLinkRegExp().exec(string);
+
+    if (!match)
       break;
 
-    linkString = linkString[0];
-    var linkIndex = string.indexOf(linkString);
+    var linkIndex = match.index;
+    var linkString = match[0];
     var nonLink = string.substring(0, linkIndex);
     container.appendChild(createTextNode(nonLink));
 
-    var title = linkString;
-    var realURL = (linkString.startsWith('www.') ? 'http://' + linkString : linkString);
-    var splitResult = Common.ParsedURL.splitLineAndColumn(realURL);
-    var linkNode;
-    if (splitResult)
-      linkNode = linkifier(title, splitResult.url, splitResult.lineNumber, splitResult.columnNumber);
-    else
-      linkNode = linkifier(title, realURL);
+    var linkNode = Components.Linkifier.createLinkNodeWithCustomLinkifier(linkString, linkString, linkifier);
 
     container.appendChild(linkNode);
     string = string.substring(linkIndex + linkString.length, string.length);
   }
 
   if (string)
     container.appendChild(createTextNode(string));
 
   return container;
 };
@@ skipping 139 matching lines @@
     contextMenu.appendSeparator();
     contextMenu.appendItem(Common.UIString('Save'), save.bind(null, false));
 
     if (contentProvider instanceof Workspace.UISourceCode) {
       var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (contentProvider);
       if (!uiSourceCode.project().canSetFileContent())
         contextMenu.appendItem(Common.UIString.capitalize('Save ^as...'), save.bind(null, true));
     }
   }
 };