<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202933] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202933">202933</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-07 14:28:08 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector, regression: JS/JSON pretty-printing sporadically broken in STP8
https://bugs.webkit.org/show_bug.cgi?id=159511
<rdar://problem/27218435>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-07-07
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
* UserInterface/Workers/Formatter/FormatterWorker.js:
(FormatterWorker.prototype.formatJavaScript):
Attempt to format invalid JSON that can be evaluated to an object.
LayoutTests:
* inspector/formatting/formatting-json-expected.txt: Added.
* inspector/formatting/formatting-json.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorformattingformattingjavascriptexpectedtxt">trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorformattingformattingjavascripthtml">trunk/LayoutTests/inspector/formatting/formatting-javascript.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceWorkersFormatterFormatterWorkerjs">trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorformattingformattingjsonexpectedtxt">trunk/LayoutTests/inspector/formatting/formatting-json-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorformattingformattingjsonhtml">trunk/LayoutTests/inspector/formatting/formatting-json.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202932 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-07 21:26:33 UTC (rev 202932)
+++ trunk/LayoutTests/ChangeLog 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-07 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector, regression: JS/JSON pretty-printing sporadically broken in STP8
+ https://bugs.webkit.org/show_bug.cgi?id=159511
+ <rdar://problem/27218435>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/formatting/formatting-json-expected.txt: Added.
+ * inspector/formatting/formatting-json.html: Added.
+
</ins><span class="cx"> 2016-07-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r199054): CrashTracer: [USER] parseWebKit at WebCore: WebCore::RenderBlockFlow::checkFloatsInCleanLine + 107
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingformattingjavascriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt (202932 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt 2016-07-07 21:26:33 UTC (rev 202932)
+++ trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Test JavaScript formatting tests.
</del><ins>+Test JavaScript formatting.
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> == Running test suite: EsprimaFormatter.JavaScript
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingformattingjavascripthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/formatting/formatting-javascript.html (202932 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/formatting-javascript.html 2016-07-07 21:26:33 UTC (rev 202932)
+++ trunk/LayoutTests/inspector/formatting/formatting-javascript.html 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -42,6 +42,6 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><del>-<p>Test JavaScript formatting tests.</p>
</del><ins>+<p>Test JavaScript formatting.</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingformattingjsonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/formatting/formatting-json-expected.txt (0 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/formatting-json-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/formatting/formatting-json-expected.txt 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+Test JSON formatting.
+
+
+== Running test suite: EsprimaFormatter.JSON
+-- Running test case: EsprimaFormatter.ValidJSON
+JSON: "{\"a\":123,\"b\":[1,2,3],\"c\":{\"d\":\"e\"}}"
+PASS: JSON should be valid.
+FORMATTED:
+{
+ "a": 123,
+ "b": [
+ 1,
+ 2,
+ 3
+ ],
+ "c": {
+ "d": "e"
+ }
+}
+
+-- Running test case: EsprimaFormatter.InvalidButObject
+JSON: "{a:123,b:[1,2,3],c:{d:\"e\"}}"
+PASS: JSON should be invalid.
+PASS: Should be able to be evaluated to an object.
+FORMATTED:
+{
+ a: 123,
+ b: [1, 2, 3],
+ c: {
+ d: "e"
+ }
+}
+
+-- Running test case: EsprimaFormatter.InvalidWithComments
+JSON: "{\"a\":123,\"b\":[1,2,3],\"c\":{\"d\":\"e\"}}/*Comment*/"
+PASS: JSON should be invalid.
+PASS: Should be able to be evaluated to an object.
+FORMATTED:
+{
+ "a": 123,
+ "b": [1, 2, 3],
+ "c": {
+ "d": "e"
+ }
+} /*Comment*/
+
+
+-- Running test case: EsprimaFormatter.Invalid
+INPUT: "{a:1 b:2}"
+PASS: JSON should be invalid.
+PASS: Should not be able to be evaluated to an object.
+PASS: Response should be null.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingformattingjsonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/formatting/formatting-json.html (0 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/formatting-json.html (rev 0)
+++ trunk/LayoutTests/inspector/formatting/formatting-json.html 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -0,0 +1,109 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ function ensureJSON(string, expectation) {
+ let invalid = false;
+ try {
+ JSON.parse(string);
+ } catch (e) {
+ invalid = true;
+ }
+ if (expectation === "invalid")
+ InspectorTest.expectThat(invalid, "JSON should be invalid.");
+ else
+ InspectorTest.expectThat(!invalid, "JSON should be valid.");
+ }
+
+ function ensureEval(string, expectation) {
+ let isObject = false;
+ try {
+ let result = eval("(" + string + ")");
+ isObject = typeof result === "object";
+ } catch (e) {}
+
+ if (expectation === "object")
+ InspectorTest.expectThat(isObject, "Should be able to be evaluated to an object.");
+ else
+ InspectorTest.expectThat(!isObject, "Should not be able to be evaluated to an object.");
+ }
+
+
+ let suite = InspectorTest.createAsyncSuite("EsprimaFormatter.JSON");
+
+ let indentString = " ";
+ let workerProxy = WebInspector.FormatterWorkerProxy.singleton();
+
+ suite.addTestCase({
+ name: "EsprimaFormatter.ValidJSON",
+ description: "Format valid JSON",
+ test: (resolve, reject) => {
+ let validJSON = JSON.stringify({"a":123,"b":[1,2,3],"c":{"d":"e"}});
+ InspectorTest.log("JSON: " + doubleQuotedString(validJSON));
+ ensureJSON(validJSON, "valid");
+ workerProxy.formatJavaScript(validJSON, indentString, ({formattedText, sourceMapData}) => {
+ InspectorTest.log("FORMATTED:");
+ InspectorTest.log(formattedText);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "EsprimaFormatter.InvalidButObject",
+ description: "Format invalid JSON due to literal keys, but it can be evaluated as a valid JavaScript Object",
+ test: (resolve, reject) => {
+ let invalidJSON = `{a:123,b:[1,2,3],c:{d:"e"}}`;
+ InspectorTest.log("JSON: " + doubleQuotedString(invalidJSON));
+ ensureJSON(invalidJSON, "invalid");
+ ensureEval(invalidJSON, "object");
+ workerProxy.formatJavaScript(invalidJSON, indentString, ({formattedText, sourceMapData}) => {
+ InspectorTest.log("FORMATTED:");
+ InspectorTest.log(formattedText);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "EsprimaFormatter.InvalidWithComments",
+ description: "Format invalid JSON due to comments, but it can be evaluated as a valid JavaScript Object",
+ test: (resolve, reject) => {
+ let invalidJSON = JSON.stringify({"a":123,"b":[1,2,3],"c":{"d":"e"}}) + "/*Comment*/";
+ InspectorTest.log("JSON: " + doubleQuotedString(invalidJSON));
+ ensureJSON(invalidJSON, "invalid");
+ ensureEval(invalidJSON, "object");
+ workerProxy.formatJavaScript(invalidJSON, indentString, ({formattedText, sourceMapData}) => {
+ InspectorTest.log("FORMATTED:");
+ InspectorTest.log(formattedText);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "EsprimaFormatter.Invalid",
+ description: "Format invalid JSON, that is not a valid JavaScript Object",
+ test: (resolve, reject) => {
+ let invalid = `{a:1 b:2}`;
+ InspectorTest.log("INPUT: " + doubleQuotedString(invalid));
+ ensureJSON(invalid, "invalid");
+ ensureEval(invalid, "bad");
+ workerProxy.formatJavaScript(invalid, indentString, ({formattedText, sourceMapData}) => {
+ InspectorTest.expectThat(formattedText === null, "Response should be null.");
+ resolve();
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Test JSON formatting.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (202932 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-07-07 21:26:33 UTC (rev 202932)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-07 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector, regression: JS/JSON pretty-printing sporadically broken in STP8
+ https://bugs.webkit.org/show_bug.cgi?id=159511
+ <rdar://problem/27218435>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Workers/Formatter/FormatterWorker.js:
+ (FormatterWorker.prototype.formatJavaScript):
+ Attempt to format invalid JSON that can be evaluated to an object.
+
</ins><span class="cx"> 2016-07-07 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: scrolled Snapshot list is reset to top and drawn blank after switching back from Snapshot Comparison view
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceWorkersFormatterFormatterWorkerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js (202932 => 202933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js 2016-07-07 21:26:33 UTC (rev 202932)
+++ trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/FormatterWorker.js 2016-07-07 21:28:08 UTC (rev 202933)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> formatJavaScript(sourceText, indentString, includeSourceMapData)
</span><span class="cx"> {
</span><ins>+ // Format a JavaScript program.
</ins><span class="cx"> let formatter = new EsprimaFormatter(sourceText, indentString);
</span><span class="cx"> if (formatter.success) {
</span><span class="cx"> let result = {formattedText: formatter.formattedText};
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Format valid JSON.
</ins><span class="cx"> // The formatter could fail if this was just a JSON string. So try a JSON.parse and stringify.
</span><span class="cx"> // This will produce empty source map data, but it is not code, so it is not as important.
</span><span class="cx"> try {
</span><span class="lines">@@ -66,6 +68,20 @@
</span><span class="cx"> return result;
</span><span class="cx"> } catch (e) {}
</span><span class="cx">
</span><ins>+ // Format invalid JSON.
+ // Some applications do not use JSON.parse but eval on JSON content. That is more permissive
+ // so try to format invalid JSON. Again no source map data since it is not code.
+ if (/^\s*\{/.test(sourceText)) {
+ let invalidJSONFormatter = new EsprimaFormatter("(" + sourceText + ")", indentString);
+ if (invalidJSONFormatter.success) {
+ let formattedTextWithParens = invalidJSONFormatter.formattedText;
+ let result = {formattedText: formattedTextWithParens.substring(1, formattedTextWithParens.length - 2)}; // Remove "(" and ")\n".
+ if (includeSourceMapData)
+ result.sourceMapData = {mapping: {original: [], formatted: []}, originalLineEndings:[], formattedLineEndings: []};
+ return result;
+ }
+ }
+
</ins><span class="cx"> return {formattedText: null};
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>