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

Unified Diff: Source/devtools/front_end/common/ParsedURL.js

Issue 1204473005: DevTools: Tweak v8 code objects name parsing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added a test. Created 5 years, 6 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/common/ParsedURL.js
diff --git a/Source/devtools/front_end/common/ParsedURL.js b/Source/devtools/front_end/common/ParsedURL.js
index 0ed9aaad6d6dac49de266f3839d6a5659a6e96a2..2079651e6065b439efbe8208e726cd8c146a5645 100644
--- a/Source/devtools/front_end/common/ParsedURL.js
+++ b/Source/devtools/front_end/common/ParsedURL.js
@@ -259,26 +259,27 @@ WebInspector.ParsedURL.prototype = {
/**
* @param {string} string
- * @return {?{url: string, lineNumber: (number|undefined), columnNumber: (number|undefined)}}
+ * @return {!{url: string, lineNumber: (number|undefined), columnNumber: (number|undefined)}}
*/
WebInspector.ParsedURL.splitLineAndColumn = function(string)
{
- var lineColumnRegEx = /:(\d+)(:(\d+))?$/;
+ var lineColumnRegEx = /(?::(\d+))?(?::(\d+))?$/;
var lineColumnMatch = lineColumnRegEx.exec(string);
var lineNumber;
var columnNumber;
- if (!lineColumnMatch)
- return null;
+ console.assert(lineColumnMatch);
- 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);
+ if (typeof(lineColumnMatch[1]) === "string") {
+ lineNumber = parseInt(lineColumnMatch[1], 10);
+ // Immediately convert line and column to 0-based numbers.
+ lineNumber = isNaN(lineNumber) ? undefined : lineNumber - 1;
+ }
+ if (typeof(lineColumnMatch[2]) === "string") {
+ columnNumber = parseInt(lineColumnMatch[2], 10);
columnNumber = isNaN(columnNumber) ? undefined : columnNumber - 1;
}
- return { url: string.substring(0, string.length - lineColumnMatch[0].length), lineNumber: lineNumber, columnNumber: columnNumber};
+ return {url: string.substring(0, string.length - lineColumnMatch[0].length), lineNumber: lineNumber, columnNumber: columnNumber};
}
/**

Powered by Google App Engine
This is Rietveld 408576698