<!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>[160647] trunk/Tools</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/160647">160647</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-16 10:04:13 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Resolve inconsistant style warning caused by <a href="http://trac.webkit.org/projects/webkit/changeset/160319">r160319</a>.
https://bugs.webkit.org/show_bug.cgi?id=125772
Patch by Gergo Balogh <geryxyz@inf.u-szeged.hu> on 2013-12-16
Reviewed by Darin Adler.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_for_extra_new_line_at_eof):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(CppStyleTest.test_newline_at_eof):
(CppStyleTest.test_extra_newlines_at_eof):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpppy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpp_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160646 => 160647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-16 18:01:07 UTC (rev 160646)
+++ trunk/Tools/ChangeLog 2013-12-16 18:04:13 UTC (rev 160647)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-16 Gergo Balogh <geryxyz@inf.u-szeged.hu>
+
+ Resolve inconsistant style warning caused by r160319.
+ https://bugs.webkit.org/show_bug.cgi?id=125772
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_for_extra_new_line_at_eof):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (CppStyleTest.test_newline_at_eof):
+ (CppStyleTest.test_extra_newlines_at_eof):
+
</ins><span class="cx"> 2013-12-16 Eva Balazsfalvi <balazsfalvi.eva@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Remove mock_drt.py: parse_options() - --test-shell and --pixel-tests=<path>
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (160646 => 160647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-16 18:01:07 UTC (rev 160646)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-16 18:04:13 UTC (rev 160647)
</span><span class="lines">@@ -983,9 +983,14 @@
</span><span class="cx"> """
</span><span class="cx"> # The array lines() was created by adding two newlines to the
</span><span class="cx"> # original file (go figure), then splitting on \n.
</span><del>- if len(lines) > 3 and not lines[-3]:
- error(len(lines) - 2, 'whitespace/ending_newline', 5,
- 'There was more than one newline at the end of the file.')
</del><ins>+ # len(lines) < 3 means that the original file contain one or less lines,
+ # so there is no way to be 'more then one newline at the end'.
+ # The case when the -2. line is non-empty should addressed in the
+ # check_for_missing_new_line_at_eof so it can be ignored here.
+ if len(lines) > 3:
+ if not lines[-2] and not lines[-3]:
+ error(len(lines) - 2, 'whitespace/ending_newline', 5,
+ 'There was more than one newline at the end of the file.')
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def check_for_multiline_comments_and_strings(clean_lines, line_number, error):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (160646 => 160647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-16 18:01:07 UTC (rev 160646)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-16 18:04:13 UTC (rev 160647)
</span><span class="lines">@@ -1936,7 +1936,9 @@
</span><span class="cx"> ' [whitespace/ending_newline] [5]'))
</span><span class="cx">
</span><span class="cx"> do_test(self, '// Newline\n// at EOF\n', False)
</span><ins>+ do_test(self, '// Newline2\n\n// at EOF\n', False)
</ins><span class="cx"> do_test(self, '// No newline\n// at EOF', True)
</span><ins>+ do_test(self, '// No newline2\n\n// at EOF', True)
</ins><span class="cx">
</span><span class="cx"> def test_extra_newlines_at_eof(self):
</span><span class="cx"> def do_test(self, data, too_many_newlines):
</span><span class="lines">@@ -1951,7 +1953,9 @@
</span><span class="cx"> ' [whitespace/ending_newline] [5]'))
</span><span class="cx">
</span><span class="cx"> do_test(self, '// No Newline\n// at EOF', False)
</span><ins>+ do_test(self, '// No Newline2\n\n// at EOF', False)
</ins><span class="cx"> do_test(self, '// One Newline\n// at EOF\n', False)
</span><ins>+ do_test(self, '// One Newline2\n\n// at EOF\n', False)
</ins><span class="cx"> do_test(self, '// Two Newlines\n// at EOF\n\n', True)
</span><span class="cx"> do_test(self, '// Three Newlines\n// at EOF\n\n\n', True)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>