Source/devtools/front_end/console/ConsoleView.js - Issue 369333002: DevTools: Added error message when the command is invoked from the console with exception

Unified Diff: Source/devtools/front_end/console/ConsoleView.js

Issue 369333002: DevTools: Added error message when the command is invoked from the console with exception (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add-evaluate-exception-details

Patch Set: Created 6 years, 5 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

« Source/core/inspector/InspectorDebuggerAgent.cpp ('K') | « Source/core/inspector/InspectorRuntimeAgent.cpp ('k') | Source/devtools/front_end/sdk/ConsoleModel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 79d67b307324b74d23b203e3b0ce19c40be9f5c5..091242a325be7e52ff5a26ffae7fca0116c011d4 100644

--- a/Source/devtools/front_end/console/ConsoleView.js

+++ b/Source/devtools/front_end/console/ConsoleView.js

@@ -777,8 +777,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;

@@ -792,7 +793,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, undefined, exceptionDetails.url, exceptionDetails.line, exceptionDetails.column, undefined, undefined, exceptionDetails.stackTrace);

vsevik 2014/07/15 16:14:33 It would be better if we show both the resulting o

kozyatinskiy1 2014/07/16 13:15:47 Done.

message.setOriginatingMessage(originatingConsoleMessage);

target.consoleModel.addMessage(message);

}

@@ -849,7 +854,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);

/**