Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4600)

Unified Diff: Source/devtools/front_end/bindings/ResourceUtils.js

Issue 674513002: DevTools: linkify relative links in console.log(new Error().stack) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/bindings/ResourceUtils.js
diff --git a/Source/devtools/front_end/bindings/ResourceUtils.js b/Source/devtools/front_end/bindings/ResourceUtils.js
index e35eabc854c8d2318166c3ac1e2ab326a6bec390..12d3ac0dd5af93d320b681620bcf8b2c6115dcc4 100644
--- a/Source/devtools/front_end/bindings/ResourceUtils.js
+++ b/Source/devtools/front_end/bindings/ResourceUtils.js
@@ -101,7 +101,6 @@ WebInspector.linkifyStringAsFragmentWithCustomLinkifier = function(string, linki
{
var container = document.createDocumentFragment();
var linkStringRegEx = /(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\/\/|data:|www\.)[\w$\-_+*'=\|\/\\(){}[\]^%@&#~,:;.!?]{2,}[\w$\-_+*=\|\/\\({^%@&#~]/;
- var lineColumnRegEx = /:(\d+)(:(\d+))?$/;
while (string) {
var linkString = linkStringRegEx.exec(string);
@@ -116,21 +115,14 @@ WebInspector.linkifyStringAsFragmentWithCustomLinkifier = function(string, linki
var title = linkString;
var realURL = (linkString.startsWith("www.") ? "http://" + linkString : linkString);
var parsedURL = new WebInspector.ParsedURL(realURL);
- var lineColumnMatch = lineColumnRegEx.exec(parsedURL.lastPathComponent);
- var lineNumber;
- var columnNumber;
- if (lineColumnMatch) {
- realURL = realURL.substring(0, realURL.length - lineColumnMatch[0].length);
- lineNumber = parseInt(lineColumnMatch[1], 10);
- // Immediately convert line and column to 0-based numbers.
- lineNumber = isNaN(lineNumber) ? undefined : lineNumber - 1;
- if (typeof(lineColumnMatch[3]) === "string") {
- columnNumber = parseInt(lineColumnMatch[3], 10);
- columnNumber = isNaN(columnNumber) ? undefined : columnNumber - 1;
- }
- }
-
- var linkNode = linkifier(title, realURL, lineNumber, columnNumber);
+ var splitResult = WebInspector.ParsedURL.splitLineAndColumn(parsedURL.lastPathComponent);
+ var linkNode;
+ if (splitResult) {
+ var link = realURL.substring(0, realURL.length - parsedURL.lastPathComponent.length + splitResult.url.length);
+ linkNode = linkifier(title, splitResult.url, splitResult.lineNumber, splitResult.columnNumber);
+ } else
aandrey 2014/10/23 17:51:30 { .. }
+ linkNode = linkifier(title, realURL);
+
container.appendChild(linkNode);
string = string.substring(linkIndex + linkString.length, string.length);
}

Powered by Google App Engine
This is Rietveld 408576698