DevTools: Show user code location for wrapped console.log() calls.

Source/devtools/front_end/ConsoleViewMessage.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 12 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
- *
+ * @param {!WebInspector.Target} target
  * @param {!WebInspector.ConsoleMessage} consoleMessage
  * @param {?WebInspector.Linkifier} linkifier
  */
 WebInspector.ConsoleViewMessage = function(target, consoleMessage, linkifier)
 {
     this._message = consoleMessage;
     this._linkifier = linkifier;
     this._target = target;
 
     /** @type {!Array.<!WebInspector.DataGrid>} */
@@ skipping 109 matching lines @@
                     }
                     this._messageElement = this._format([consoleMessage.messageText]);
                 }
             } else {
                 var args = consoleMessage.parameters || [consoleMessage.messageText];
                 this._messageElement = this._format(args);
             }
         }
 
         if (consoleMessage.source !== WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.request) {
-            if (consoleMessage.stackTrace && consoleMessage.stackTrace.length && consoleMessage.stackTrace[0].scriptId) {
-                this._anchorElement = this._linkifyCallFrame(consoleMessage.stackTrace[0]);
-            } else if (consoleMessage.url && consoleMessage.url !== "undefined") {
+            var callFrame = this._callFrameAnchorFromStackTrace(consoleMessage.stackTrace);
+            if (callFrame)
+                this._anchorElement = this._linkifyCallFrame(callFrame);
+            else if (consoleMessage.url && consoleMessage.url !== "undefined")
                 this._anchorElement = this._linkifyLocation(consoleMessage.url, consoleMessage.line, consoleMessage.column);
-            }
         }
 
         this._formattedMessage.appendChild(this._messageElement);
         if (this._anchorElement) {
             this._formattedMessage.appendChild(document.createTextNode(" "));
             this._formattedMessage.appendChild(this._anchorElement);
         }
 
         var dumpStackTrace = !!consoleMessage.stackTrace && consoleMessage.stackTrace.length && (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.type === WebInspector.ConsoleMessage.MessageType.Trace);
         if (dumpStackTrace) {
@@ skipping 62 matching lines @@
         if (!this._linkifier)
             return null;
         // FIXME(62725): stack trace line/column numbers are one-based.
         var lineNumber = callFrame.lineNumber ? callFrame.lineNumber - 1 : 0;
         var columnNumber = callFrame.columnNumber ? callFrame.columnNumber - 1 : 0;
         var rawLocation = new WebInspector.DebuggerModel.Location(callFrame.scriptId, lineNumber, columnNumber);
         return this._linkifier.linkifyRawLocation(rawLocation, "console-message-url");
     },
 
     /**
+     * @param {?Array.<!ConsoleAgent.CallFrame>} stackTrace
+     * @return {?ConsoleAgent.CallFrame}
+     */
+    _callFrameAnchorFromStackTrace: function(stackTrace)
+    {
+        if (!stackTrace || !stackTrace.length)
+            return null;
+        var callFrame = stackTrace[0];
+        if (WebInspector.experimentsSettings.frameworksDebuggingSupport.isEnabled() && WebInspector.settings.skipStackFramesSwitch.get()) {

[pfeldman, 2014/03/26 08:57:25]

I'd use early return instead.

[aandrey, 2014/03/26 09:30:18]

Done.

+            var regex;
+            try {
+                // FIXME: Cache the created RegExp object.

[aandrey, 2014/03/26 08:48:31]

this will be addressed after https://codereview.chromium.org/212223003/

+                regex = new RegExp(WebInspector.settings.skipStackFramesPattern.get());
+            } catch (e) {
+            }
+            if (regex) {

[pfeldman, 2014/03/26 08:57:25]

ditto

[aandrey, 2014/03/26 09:30:18]

Done.

+                for (var i = 0; i < stackTrace.length; ++i) {
+                    var script = this._target.debuggerModel.scriptForId(stackTrace[i].scriptId);
+                    if (!script || !regex.test(script.sourceURL)) {
+                        callFrame = stackTrace[i];
+                        break;
+                    }
+                }
+            }
+        }
+        return callFrame.scriptId ? callFrame : null;
+    },
+
+    /**
      * @return {boolean}
      */
     isErrorOrWarning: function()
     {
         return (this._message.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this._message.level === WebInspector.ConsoleMessage.MessageLevel.Error);
     },
 
     _format: function(parameters)
     {
         // This node is used like a Builder. Values are continually appended onto it.
@@ skipping 758 matching lines @@
         }
 
         return sourceString + " " + typeString + " " + levelString + ": " + this.formattedMessage().textContent + "\n" + this._message.url + " line " + this._message.line;
     },
 
     get text()
     {
         return this._message.messageText;
     }
 }