<!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>[174482] 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/174482">174482</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 17:08:44 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: CSS Pretty Printing fails to wrap long lines of selectors with pseudo classes/elements
https://bugs.webkit.org/show_bug.cgi?id=137413
Reviewed by Timothy Hatcher.
Long line wrapping was breaking as soon as there was a ':' for a psuedo
class or element. Likewise it was counting comment strings as part of
the length of the line even though it would get a newline after it.
* Tools/PrettyPrinting/CodeMirrorFormatters.js:
* Tools/PrettyPrinting/css-tests/basic-expected.css:
(progress, section, summary, time):
* Tools/PrettyPrinting/css-tests/wrapping-expected.css: Added.
(a.tryamacs, a.upgradenows):
(a.tryamacs:hover, a.upgradenows:hover):
* Tools/PrettyPrinting/css-tests/wrapping.css: Added.
(a.browsewebappss,a.businessstores,a.buyiphones,a.buynows,a.buynows-arrow,a.comingsoons,p::before,a.descargarahoras,a.downloadituness,a.downloadnows,a.finds,a.freetrials,a.getstarteds,a.gos,a.howtoapplys,a.howtobuys,a.joinnows,a.learnmores,a.nikebuynows,a.notifymes,a.ordernows,a.preordernows,a.preorders,a.reserves,a.startyoursearchs,a.submits,a.tryamacs,a.upgradenows):
(a.browsewebappss:hover,a.businessstores:hover,a.buyiphones:hover,a.buynows:hover,a.buynows-arrow:hover,a.comingsoons:hover,p::before,a.descargarahoras:hover,a.downloadituness:hover,a.downloadnows:hover,a.finds:hover,a.freetrials:hover,a.getstarteds:hover,a.gos:hover,a.howtoapplys:hover,a.howtobuys:hover,a.joinnows:hover,a.learnmores:hover,a.nikebuynows:hover,a.notifymes:hover,a.ordernows:hover,a.preordernows:hover,a.preorders:hover,a.reserves:hover,a.startyoursearchs:hover,a.submits:hover,a.tryamacs:hover,a.upgradenows:hover):
* Tools/PrettyPrinting/index.html:
* UserInterface/Views/CodeMirrorFormatters.js:</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="#trunkSourceWebInspectorUIToolsPrettyPrintingcsstestsbasicexpectedcss">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/basic-expected.css</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingindexhtml">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs">trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingcsstestswrappingexpectedcss">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping-expected.css</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingcsstestswrappingcss">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (174481 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-10-08 23:37:58 UTC (rev 174481)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-10-08 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CSS Pretty Printing fails to wrap long lines of selectors with pseudo classes/elements
+ https://bugs.webkit.org/show_bug.cgi?id=137413
+
+ Reviewed by Timothy Hatcher.
+
+ Long line wrapping was breaking as soon as there was a ':' for a psuedo
+ class or element. Likewise it was counting comment strings as part of
+ the length of the line even though it would get a newline after it.
+
+ * Tools/PrettyPrinting/CodeMirrorFormatters.js:
+ * Tools/PrettyPrinting/css-tests/basic-expected.css:
+ (progress, section, summary, time):
+ * Tools/PrettyPrinting/css-tests/wrapping-expected.css: Added.
+ (a.tryamacs, a.upgradenows):
+ (a.tryamacs:hover, a.upgradenows:hover):
+ * Tools/PrettyPrinting/css-tests/wrapping.css: Added.
+ (a.browsewebappss,a.businessstores,a.buyiphones,a.buynows,a.buynows-arrow,a.comingsoons,p::before,a.descargarahoras,a.downloadituness,a.downloadnows,a.finds,a.freetrials,a.getstarteds,a.gos,a.howtoapplys,a.howtobuys,a.joinnows,a.learnmores,a.nikebuynows,a.notifymes,a.ordernows,a.preordernows,a.preorders,a.reserves,a.startyoursearchs,a.submits,a.tryamacs,a.upgradenows):
+ (a.browsewebappss:hover,a.businessstores:hover,a.buyiphones:hover,a.buynows:hover,a.buynows-arrow:hover,a.comingsoons:hover,p::before,a.descargarahoras:hover,a.downloadituness:hover,a.downloadnows:hover,a.finds:hover,a.freetrials:hover,a.getstarteds:hover,a.gos:hover,a.howtoapplys:hover,a.howtobuys:hover,a.joinnows:hover,a.learnmores:hover,a.nikebuynows:hover,a.notifymes:hover,a.ordernows:hover,a.preordernows:hover,a.preorders:hover,a.reserves:hover,a.startyoursearchs:hover,a.submits:hover,a.tryamacs:hover,a.upgradenows:hover):
+ * Tools/PrettyPrinting/index.html:
+ * UserInterface/Views/CodeMirrorFormatters.js:
+
</ins><span class="cx"> 2014-10-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add PrettyPrinter CSS tests
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingCodeMirrorFormattersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js (174481 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js 2014-10-08 23:37:58 UTC (rev 174481)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> // In order insert newlines in selector lists we need keep track of the length of the current line.
</span><span class="cx"> // This isn't exact line length, only the builder knows that, but it is good enough to get an idea.
</span><span class="cx"> // If we are at a top level, keep track of the current line length, otherwise we reset to 0.
</span><del>- if (state.state === "top" || state.state === "media")
</del><ins>+ if (!isComment && (state.state === "top" || state.state === "media" || state.state === "pseudo"))
</ins><span class="cx"> state._cssPrettyPrint.lineLength += content.length;
</span><span class="cx"> else
</span><span class="cx"> state._cssPrettyPrint.lineLength = 0;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingcsstestsbasicexpectedcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/basic-expected.css (174481 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/basic-expected.css 2014-10-08 23:37:58 UTC (rev 174481)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/basic-expected.css 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> /* RESET */
</span><del>-html, body, div, ul, ol, li, dl, dt, dd, h1, h2, h3, h4, h5, h6,
-pre, form, p, blockquote, fieldset, input, abbr, article, aside, command,
-details, figcaption, figure, footer, header, hgroup, mark, meter, nav,
-output, progress, section, summary, time {
</del><ins>+html, body, div, ul, ol, li, dl, dt, dd, h1, h2, h3, h4, h5, h6, pre, form, p,
+blockquote, fieldset, input, abbr, article, aside, command, details,
+figcaption, figure, footer, header, hgroup, mark, meter, nav, output,
+progress, section, summary, time {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingcsstestswrappingexpectedcss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping-expected.css (0 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping-expected.css (rev 0)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping-expected.css 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+/* LONG LISTS SHOULD WRAP */
+a.browsewebappss, a.businessstores, a.buyiphones, a.buynows, a.buynows-arrow,
+a.comingsoons, p::before, a.descargarahoras, a.downloadituness, a.downloadnows,
+a.finds, a.freetrials, a.getstarteds, a.gos, a.howtoapplys, a.howtobuys,
+a.joinnows, a.learnmores, a.nikebuynows, a.notifymes, a.ordernows,
+a.preordernows, a.preorders, a.reserves, a.startyoursearchs, a.submits,
+a.tryamacs, a.upgradenows {
+ color: red
+}
+
+a.browsewebappss:hover, a.businessstores:hover, a.buyiphones:hover,
+a.buynows:hover, a.buynows-arrow:hover, a.comingsoons:hover, p::before,
+a.descargarahoras:hover, a.downloadituness:hover, a.downloadnows:hover,
+a.finds:hover, a.freetrials:hover, a.getstarteds:hover, a.gos:hover,
+a.howtoapplys:hover, a.howtobuys:hover, a.joinnows:hover, a.learnmores:hover,
+a.nikebuynows:hover, a.notifymes:hover, a.ordernows:hover, a.preordernows:hover,
+a.preorders:hover, a.reserves:hover, a.startyoursearchs:hover, a.submits:hover,
+a.tryamacs:hover, a.upgradenows:hover {
+ color: red
+}
+
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingcsstestswrappingcss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping.css (0 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping.css (rev 0)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/wrapping.css 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+/* LONG LISTS SHOULD WRAP */
+a.browsewebappss,a.businessstores,a.buyiphones,a.buynows,a.buynows-arrow,a.comingsoons,p::before,a.descargarahoras,a.downloadituness,a.downloadnows,a.finds,a.freetrials,a.getstarteds,a.gos,a.howtoapplys,a.howtobuys,a.joinnows,a.learnmores,a.nikebuynows,a.notifymes,a.ordernows,a.preordernows,a.preorders,a.reserves,a.startyoursearchs,a.submits,a.tryamacs,a.upgradenows {color:red}
+a.browsewebappss:hover,a.businessstores:hover,a.buyiphones:hover,a.buynows:hover,a.buynows-arrow:hover,a.comingsoons:hover,p::before,a.descargarahoras:hover,a.downloadituness:hover,a.downloadnows:hover,a.finds:hover,a.freetrials:hover,a.getstarteds:hover,a.gos:hover,a.howtoapplys:hover,a.howtobuys:hover,a.joinnows:hover,a.learnmores:hover,a.nikebuynows:hover,a.notifymes:hover,a.ordernows:hover,a.preordernows:hover,a.preorders:hover,a.reserves:hover,a.startyoursearchs:hover,a.submits:hover,a.tryamacs:hover,a.upgradenows:hover {color:red}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html (174481 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html 2014-10-08 23:37:58 UTC (rev 174481)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -246,6 +246,7 @@
</span><span class="cx"> "css-tests/calc.css",
</span><span class="cx"> "css-tests/media-query.css",
</span><span class="cx"> "css-tests/selectors.css",
</span><ins>+ "css-tests/wrapping.css",
</ins><span class="cx"> ]);
</span><span class="cx"> }
</span><span class="cx"> function _runTests(callback, manifest) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js (174481 => 174482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js 2014-10-08 23:37:58 UTC (rev 174481)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js 2014-10-09 00:08:44 UTC (rev 174482)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> // In order insert newlines in selector lists we need keep track of the length of the current line.
</span><span class="cx"> // This isn't exact line length, only the builder knows that, but it is good enough to get an idea.
</span><span class="cx"> // If we are at a top level, keep track of the current line length, otherwise we reset to 0.
</span><del>- if (state.state === "top" || state.state === "media")
</del><ins>+ if (!isComment && (state.state === "top" || state.state === "media" || state.state === "pseudo"))
</ins><span class="cx"> state._cssPrettyPrint.lineLength += content.length;
</span><span class="cx"> else
</span><span class="cx"> state._cssPrettyPrint.lineLength = 0;
</span></span></pre>
</div>
</div>
</body>
</html>