Changeset 87071 in webkit

Timestamp:

May 23, 2011 6:41:24 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-05-18 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: source mapping for pretty-printed scripts is sometimes inaccurate after indented comments.
​https://bugs.webkit.org/show_bug.cgi?id=61037

• http/tests/inspector/inspector-test.js: (initialize_InspectorTest):
• inspector/debugger/resources/obfuscated.js: (withComments):
• inspector/debugger/script-formatter.html:

2011-05-18 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: source mapping for pretty-printed scripts is sometimes inaccurate after indented comments.
​https://bugs.webkit.org/show_bug.cgi?id=61037

• inspector/front-end/JavaScriptFormatter.js: (FormattedContentBuilder.prototype.addToken): (FormattedContentBuilder.prototype._addComment): (FormattedContentBuilder.prototype._addText): (FormattedContentBuilder.prototype._addMappingIfNeeded):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/inspector-test.js (modified) (1 diff)
• LayoutTests/inspector/debugger/resources/obfuscated.js (modified) (1 diff)
• LayoutTests/inspector/debugger/script-formatter.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/JavaScriptFormatter.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-18  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: source mapping for pretty-printed scripts is sometimes inaccurate after indented comments.
+        https://bugs.webkit.org/show_bug.cgi?id=61037
+
+        * http/tests/inspector/inspector-test.js:
+        (initialize_InspectorTest):
+        * inspector/debugger/resources/obfuscated.js:
+        (withComments):
+        * inspector/debugger/script-formatter.html:
+
 2011-05-23  Mike West  <mkwst@chromium.org>
 

trunk/LayoutTests/http/tests/inspector/inspector-test.js

@@ -236 +236 @@
 }
 
+InspectorTest.assertTrue = function(found, message)
+{
+    InspectorTest.assertEquals(true, !!found);
+}
+
 InspectorTest.safeWrap = function(func, onexception)
 {

trunk/LayoutTests/inspector/debugger/resources/obfuscated.js

@@ -2 +2 @@
 {
     var variable1 = 0;
+}
+
+function withComments()
+{
+// comment
+    return "functionWithComments";
 }
 

trunk/LayoutTests/inspector/debugger/script-formatter.html

@@ -60 +60 @@
                 function testMapping(string)
                 {
-                    var originalLocation = WebInspector.ScriptFormatter.positionToLocation(source.lineEndings(), source.indexOf(string));
+                    var originalPosition = source.indexOf(string);
+                    InspectorTest.assertTrue(originalPosition !== -1);
+                    var originalLocation = WebInspector.ScriptFormatter.positionToLocation(source.lineEndings(), originalPosition);
                     var formattedLocation = mapping.originalToFormatted(originalLocation);
                     var formattedPosition = WebInspector.ScriptFormatter.locationToPosition(formattedSource.lineEndings(), formattedLocation);
                     var expectedFormattedPosition = formattedSource.indexOf(string);
-                    InspectorTest.assertEquals(expectedFormattedPosition, formattedPosition);
+                    InspectorTest.assertEquals(expectedFormattedPosition, formattedPosition, "wrong mapping for <" + string + ">");
                 }
 
@@ -70 +72 @@
                 testMapping("formatted1");
                 testMapping("variable1");
+
+                testMapping("    return \"functionWithComments\"");
 
                 testMapping("onmessage");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-18  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: source mapping for pretty-printed scripts is sometimes inaccurate after indented comments.
+        https://bugs.webkit.org/show_bug.cgi?id=61037
+
+        * inspector/front-end/JavaScriptFormatter.js:
+        (FormattedContentBuilder.prototype.addToken):
+        (FormattedContentBuilder.prototype._addComment):
+        (FormattedContentBuilder.prototype._addText):
+        (FormattedContentBuilder.prototype._addMappingIfNeeded):
+
 2011-05-23  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/JavaScriptFormatter.js

@@ -65 +65 @@
         }
 
-        if (token.pos - this._lastOriginalPosition !== this._formattedContentLength - this._lastFormattedPosition) {
-            this._mapping.original.push(this._originalOffset + token.pos);
-            this._lastOriginalPosition = token.pos;
-            this._mapping.formatted.push(this._formattedOffset + this._formattedContentLength);
-            this._lastFormattedPosition = this._formattedContentLength;
-        }
-
+        this._addMappingIfNeeded(token.pos);
         this._addText(this._originalContent.substring(token.pos, token.endPos));
         this._lineNumber = token.endLine;
@@ -123 +117 @@
             this.addSpace();
 
+        this._addMappingIfNeeded(comment.pos);
         if (comment.type === "comment1")
             this._addText("//");
@@ -142 +137 @@
         this._formattedContent.push(text);
         this._formattedContentLength += text.length;
+    },
+
+    _addMappingIfNeeded: function(originalPosition)
+    {
+        if (originalPosition - this._lastOriginalPosition === this._formattedContentLength - this._lastFormattedPosition)
+            return;
+        this._mapping.original.push(this._originalOffset + originalPosition);
+        this._lastOriginalPosition = originalPosition;
+        this._mapping.formatted.push(this._formattedOffset + this._formattedContentLength);
+        this._lastFormattedPosition = this._formattedContentLength;
     }
 }