DevTools: Show detailed information for exceptions during snippet execution.

Source/devtools/front_end/sdk/ScriptSnippetModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 203 matching lines @@
         var evaluationUrl = this._evaluationSourceURL(uiSourceCode);
         var expression = uiSourceCode.workingCopy();
 
         WebInspector.console.show();
         var target = executionContext.target();
         target.debuggerAgent().compileScript(expression, evaluationUrl, executionContext.id, compileCallback.bind(this, target));
 
         /**
          * @param {!WebInspector.Target} target
          * @param {?string} error
-         * @param {string=} scriptId
-         * @param {string=} syntaxErrorMessage
+         * @param {!DebuggerAgent.ScriptId=} scriptId
+         * @param {?DebuggerAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.ScriptSnippetModel}
          */
-        function compileCallback(target, error, scriptId, syntaxErrorMessage, lineNumber, columnNumber)
+        function compileCallback(target, error, scriptId, exceptionDetails)
         {
             if (!uiSourceCode || uiSourceCode._evaluationIndex !== evaluationIndex)
                 return;
 
             if (error) {
                 console.error(error);
                 return;
             }
 
             if (!scriptId) {
-                var consoleMessage = new WebInspector.ConsoleMessage(
-                        target,
-                        WebInspector.ConsoleMessage.MessageSource.JS,
-                        WebInspector.ConsoleMessage.MessageLevel.Error,
-                        syntaxErrorMessage || "",
-                        undefined,
-                        evaluationUrl,
-                        lineNumber,
-                        columnNumber);
-                target.consoleModel.addMessage(consoleMessage);
+                this._printRunOrCompileScriptResultFailure(target, exceptionDetails, evaluationUrl);
                 return;
             }
 
             var breakpointLocations = this._removeBreakpoints(uiSourceCode);
             this._restoreBreakpoints(uiSourceCode, breakpointLocations);
 
             this._runScript(scriptId, executionContext, evaluationUrl);
         }
     },
 
     /**
      * @param {!DebuggerAgent.ScriptId} scriptId
      * @param {!WebInspector.ExecutionContext} executionContext
      */
     _runScript: function(scriptId, executionContext, sourceURL)
     {
-        console.error(executionContext);
         var target = executionContext.target();
         target.debuggerAgent().runScript(scriptId, executionContext.id, "console", false, runCallback.bind(this, target));
 
         /**
          * @param {!WebInspector.Target} target
          * @param {?string} error
          * @param {?RuntimeAgent.RemoteObject} result
-         * @param {boolean=} wasThrown
+         * @param {?DebuggerAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.ScriptSnippetModel}
          */
-        function runCallback(target, error, result, wasThrown, lineNumber, columnNumber)
+        function runCallback(target, error, result, exceptionDetails)
         {
             if (error) {
                 console.error(error);
                 return;
             }
 
-            this._printRunScriptResult(target, result, wasThrown, sourceURL, lineNumber, columnNumber);
+            var wasThrown = !!exceptionDetails;
+            if (!wasThrown)
+                this._printRunScriptResult(target, result, sourceURL);
+            else
+                this._printRunOrCompileScriptResultFailure(target, exceptionDetails, sourceURL);
         }
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @param {?RuntimeAgent.RemoteObject} result
-     * @param {boolean=} wasThrown
+     * @param {?string=} sourceURL
      */
-    _printRunScriptResult: function(target, result, wasThrown, sourceURL, lineNumber, columnNumber)
+    _printRunScriptResult: function(target, result, sourceURL)
     {
-        var level = (wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
-        var message = new WebInspector.ConsoleMessage(target,
+        var consoleMessage = new WebInspector.ConsoleMessage(
+            target,
             WebInspector.ConsoleMessage.MessageSource.JS,
-            level,
-            (wasThrown ? result.description : ""),
+            WebInspector.ConsoleMessage.MessageLevel.Log,
+            "",
             undefined,
-            (wasThrown ? sourceURL : undefined),
-            (wasThrown ? lineNumber : undefined),
-            (wasThrown ? columnNumber : undefined),
+            sourceURL,
             undefined,
-            (wasThrown ? undefined : [result]));
-        target.consoleModel.addMessage(message);
+            undefined,
+            undefined,
+            [result],
+            undefined);
+        target.consoleModel.addMessage(consoleMessage);
     },
 
     /**
+     * @param {!WebInspector.Target} target
+     * @param {?DebuggerAgent.ExceptionDetails=} exceptionDetails
+     * @param {?string=} sourceURL
+     */
+    _printRunOrCompileScriptResultFailure: function(target, exceptionDetails, sourceURL)
+    {
+        var consoleMessage = new WebInspector.ConsoleMessage(
+            target,
+            exceptionDetails.source,
+            WebInspector.ConsoleMessage.MessageLevel.Error,
+            exceptionDetails.text,
+            undefined,
+            sourceURL,
+            exceptionDetails.line,
+            exceptionDetails.column,
+            undefined,
+            undefined,
+            exceptionDetails.stackTrace);
+        target.consoleModel.addMessage(consoleMessage);
+    },
+
+    /**
      * @param {!WebInspector.DebuggerModel.Location} rawLocation
      * @return {?WebInspector.UILocation}
      */
     _rawLocationToUILocation: function(rawLocation)
     {
         var uiSourceCode = this._uiSourceCodeForScriptId[rawLocation.scriptId];
         if (!uiSourceCode)
             return null;
         return uiSourceCode.uiLocation(rawLocation.lineNumber, rawLocation.columnNumber || 0);
     },
@@ skipping 314 matching lines @@
         this._model.deleteScriptSnippet(path);
     },
 
     __proto__: WebInspector.ContentProviderBasedProjectDelegate.prototype
 }
 
 /**
  * @type {!WebInspector.ScriptSnippetModel}
  */
 WebInspector.scriptSnippetModel;