| Index: Source/devtools/front_end/console/ConsoleView.js
|
| diff --git a/Source/devtools/front_end/console/ConsoleView.js b/Source/devtools/front_end/console/ConsoleView.js
|
| index 3000b329f61ef9161fab5836abd2996c76da10ed..3a62bdfbe2c42a8f107d733730125e8cf638fcb3 100644
|
| --- a/Source/devtools/front_end/console/ConsoleView.js
|
| +++ b/Source/devtools/front_end/console/ConsoleView.js
|
| @@ -776,8 +776,9 @@ WebInspector.ConsoleView.prototype = {
|
| * @param {?WebInspector.RemoteObject} result
|
| * @param {boolean} wasThrown
|
| * @param {!WebInspector.ConsoleMessage} originatingConsoleMessage
|
| + * @param {?DebuggerAgent.ExceptionDetails=} exceptionDetails
|
| */
|
| - _printResult: function(result, wasThrown, originatingConsoleMessage)
|
| + _printResult: function(result, wasThrown, originatingConsoleMessage, exceptionDetails)
|
| {
|
| if (!result)
|
| return;
|
| @@ -791,7 +792,11 @@ WebInspector.ConsoleView.prototype = {
|
| function addMessage(url, lineNumber, columnNumber)
|
| {
|
| var level = wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log;
|
| - var message = new WebInspector.ConsoleMessage(target, WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, url, lineNumber, columnNumber, undefined, [result]);
|
| + var message;
|
| + if (!wasThrown)
|
| + message = new WebInspector.ConsoleMessage(target, WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, url, lineNumber, columnNumber, undefined, [result]);
|
| + else
|
| + message = new WebInspector.ConsoleMessage(target, WebInspector.ConsoleMessage.MessageSource.JS, level, exceptionDetails.text, WebInspector.ConsoleMessage.MessageType.Result, exceptionDetails.url, exceptionDetails.line, exceptionDetails.column, undefined, [WebInspector.UIString("Uncaught"), result], exceptionDetails.stackTrace);
|
| message.setOriginatingMessage(originatingConsoleMessage);
|
| target.consoleModel.addMessage(message);
|
| }
|
| @@ -848,7 +853,7 @@ WebInspector.ConsoleView.prototype = {
|
| var data = /**{{result: ?WebInspector.RemoteObject, wasThrown: boolean, text: string, commandMessage: !WebInspector.ConsoleMessage}} */ (event.data);
|
| this._prompt.pushHistoryItem(data.text);
|
| WebInspector.settings.consoleHistory.set(this._prompt.historyData.slice(-30));
|
| - this._printResult(data.result, data.wasThrown, data.commandMessage);
|
| + this._printResult(data.result, data.wasThrown, data.commandMessage, data.exceptionDetails);
|
| },
|
|
|
| /**
|
|
|