<!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>[159872] 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/159872">159872</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-29 06:32:53 -0800 (Fri, 29 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>check-webkit-style should check for extraneous newline between config.h and primary header.
https://bugs.webkit.org/show_bug.cgi?id=124821

Patch by Gergo Balogh &lt;geryxyz@inf.u-szeged.hu&gt; on 2013-11-29
Reviewed by Csaba Osztrogonác.

* Scripts/webkitpy/style/checkers/cpp.py:
(check_include_line):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(OrderOfIncludesTest.test_check_line_break_after_own_header):
(OrderOfIncludesTest):
(OrderOfIncludesTest.test_check_line_break_before_own_header):</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 (159871 => 159872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2013-11-29 14:16:18 UTC (rev 159871)
+++ trunk/Tools/ChangeLog        2013-11-29 14:32:53 UTC (rev 159872)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-11-29  Gergo Balogh  &lt;geryxyz@inf.u-szeged.hu&gt;
+
+        check-webkit-style should check for extraneous newline between config.h and primary header.
+        https://bugs.webkit.org/show_bug.cgi?id=124821
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_include_line):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (OrderOfIncludesTest.test_check_line_break_after_own_header):
+        (OrderOfIncludesTest):
+        (OrderOfIncludesTest.test_check_line_break_before_own_header):
+
</ins><span class="cx"> 2013-11-29  Jozsef Berta  &lt;jberta@inf.u-szeged.hu&gt;
</span><span class="cx"> 
</span><span class="cx">         test-webkit-scripts should show the failing tests and use an appropriate exit code
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (159871 => 159872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py        2013-11-29 14:16:18 UTC (rev 159871)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py        2013-11-29 14:32:53 UTC (rev 159872)
</span><span class="lines">@@ -2818,12 +2818,16 @@
</span><span class="cx">                                                            file_extension == &quot;h&quot;,
</span><span class="cx">                                                            primary_header_exists)
</span><span class="cx"> 
</span><del>-    # Check to make sure we have a blank line after primary header.
</del><ins>+    # Check to make sure we have a blank line after and none before primary header.
</ins><span class="cx">     if not error_message and header_type == _PRIMARY_HEADER:
</span><del>-         next_line = clean_lines.raw_lines[line_number + 1]
-         if not is_blank_line(next_line):
</del><ins>+        next_line = clean_lines.raw_lines[line_number + 1]
+        previous_line = clean_lines.raw_lines[line_number - 1]
+        if not is_blank_line(next_line):
</ins><span class="cx">             error(line_number, 'build/include_order', 4,
</span><del>-                  'You should add a blank line after implementation file\'s own header.')
</del><ins>+                'You should add a blank line after implementation file\'s own header.')
+        if is_blank_line(previous_line):
+            error(line_number, 'build/include_order', 4,
+                'You should not add a blank line before implementation file\'s own header.')
</ins><span class="cx"> 
</span><span class="cx">     # Check to make sure all headers besides config.h and the primary header are
</span><span class="cx">     # alphabetically sorted.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (159871 => 159872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py        2013-11-29 14:16:18 UTC (rev 159871)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py        2013-11-29 14:32:53 UTC (rev 159872)
</span><span class="lines">@@ -2644,6 +2644,22 @@
</span><span class="cx">                                          '#include &quot;bar.h&quot;\n',
</span><span class="cx">                                          '')
</span><span class="cx"> 
</span><ins>+    def test_check_line_break_before_own_header(self):
+        self.assert_language_rules_check('foo.cpp',
+                                         '#include &quot;config.h&quot;\n'
+                                         '\n'
+                                         '#include &quot;foo.h&quot;\n'
+                                         '\n'
+                                         '#include &quot;bar.h&quot;\n',
+                                         'You should not add a blank line before implementation file\'s own header.  [build/include_order] [4]')
+
+        self.assert_language_rules_check('foo.cpp',
+                                         '#include &quot;config.h&quot;\n'
+                                         '#include &quot;foo.h&quot;\n'
+                                         '\n'
+                                         '#include &quot;bar.h&quot;\n',
+                                         '')
+
</ins><span class="cx">     def test_check_preprocessor_in_include_section(self):
</span><span class="cx">         self.assert_language_rules_check('foo.cpp',
</span><span class="cx">                                          '#include &quot;config.h&quot;\n'
</span></span></pre>
</div>
</div>

</body>
</html>