Changeset 30146 in webkit

Timestamp:

Feb 11, 2008 11:58:18 AM (16 years ago)

Author:

Adam Roben

Message:

Fix Bug 14316: Inspector's Console truncates long strings

<​http://bugs.webkit.org/show_bug.cgi?id=14316>
<rdar://5357695>

We no longer call Object.describe to format all the output of commands
enetered into the Console. The ConsolePanel object now has a set of
formatting functions that append a formatted representation of the
passed-in object to the passed-in container node.

Reviewed by Sam.

• page/inspector/ConsolePanel.js: (WebInspector.ConsolePanel._onEnterPressed): Updated for rename of _outputToNode to _format. (WebInspector.ConsolePanel._format): Renamed from _outputToNode. Use Object.type to get the type of the object, then call the appropriate formatting function. (WebInspector.ConsolePanel._formatvalue): Added. (WebInspector.ConsolePanel._formatstring): Added. This function contains the actual fix for the bug, since it doesn't truncate the string no matter how long it is. (WebInspector.ConsolePanel._formatregexp): Added. (WebInspector.ConsolePanel._formatarray): Added. This is a bit more functional than Object.describe for arrays, since it recursively formats each item in the array. One advantage of this is that Nodes in arrays will be linkified instead of just turning into "[Object HTMLBodyElement]" or similar. (WebInspector.ConsolePanel._formatnode): Added. (WebInspector.ConsolePanel._formatobject): Added. (WebInspector.ConsolePanel.
• page/inspector/utilities.js: (Object.type): Added. Code was pulled out of Object.describe and reorganized slightly. (Object.describe): Call Object.type. There should be no change in behavior of this function.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/ConsolePanel.js (modified) (2 diffs)
• page/inspector/utilities.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-11  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 14316: Inspector's Console truncates long strings
+
+        <http://bugs.webkit.org/show_bug.cgi?id=14316>
+        <rdar://5357695>
+
+        We no longer call Object.describe to format all the output of commands
+        enetered into the Console. The ConsolePanel object now has a set of
+        formatting functions that append a formatted representation of the
+        passed-in object to the passed-in container node.
+
+        Reviewed by Sam.
+
+        * page/inspector/ConsolePanel.js:
+        (WebInspector.ConsolePanel._onEnterPressed): Updated for rename of
+        _outputToNode to _format.
+        (WebInspector.ConsolePanel._format): Renamed from _outputToNode. Use
+        Object.type to get the type of the object, then call the appropriate
+        formatting function.
+        (WebInspector.ConsolePanel._formatvalue): Added.
+        (WebInspector.ConsolePanel._formatstring): Added. This function
+        contains the actual fix for the bug, since it doesn't truncate the
+        string no matter how long it is.
+        (WebInspector.ConsolePanel._formatregexp): Added.
+        (WebInspector.ConsolePanel._formatarray): Added. This is a bit more
+        functional than Object.describe for arrays, since it recursively
+        formats each item in the array. One advantage of this is that Nodes in
+        arrays will be linkified instead of just turning into "[Object
+        HTMLBodyElement]" or similar.
+        (WebInspector.ConsolePanel._formatnode): Added.
+        (WebInspector.ConsolePanel._formatobject): Added.
+        (WebInspector.ConsolePanel.
+        * page/inspector/utilities.js:
+        (Object.type): Added. Code was pulled out of Object.describe and
+        reorganized slightly.
+        (Object.describe): Call Object.type. There should be no change in
+        behavior of this function.
+
 2008-02-11  Alp Toker  <alp@atoker.com>
 

trunk/WebCore/page/inspector/ConsolePanel.js

@@ -184 +184 @@
         var level = exception ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log;
 
-        this.addMessage(new WebInspector.ConsoleCommand(str, this._outputToNode(result)));
+        this.addMessage(new WebInspector.ConsoleCommand(str, this._format(result)));
     },
 
@@ -224 +224 @@
     },
 
-    _outputToNode: function(output)
-    {
-        if (output instanceof Node) {
-            var anchor = document.createElement("a");
-            anchor.innerHTML = output.titleInfo().title;
-            anchor.representedNode = output;
-            return anchor;
-        }
-        return document.createTextNode(Object.describe(output));
-    }
+    _format: function(output)
+    {
+        var type = Object.type(output);
+        if (type === "object") {
+            if (output instanceof Node)
+                type = "node";
+        }
+
+        // We don't perform any special formatting on these types, so we just
+        // pass them through the simple _formatvalue function.
+        var undecoratedTypes = {
+            "undefined": 1,
+            "null": 1,
+            "boolean": 1,
+            "number": 1,
+            "date": 1,
+            "function": 1,
+        };
+
+        var formatter;
+        if (type in undecoratedTypes)
+            formatter = "_formatvalue";
+        else {
+            formatter = "_format" + type;
+            if (!(formatter in this)) {
+                formatter = "_formatobject";
+                type = "object";
+            }
+        }
+
+        var span = document.createElement("span");
+        span.addStyleClass("console-formatted-" + type);
+        this[formatter](output, span);
+        return span;
+    },
+
+    _formatvalue: function(val, elem)
+    {
+        elem.appendChild(document.createTextNode(val));
+    },
+
+    _formatstring: function(str, elem)
+    {
+        elem.appendChild(document.createTextNode("\"" + str + "\""));
+    },
+
+    _formatregexp: function(re, elem)
+    {
+        var formatted = String(re).replace(/([\\\/])/g, "\\$1").replace(/\\(\/[gim]*)$/, "$1").substring(1);
+        elem.appendChild(document.createTextNode(formatted));
+    },
+
+    _formatarray: function(arr, elem)
+    {
+        elem.appendChild(document.createTextNode("["));
+        for (var i = 0; i < arr.length; ++i) {
+            elem.appendChild(this._format(arr[i]));
+            if (i < arr.length - 1)
+                elem.appendChild(document.createTextNode(", "));
+        }
+        elem.appendChild(document.createTextNode("]"));
+    },
+
+    _formatnode: function(node, elem)
+    {
+        var anchor = document.createElement("a");
+        anchor.innerHTML = node.titleInfo().title;
+        anchor.representedNode = node;
+        elem.appendChild(anchor);
+    },
+
+    _formatobject: function(obj, elem)
+    {
+        elem.appendChild(document.createTextNode(Object.describe(obj)));
+    },
 }
 

trunk/WebCore/page/inspector/utilities.js

@@ -27 +27 @@
  */
 
-Object.describe = function(obj, abbreviated)
-{
-    if (obj === undefined)
-        return "undefined";
+Object.type = function(obj)
+{
     if (obj === null)
         return "null";
 
-    var type1 = typeof obj;
-    var type2 = "";
-    if (type1 == "object" || type1 == "function") {
-        if (obj instanceof String)
-            type1 = "string";
-        else if (obj instanceof Array)
-            type1 = "array";
-        else if (obj instanceof Boolean)
-            type1 = "boolean";
-        else if (obj instanceof Number)
-            type1 = "number";
-        else if (obj instanceof Date)
-            type1 = "date";
-        else if (obj instanceof RegExp)
-            type1 = "regexp";
-        else if (obj instanceof Error)
-            type1 = "error";
-        type2 = Object.prototype.toString.call(obj).replace(/^\[object (.*)\]$/i, "$1");
-    }
-
-    switch (type1) {
+    var type = typeof obj;
+    if (type !== "object" && type !== "function")
+        return type;
+
+    if (obj instanceof String)
+        return "string";
+    if (obj instanceof Array)
+        return "array";
+    if (obj instanceof Boolean)
+        return "boolean";
+    if (obj instanceof Number)
+        return "number";
+    if (obj instanceof Date)
+        return "date";
+    if (obj instanceof RegExp)
+        return "regexp";
+    if (obj instanceof Error)
+        return "error";
+    return type;
+}
+
+Object.describe = function(obj, abbreviated)
+{
+    switch (Object.type(obj)) {
     case "object":
-        return type2;
+        return Object.prototype.toString.call(obj).replace(/^\[object (.*)\]$/i, "$1");
     case "array":
         return "[" + obj.toString() + "]";