<!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>[181205] trunk/Source/WebInspectorUI</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/181205">181205</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-06 22:10:36 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: JS Pretty Printing: "case" or "default" outside of switch causes unbalanced indentation
https://bugs.webkit.org/show_bug.cgi?id=142428
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-03-06
Reviewed by Timothy Hatcher.
* Tools/PrettyPrinting/CodeMirrorFormatters.js:
* UserInterface/Views/CodeMirrorFormatters.js:
Fix "case" and "default" indentation rules to only happen inside a switch.
* Tools/PrettyPrinting/js-tests/switch-case-default-expected.js:
* Tools/PrettyPrinting/js-tests/switch-case-default.js:
Add tests for "case" and "default" nested inside and outside of switches.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingCodeMirrorFormattersjs">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingjstestsswitchcasedefaultexpectedjs">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default-expected.js</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingjstestsswitchcasedefaultjs">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs">trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181204 => 181205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-07 04:19:07 UTC (rev 181204)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-07 06:10:36 UTC (rev 181205)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-03-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: JS Pretty Printing: "case" or "default" outside of switch causes unbalanced indentation
+ https://bugs.webkit.org/show_bug.cgi?id=142428
+
+ Reviewed by Timothy Hatcher.
+
+ * Tools/PrettyPrinting/CodeMirrorFormatters.js:
+ * UserInterface/Views/CodeMirrorFormatters.js:
+ Fix "case" and "default" indentation rules to only happen inside a switch.
+
+ * Tools/PrettyPrinting/js-tests/switch-case-default-expected.js:
+ * Tools/PrettyPrinting/js-tests/switch-case-default.js:
+ Add tests for "case" and "default" nested inside and outside of switches.
+
+2015-03-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: ES6: Improved Support for Iterator Objects
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142420
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingCodeMirrorFormattersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js (181204 => 181205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js 2015-03-07 04:19:07 UTC (rev 181204)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js 2015-03-07 06:10:36 UTC (rev 181205)
</span><span class="lines">@@ -137,7 +137,13 @@
</span><span class="cx">
</span><span class="cx"> indentAfterToken: function(lastToken, lastContent, token, state, content, isComment)
</span><span class="cx"> {
</span><del>- return content === "{" || content === "case" || content === "default";
</del><ins>+ if (content === "{")
+ return true;
+
+ if (content === "case" || content === "default")
+ return state.lexical.type === "}" && state.lexical.prev && state.lexical.prev.type === "form"; // Switch case/default.
+
+ return false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> newlineBeforeToken: function(lastToken, lastContent, token, state, content, isComment)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingjstestsswitchcasedefaultexpectedjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default-expected.js (181204 => 181205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default-expected.js 2015-03-07 04:19:07 UTC (rev 181204)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default-expected.js 2015-03-07 06:10:36 UTC (rev 181205)
</span><span class="lines">@@ -1,8 +1,17 @@
</span><ins>+function Ctor1() {
+ this.case = 1;
+ this.something = 2;
+}
+function Ctor2() {
+ this.default = 1;
+ this.something = 2;
+}
+
</ins><span class="cx"> switch (x) {
</span><span class="cx"> case "abc":
</span><del>- return 1;
</del><ins>+ return this.default;
</ins><span class="cx"> case "def":
</span><del>- return 2;
</del><ins>+ return this.case;
</ins><span class="cx"> default:
</span><span class="cx"> return 3;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingjstestsswitchcasedefaultjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default.js (181204 => 181205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default.js 2015-03-07 04:19:07 UTC (rev 181204)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/switch-case-default.js 2015-03-07 06:10:36 UTC (rev 181205)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><del>-switch(x){case "abc":return 1;case "def":return 2;default:return 3;}
</del><ins>+function Ctor1(){this.case=1;this.something=2;}
+function Ctor2(){this.default=1;this.something=2;}
</ins><span class="cx">
</span><ins>+switch(x){case "abc":return this.default;case "def":return this.case;default:return 3;}
+
</ins><span class="cx"> switch(x){
</span><span class="cx"> case "abc":
</span><span class="cx"> return 1;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js (181204 => 181205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js 2015-03-07 04:19:07 UTC (rev 181204)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js 2015-03-07 06:10:36 UTC (rev 181205)
</span><span class="lines">@@ -137,7 +137,13 @@
</span><span class="cx">
</span><span class="cx"> indentAfterToken: function(lastToken, lastContent, token, state, content, isComment)
</span><span class="cx"> {
</span><del>- return content === "{" || content === "case" || content === "default";
</del><ins>+ if (content === "{")
+ return true;
+
+ if (content === "case" || content === "default")
+ return state.lexical.type === "}" && state.lexical.prev && state.lexical.prev.type === "form"; // Switch case/default.
+
+ return false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> newlineBeforeToken: function(lastToken, lastContent, token, state, content, isComment)
</span></span></pre>
</div>
</div>
</body>
</html>