<!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>[199838] 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/199838">199838</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-21 15:24:17 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Debugger statement gets a space after it when pretty printed
https://bugs.webkit.org/show_bug.cgi?id=156867
<rdar://problem/25862308>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-21
Reviewed by Geoffrey Garen.
Source/WebInspectorUI:
* Tools/Formatting/index.html:
* UserInterface/Workers/Formatter/EsprimaFormatter.js:
(EsprimaFormatter.prototype._handleTokenAtNode):
Handle the unhandled DebuggerStatement node type.
LayoutTests:
* inspector/formatting/formatting-javascript-expected.txt:
* inspector/formatting/formatting-javascript.html:
* inspector/formatting/resources/javascript-tests/other-statements-expected.js: Renamed from LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js.
* inspector/formatting/resources/javascript-tests/other-statements.js: Renamed from LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js.</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="#trunkSourceWebInspectorUIToolsFormattingindexhtml">trunk/Source/WebInspectorUI/Tools/Formatting/index.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceWorkersFormatterEsprimaFormatterjs">trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorformattingresourcesjavascripttestsotherstatementsexpectedjs">trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements-expected.js</a></li>
<li><a href="#trunkLayoutTestsinspectorformattingresourcesjavascripttestsotherstatementsjs">trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorformattingresourcesjavascriptteststhrowstatementexpectedjs">trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js</a></li>
<li><a href="#trunkLayoutTestsinspectorformattingresourcesjavascriptteststhrowstatementjs">trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/LayoutTests/ChangeLog 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Debugger statement gets a space after it when pretty printed
+ https://bugs.webkit.org/show_bug.cgi?id=156867
+ <rdar://problem/25862308>
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/formatting/formatting-javascript-expected.txt:
+ * inspector/formatting/formatting-javascript.html:
+ * inspector/formatting/resources/javascript-tests/other-statements-expected.js: Renamed from LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js.
+ * inspector/formatting/resources/javascript-tests/other-statements.js: Renamed from LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js.
+
</ins><span class="cx"> 2016-04-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB (Workers): More IDBConnectionProxy refactoring.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingformattingjavascriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/LayoutTests/inspector/formatting/formatting-javascript-expected.txt 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -41,6 +41,9 @@
</span><span class="cx"> -- Running test case: EsprimaFormatter.JavaScript.object-array-literal.js
</span><span class="cx"> PASS
</span><span class="cx">
</span><ins>+-- Running test case: EsprimaFormatter.JavaScript.other-statements.js
+PASS
+
</ins><span class="cx"> -- Running test case: EsprimaFormatter.JavaScript.return-statement.js
</span><span class="cx"> PASS
</span><span class="cx">
</span><span class="lines">@@ -62,9 +65,6 @@
</span><span class="cx"> -- Running test case: EsprimaFormatter.JavaScript.ternary-expressions.js
</span><span class="cx"> PASS
</span><span class="cx">
</span><del>--- Running test case: EsprimaFormatter.JavaScript.throw-statement.js
-PASS
-
</del><span class="cx"> -- Running test case: EsprimaFormatter.JavaScript.try-catch-finally-statements.js
</span><span class="cx"> PASS
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingformattingjavascripthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/formatting/formatting-javascript.html (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/formatting-javascript.html 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/LayoutTests/inspector/formatting/formatting-javascript.html 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> "resources/javascript-tests/logic-expressions.js",
</span><span class="cx"> "resources/javascript-tests/new-expression.js",
</span><span class="cx"> "resources/javascript-tests/object-array-literal.js",
</span><ins>+ "resources/javascript-tests/other-statements.js",
</ins><span class="cx"> "resources/javascript-tests/return-statement.js",
</span><span class="cx"> "resources/javascript-tests/sample-jquery.js",
</span><span class="cx"> "resources/javascript-tests/sample-normal-utilities.js",
</span><span class="lines">@@ -29,7 +30,6 @@
</span><span class="cx"> "resources/javascript-tests/switch-case-default.js",
</span><span class="cx"> "resources/javascript-tests/template-strings.js",
</span><span class="cx"> "resources/javascript-tests/ternary-expressions.js",
</span><del>- "resources/javascript-tests/throw-statement.js",
</del><span class="cx"> "resources/javascript-tests/try-catch-finally-statements.js",
</span><span class="cx"> "resources/javascript-tests/unary-binary-expressions.js",
</span><span class="cx"> "resources/javascript-tests/variable-declaration.js",
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingresourcesjavascripttestsotherstatementsexpectedjsfromrev199837trunkLayoutTestsinspectorformattingresourcesjavascriptteststhrowstatementexpectedjs"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements-expected.js (from rev 199837, trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js) (0 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements-expected.js (rev 0)
+++ trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements-expected.js 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+throw 1;
+throw x;
+throw [];
+throw (1);
+throw "x";
+throw new x;
+throw {
+ a: 1
+};
+
+debugger
+debugger;
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingresourcesjavascripttestsotherstatementsjsfromrev199837trunkLayoutTestsinspectorformattingresourcesjavascriptteststhrowstatementjs"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements.js (from rev 199837, trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js) (0 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements.js (rev 0)
+++ trunk/LayoutTests/inspector/formatting/resources/javascript-tests/other-statements.js 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+throw 1;
+throw x;
+throw[];
+throw(1);
+throw"x";
+throw new x;
+throw {a:1};
+
+debugger
+debugger;
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingresourcesjavascriptteststhrowstatementexpectedjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement-expected.js 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-throw 1;
-throw x;
-throw [];
-throw (1);
-throw "x";
-throw new x;
-throw {
- a: 1
-};
</del></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingresourcesjavascriptteststhrowstatementjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/LayoutTests/inspector/formatting/resources/javascript-tests/throw-statement.js 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-throw 1;
-throw x;
-throw[];
-throw(1);
-throw"x";
-throw new x;
-throw {a:1};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Debugger statement gets a space after it when pretty printed
+ https://bugs.webkit.org/show_bug.cgi?id=156867
+ <rdar://problem/25862308>
+
+ Reviewed by Geoffrey Garen.
+
+ * Tools/Formatting/index.html:
+ * UserInterface/Workers/Formatter/EsprimaFormatter.js:
+ (EsprimaFormatter.prototype._handleTokenAtNode):
+ Handle the unhandled DebuggerStatement node type.
+
</ins><span class="cx"> 2016-04-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: console.table(navigator) throws exception about `rowPreview.propertyPreviews.length`
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsFormattingindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/Formatting/index.html (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/Formatting/index.html 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/Source/WebInspectorUI/Tools/Formatting/index.html 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> "new-expression.js",
</span><span class="cx"> "label-break-continue-block.js",
</span><span class="cx"> "with-statement.js",
</span><del>- "throw-statement.js",
</del><span class="cx"> "return-statement.js",
</span><ins>+ "other-statements.js",
</ins><span class="cx"> "variable-declaration.js",
</span><span class="cx"> "functions.js",
</span><span class="cx"> "classes.js",
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceWorkersFormatterEsprimaFormatterjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js (199837 => 199838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js 2016-04-21 22:11:38 UTC (rev 199837)
+++ trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js 2016-04-21 22:24:17 UTC (rev 199838)
</span><span class="lines">@@ -785,7 +785,8 @@
</span><span class="cx"> || nodeType === "MetaProperty"
</span><span class="cx"> || nodeType === "RestElement"
</span><span class="cx"> || nodeType === "TemplateElement"
</span><del>- || nodeType === "TemplateLiteral") {
</del><ins>+ || nodeType === "TemplateLiteral"
+ || nodeType === "DebuggerStatement") {
</ins><span class="cx"> builder.appendToken(tokenValue, tokenOffset);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>