<!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>[194149] 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/194149">194149</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-16 09:40:15 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Typing object literal in the console causes a parse error
https://bugs.webkit.org/show_bug.cgi?id=141737
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-12-16
Reviewed by Timothy Hatcher.
Source/WebInspectorUI:
Provide a convenience in console evaluations for JSON object like input.
If the console input starts with '{' and ends with '}' wrap the input
in parenthesis to force evaluation as an expression.
For example, input "{a:1}" would be convenience wrapped to "({a:1})"
and produce the expected object. This helps avoid the unusual treatment
of "{a:1}" as program containing a labeled statement, which is often
not what the user expects. And in more realistic cases, like "{a:1, b:2}",
produce a SyntaxError.
* UserInterface/Controllers/RuntimeManager.js:
(WebInspector.RuntimeManager.prototype.evaluateInInspectedWindow):
Detect and convenience wrap the given expression.
LayoutTests:
* inspector/controller/runtime-controller-expected.txt: Added.
* inspector/controller/runtime-controller.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersRuntimeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/inspector/controller/</li>
<li><a href="#trunkLayoutTestsinspectorcontrollerruntimecontrollerexpectedtxt">trunk/LayoutTests/inspector/controller/runtime-controller-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorcontrollerruntimecontrollerhtml">trunk/LayoutTests/inspector/controller/runtime-controller.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194148 => 194149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-16 17:38:17 UTC (rev 194148)
+++ trunk/LayoutTests/ChangeLog 2015-12-16 17:40:15 UTC (rev 194149)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Typing object literal in the console causes a parse error
+ https://bugs.webkit.org/show_bug.cgi?id=141737
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/controller/runtime-controller-expected.txt: Added.
+ * inspector/controller/runtime-controller.html: Added.
+
</ins><span class="cx"> 2015-12-08 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> Fix computation of min|max-content contribution of non-replaced blocks
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorcontrollerruntimecontrollerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/controller/runtime-controller-expected.txt (0 => 194149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/controller/runtime-controller-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/controller/runtime-controller-expected.txt 2015-12-16 17:40:15 UTC (rev 194149)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+Tests for the Runtime.parse command.
+
+
+== Running test suite: RuntimeManager
+-- Running test case: RuntimeManager.prototype.evaluateInInspectedWindow.ObjectLiteralConvenience
+Source: {a:1}
+PASS: Evaluation should produce an object.
+Source: {a:1, b:2}
+PASS: Evaluation should produce an object.
+Source: {a:1, b:2}
+PASS: Evaluation should produce an object.
+Source: { let a = 1; a += 1; a }
+PASS: Evaluation should produce an exception.
+Source: ;{a:1}
+PASS: Evaluation should produce the labeled statement's value.
+Source: {a:1};
+PASS: Evaluation should produce the labeled statement's value.
+Source: ;{a:1, b:2}
+PASS: Evaluation should produce an exception.
+Source: ;{ let a = 1; a += 1; a }
+PASS: Evaluation should produce the labeled statement's value.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorcontrollerruntimecontrollerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/controller/runtime-controller.html (0 => 194149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/controller/runtime-controller.html (rev 0)
+++ trunk/LayoutTests/inspector/controller/runtime-controller.html 2015-12-16 17:40:15 UTC (rev 194149)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("RuntimeManager");
+
+ suite.addTestCase({
+ name: "RuntimeManager.prototype.evaluateInInspectedWindow.ObjectLiteralConvenience",
+ description: "Test evaluating an object literal string conveniently converts wraps it in parenthesis to avoid misinterpretation as a program with a block and labeled statement.",
+ test: (resolve, reject) => {
+ function testSource(expression, callback) {
+ const objectGroup = "test";
+ const includeCommandLineAPI = false;
+ const ignorePauseOnExceptionsAndMute = false;
+ const shouldReturnByValue = false;
+ const shouldGeneratePreview = false;
+ const shouldSaveResult = false;
+ WebInspector.runtimeManager.evaluateInInspectedWindow(expression, objectGroup, includeCommandLineAPI, ignorePauseOnExceptionsAndMute, shouldReturnByValue, shouldGeneratePreview, shouldSaveResult, (result, wasThrown) => {
+ InspectorTest.log("Source: " + expression);
+ callback(result, wasThrown);
+ });
+ }
+
+ function expectObject(result, wasThrown) {
+ InspectorTest.expectThat(result.type === "object", "Evaluation should produce an object.");
+ }
+
+ function expectException(result, wasThrown) {
+ InspectorTest.expectThat(wasThrown, "Evaluation should produce an exception.");
+ }
+
+ function expectValue(value) {
+ return function(result, wasThrown) {
+ InspectorTest.expectThat(result.value === value, "Evaluation should produce the labeled statement's value.");
+ }
+ }
+
+ // The convenience will detect these and make them objects.
+ testSource("{a:1}", expectObject);
+ testSource("{a:1, b:2}", expectObject);
+ testSource(" {a:1, b:2} ", expectObject);
+
+ // The convenience will incorrectly apply to these that would otherwise have been valid programs.
+ testSource("{ let a = 1; a += 1; a }", expectException);
+
+ // Test we can run non-convenience cases by not starting / ending with characters other than curly braces.
+ testSource(";{a:1}", expectValue(1));
+ testSource("{a:1};", expectValue(1));
+ testSource(";{a:1, b:2}", expectException);
+ testSource(";{ let a = 1; a += 1; a }", expectValue(2));
+
+ InspectorBackend.runAfterPendingDispatches(resolve);
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests for the Runtime.parse command.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194148 => 194149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-16 17:38:17 UTC (rev 194148)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-16 17:40:15 UTC (rev 194149)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-12-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Typing object literal in the console causes a parse error
+ https://bugs.webkit.org/show_bug.cgi?id=141737
+
+ Reviewed by Timothy Hatcher.
+
+ Provide a convenience in console evaluations for JSON object like input.
+ If the console input starts with '{' and ends with '}' wrap the input
+ in parenthesis to force evaluation as an expression.
+
+ For example, input "{a:1}" would be convenience wrapped to "({a:1})"
+ and produce the expected object. This helps avoid the unusual treatment
+ of "{a:1}" as program containing a labeled statement, which is often
+ not what the user expects. And in more realistic cases, like "{a:1, b:2}",
+ produce a SyntaxError.
+
+ * UserInterface/Controllers/RuntimeManager.js:
+ (WebInspector.RuntimeManager.prototype.evaluateInInspectedWindow):
+ Detect and convenience wrap the given expression.
+
+2015-12-16 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Uncaught Exception View has undefined exception URL
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152327
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersRuntimeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js (194148 => 194149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js 2015-12-16 17:38:17 UTC (rev 194148)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/RuntimeManager.js 2015-12-16 17:40:15 UTC (rev 194149)
</span><span class="lines">@@ -40,6 +40,9 @@
</span><span class="cx"> if (!expression) {
</span><span class="cx"> // There is no expression, so the completion should happen against global properties.
</span><span class="cx"> expression = "this";
</span><ins>+ } else if (/^\s*\{/.test(expression) && /\}\s*$/.test(expression)) {
+ // Transform {a:1} to ({a:1}) so it is treated like an object literal instead of a block with a label.
+ expression = "(" + expression + ")";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> expression = appendWebInspectorSourceURL(expression);
</span></span></pre>
</div>
</div>
</body>
</html>