Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2009 Joseph Pecoraro | 4 * Copyright (C) 2009 Joseph Pecoraro |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 159 case WebInspector.ConsoleMessage.MessageType.Dir: | 159 case WebInspector.ConsoleMessage.MessageType.Dir: |
| 160 var obj = consoleMessage.parameters ? consoleMessage.par ameters[0] : undefined; | 160 var obj = consoleMessage.parameters ? consoleMessage.par ameters[0] : undefined; |
| 161 var args = ["%O", obj]; | 161 var args = ["%O", obj]; |
| 162 this._messageElement = this._format(args); | 162 this._messageElement = this._format(args); |
| 163 break; | 163 break; |
| 164 case WebInspector.ConsoleMessage.MessageType.Profile: | 164 case WebInspector.ConsoleMessage.MessageType.Profile: |
| 165 case WebInspector.ConsoleMessage.MessageType.ProfileEnd: | 165 case WebInspector.ConsoleMessage.MessageType.ProfileEnd: |
| 166 this._messageElement = this._format([consoleMessage.mess ageText]); | 166 this._messageElement = this._format([consoleMessage.mess ageText]); |
| 167 break; | 167 break; |
| 168 default: | 168 default: |
| 169 if (consoleMessage.parameters && consoleMessage.paramete rs.length === 1 && consoleMessage.parameters[0].type === "string") | |
| 170 this._messageElement = this._tryFormatAsError(/**@t ype {string} */(consoleMessage.parameters[0].value)); | |
| 171 | |
| 169 var args = consoleMessage.parameters || [consoleMessage. messageText]; | 172 var args = consoleMessage.parameters || [consoleMessage. messageText]; |
| 170 this._messageElement = this._format(args); | 173 this._messageElement = this._messageElement || this._for mat(args); |
| 171 } | 174 } |
| 172 } else if (consoleMessage.source === WebInspector.ConsoleMessage.Mes sageSource.Network) { | 175 } else if (consoleMessage.source === WebInspector.ConsoleMessage.Mes sageSource.Network) { |
| 173 if (consoleMessage.request) { | 176 if (consoleMessage.request) { |
| 174 this._messageElement = createElement("span"); | 177 this._messageElement = createElement("span"); |
| 175 if (consoleMessage.level === WebInspector.ConsoleMessage.Mes sageLevel.Error) { | 178 if (consoleMessage.level === WebInspector.ConsoleMessage.Mes sageLevel.Error) { |
| 176 this._messageElement.createTextChildren(consoleMessage.r equest.requestMethod, " "); | 179 this._messageElement.createTextChildren(consoleMessage.r equest.requestMethod, " "); |
| 177 this._messageElement.appendChild(WebInspector.Linkifier. linkifyUsingRevealer(consoleMessage.request, consoleMessage.request.url, console Message.request.url)); | 180 this._messageElement.appendChild(WebInspector.Linkifier. linkifyUsingRevealer(consoleMessage.request, consoleMessage.request.url, console Message.request.url)); |
| 178 if (consoleMessage.request.failed) | 181 if (consoleMessage.request.failed) |
| 179 this._messageElement.createTextChildren(" ", console Message.request.localizedFailDescription); | 182 this._messageElement.createTextChildren(" ", console Message.request.localizedFailDescription); |
| 180 else | 183 else |
| (...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1265 break; | 1268 break; |
| 1266 } | 1269 } |
| 1267 | 1270 |
| 1268 return sourceString + " " + typeString + " " + levelString + ": " + this .formattedMessage().textContent + "\n" + this._message.url + " line " + this._me ssage.line; | 1271 return sourceString + " " + typeString + " " + levelString + ": " + this .formattedMessage().textContent + "\n" + this._message.url + " line " + this._me ssage.line; |
| 1269 }, | 1272 }, |
| 1270 | 1273 |
| 1271 get text() | 1274 get text() |
| 1272 { | 1275 { |
| 1273 return this._message.messageText; | 1276 return this._message.messageText; |
| 1274 }, | 1277 }, |
| 1278 | |
| 1279 /** | |
| 1280 * @param {string} string | |
| 1281 * @return {?Element} | |
| 1282 */ | |
| 1283 _tryFormatAsError: function(string) | |
| 1284 { | |
| 1285 if (!string.startsWith("Error")) | |
|
aandrey
2014/10/23 17:51:30
what about ReferenceError? RangeError, SyntaxError
sergeyv
2014/10/27 08:30:59
Done.
| |
| 1286 return null; | |
| 1287 | |
| 1288 var lines = string.split("\n"); | |
| 1289 var links = []; | |
| 1290 var position = 0; | |
| 1291 var beforeStack = true; | |
| 1292 for (var i = 0; i < lines.length; ++i) { | |
| 1293 position += i > 0 ? lines[i - 1].length + 1 : 0; | |
| 1294 var hasAt = lines[i].trim().startsWith("at "); | |
|
aandrey
2014/10/23 17:51:30
var isCallFrameLine = /^\s*at\s/.test(lines[i]);
sergeyv
2014/10/27 08:30:59
Done.
| |
| 1295 if (!hasAt && !beforeStack) | |
|
aandrey
2014/10/23 17:51:30
beforeStack -> links.length
sergeyv
2014/10/27 08:31:00
Done.
| |
| 1296 return null; | |
| 1297 | |
| 1298 if (!hasAt) | |
| 1299 continue; | |
| 1300 | |
| 1301 beforeStack = false; | |
| 1302 | |
| 1303 var openBracketIndex = lines[i].indexOf("("); | |
| 1304 var closeBracketIndex = lines[i].indexOf(")"); | |
| 1305 var hasOpenBracket = openBracketIndex !== -1; | |
| 1306 var hasCloseBracket = closeBracketIndex !== -1; | |
| 1307 | |
| 1308 if ((openBracketIndex > closeBracketIndex) || (hasOpenBracket ^ has CloseBracket)) | |
| 1309 return null; | |
| 1310 | |
| 1311 var left = hasOpenBracket ? openBracketIndex + 1 : lines[i].indexOf( "at") + 3; | |
| 1312 var right = hasOpenBracket ? closeBracketIndex : lines[i].length; | |
| 1313 var linkPretender = lines[i].substring(left, right); | |
| 1314 var splitResult = WebInspector.ParsedURL.splitLineAndColumn(linkPret ender); | |
| 1315 if (!splitResult) | |
| 1316 return null; | |
| 1317 | |
| 1318 var parsed = splitResult.url.asParsedURL(); | |
| 1319 if (!parsed) { | |
| 1320 var completeURL = WebInspector.ParsedURL.completeURL(WebInspecto r.targetManager.inspectedPageURL(), splitResult.url); | |
| 1321 parsed = completeURL ? completeURL.asParsedURL() : null; | |
| 1322 } | |
| 1323 | |
| 1324 if (!parsed) | |
| 1325 return null; | |
| 1326 | |
| 1327 links.push({url: parsed.url, positionLeft: position + left, position Right: position + right, lineNumber: splitResult.lineNumber, columnNumber: split Result.columnNumber}); | |
|
aandrey
2014/10/23 17:51:30
too complex...
sergeyv
2014/10/27 08:31:00
Acknowledged.
| |
| 1328 } | |
| 1329 | |
| 1330 if (beforeStack) | |
| 1331 return null; | |
| 1332 | |
| 1333 var formattedResult = createElement("span"); | |
| 1334 var start = 0; | |
| 1335 for (var i = 0; i < links.length; ++i) { | |
| 1336 formattedResult.appendChild(this._linkifier.linkifyStringAsFragment( this._target(), string.substring(start, links[i].positionLeft))); | |
| 1337 formattedResult.appendChild(this._linkifier.linkifyScriptLocation(th is._target(), null, links[i].url, links[i].lineNumber, links[i].columnNumber)); | |
| 1338 start = links[i].positionRight; | |
| 1339 } | |
| 1340 | |
| 1341 if (start != string.length) | |
| 1342 formattedResult.appendChild(this._linkifier.linkifyStringAsFragment( this._target(), string.substring(start))); | |
| 1343 | |
| 1344 return formattedResult; | |
| 1345 } | |
| 1275 } | 1346 } |
| 1276 | 1347 |
| 1277 /** | 1348 /** |
| 1278 * @constructor | 1349 * @constructor |
| 1279 * @extends {WebInspector.ConsoleViewMessage} | 1350 * @extends {WebInspector.ConsoleViewMessage} |
| 1280 * @param {!WebInspector.ConsoleMessage} consoleMessage | 1351 * @param {!WebInspector.ConsoleMessage} consoleMessage |
| 1281 * @param {!WebInspector.Linkifier} linkifier | 1352 * @param {!WebInspector.Linkifier} linkifier |
| 1282 * @param {number} nestingLevel | 1353 * @param {number} nestingLevel |
| 1283 */ | 1354 */ |
| 1284 WebInspector.ConsoleGroupViewMessage = function(consoleMessage, linkifier, nesti ngLevel) | 1355 WebInspector.ConsoleGroupViewMessage = function(consoleMessage, linkifier, nesti ngLevel) |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 1314 { | 1385 { |
| 1315 if (!this._wrapperElement) { | 1386 if (!this._wrapperElement) { |
| 1316 WebInspector.ConsoleViewMessage.prototype.toMessageElement.call(this ); | 1387 WebInspector.ConsoleViewMessage.prototype.toMessageElement.call(this ); |
| 1317 this._wrapperElement.classList.toggle("collapsed", this._collapsed); | 1388 this._wrapperElement.classList.toggle("collapsed", this._collapsed); |
| 1318 } | 1389 } |
| 1319 return this._wrapperElement; | 1390 return this._wrapperElement; |
| 1320 }, | 1391 }, |
| 1321 | 1392 |
| 1322 __proto__: WebInspector.ConsoleViewMessage.prototype | 1393 __proto__: WebInspector.ConsoleViewMessage.prototype |
| 1323 } | 1394 } |
| OLD | NEW |