<!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>[160319] 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/160319">160319</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-09 11:01:09 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-webkit-style should check for extra newlines at EOF
https://bugs.webkit.org/show_bug.cgi?id=125424
Patch by Brian J. Burg <burg@cs.washington.edu> on 2013-12-09
Reviewed by Darin Adler.
Report a style violation if extraneous newlines are added
to the end of a C++ file. There should only be one newline at EOF.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_for_missing_new_line_at_eof): Renamed from check_for_new_line_at_eof.
(check_for_extra_new_line_at_eof): Added.
(_process_lines): Added new check and renamed existing EOF check.
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(CppStyleTest.test_extra_newlines_at_eof): Added.
(CppStyleTest.test_extra_newlines_at_eof.do_test): Added.</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 (160318 => 160319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-09 18:57:53 UTC (rev 160318)
+++ trunk/Tools/ChangeLog 2013-12-09 19:01:09 UTC (rev 160319)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-09 Brian J. Burg <burg@cs.washington.edu>
+
+ check-webkit-style should check for extra newlines at EOF
+ https://bugs.webkit.org/show_bug.cgi?id=125424
+
+ Reviewed by Darin Adler.
+
+ Report a style violation if extraneous newlines are added
+ to the end of a C++ file. There should only be one newline at EOF.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_for_missing_new_line_at_eof): Renamed from check_for_new_line_at_eof.
+ (check_for_extra_new_line_at_eof): Added.
+ (_process_lines): Added new check and renamed existing EOF check.
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (CppStyleTest.test_extra_newlines_at_eof): Added.
+ (CppStyleTest.test_extra_newlines_at_eof.do_test): Added.
+
</ins><span class="cx"> 2013-12-09 Laszlo Vidacs <lac@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> check-webkit-style: ternary operator in macro call identified as initialization list
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (160318 => 160319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-09 18:57:53 UTC (rev 160318)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-09 19:01:09 UTC (rev 160319)
</span><span class="lines">@@ -957,8 +957,8 @@
</span><span class="cx"> 'Line contains invalid UTF-8 (or Unicode replacement character).')
</span><span class="cx">
</span><span class="cx">
</span><del>-def check_for_new_line_at_eof(lines, error):
- """Logs an error if there is no newline char at the end of the file.
</del><ins>+def check_for_missing_new_line_at_eof(lines, error):
+ """Logs an error if there is not a newline character at the end of the file.
</ins><span class="cx">
</span><span class="cx"> Args:
</span><span class="cx"> lines: An array of strings, each representing a line of the file.
</span><span class="lines">@@ -974,6 +974,20 @@
</span><span class="cx"> 'Could not find a newline character at the end of the file.')
</span><span class="cx">
</span><span class="cx">
</span><ins>+def check_for_extra_new_line_at_eof(lines, error):
+ """Logs an error if there is not a single newline at the end of the file.
+
+ Args:
+ lines: An array of strings, each representing a line of the file.
+ error: The function to call with any errors found.
+ """
+ # The array lines() was created by adding two newlines to the
+ # original file (go figure), then splitting on \n.
+ 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.')
+
+
</ins><span class="cx"> def check_for_multiline_comments_and_strings(clean_lines, line_number, error):
</span><span class="cx"> """Logs an error if we see /* ... */ or "..." that extend past one line.
</span><span class="cx">
</span><span class="lines">@@ -3635,7 +3649,8 @@
</span><span class="cx"> # lines rather than "cleaned" lines.
</span><span class="cx"> check_for_unicode_replacement_characters(lines, error)
</span><span class="cx">
</span><del>- check_for_new_line_at_eof(lines, error)
</del><ins>+ check_for_missing_new_line_at_eof(lines, error)
+ check_for_extra_new_line_at_eof(lines, error)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class CppChecker(object):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (160318 => 160319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-09 18:57:53 UTC (rev 160318)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-09 19:01:09 UTC (rev 160319)
</span><span class="lines">@@ -1937,6 +1937,23 @@
</span><span class="cx"> do_test(self, '// Newline\n// at EOF\n', False)
</span><span class="cx"> do_test(self, '// No newline\n// at EOF', True)
</span><span class="cx">
</span><ins>+ def test_extra_newlines_at_eof(self):
+ def do_test(self, data, too_many_newlines):
+ error_collector = ErrorCollector(self.assertTrue)
+ self.process_file_data('foo.cpp', 'cpp', data.split('\n'),
+ error_collector)
+ # The warning appears only once.
+ self.assertEqual(
+ int(too_many_newlines),
+ error_collector.results().count(
+ 'There was more than one newline at the end of the file.'
+ ' [whitespace/ending_newline] [5]'))
+
+ do_test(self, '// No Newline\n// at EOF', False)
+ do_test(self, '// One Newline\n// at EOF\n', False)
+ do_test(self, '// Two Newlines\n// at EOF\n\n', True)
+ do_test(self, '// Three Newlines\n// at EOF\n\n\n', True)
+
</ins><span class="cx"> def test_invalid_utf8(self):
</span><span class="cx"> def do_test(self, raw_bytes, has_invalid_utf8):
</span><span class="cx"> error_collector = ErrorCollector(self.assertTrue)
</span></span></pre>
</div>
</div>
</body>
</html>