<!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>[183567] 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/183567">183567</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-04-29 12:32:54 -0700 (Wed, 29 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-webkit-style: Don't complain about returning value from Objective-C method call in header
<http://webkit.org/b/144395>
Reviewed by Andy Estes.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_spacing): Update regex so 'return' is ignored if it
precedes the whitespace and bracket. Change category name to
'whitespace/brackets'. Add period to error message.
(CppChecker): Add 'whitespace/brackets' as a category.
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(ErrorCollector.__call__): Replace 'STYLE_CATEGORIES' with
'CppChecker.categories' since that's where the list lives now.
(CppStyleTest.test_spacing_before_brackets): Add tests for
'whitespace/brackets' issues and non-issues.</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 (183566 => 183567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-29 19:23:04 UTC (rev 183566)
+++ trunk/Tools/ChangeLog 2015-04-29 19:32:54 UTC (rev 183567)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-29 David Kilzer <ddkilzer@apple.com>
+
+ check-webkit-style: Don't complain about returning value from Objective-C method call in header
+ <http://webkit.org/b/144395>
+
+ Reviewed by Andy Estes.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_spacing): Update regex so 'return' is ignored if it
+ precedes the whitespace and bracket. Change category name to
+ 'whitespace/brackets'. Add period to error message.
+ (CppChecker): Add 'whitespace/brackets' as a category.
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (ErrorCollector.__call__): Replace 'STYLE_CATEGORIES' with
+ 'CppChecker.categories' since that's where the list lives now.
+ (CppStyleTest.test_spacing_before_brackets): Add tests for
+ 'whitespace/brackets' issues and non-issues.
+
</ins><span class="cx"> 2015-04-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix WinCairo bot.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (183566 => 183567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-04-29 19:23:04 UTC (rev 183566)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-04-29 19:32:54 UTC (rev 183567)
</span><span class="lines">@@ -2005,9 +2005,9 @@
</span><span class="cx"> # 'delete []' or 'new char * []'. Objective-C can't follow this rule
</span><span class="cx"> # because of method calls.
</span><span class="cx"> if file_extension != 'mm' and file_extension != 'm':
</span><del>- if search(r'\w\s+\[', line) and not search(r'delete\s+\[', line):
- error(line_number, 'whitespace/braces', 5,
- 'Extra space before [')
</del><ins>+ if search(r'\w\s+\[', line) and not search(r'(delete|return)\s+\[', line):
+ error(line_number, 'whitespace/brackets', 5,
+ 'Extra space before [.')
</ins><span class="cx">
</span><span class="cx"> # There should always be a single space in between braces on the same line.
</span><span class="cx"> if search(r'\{\}', line):
</span><span class="lines">@@ -3895,6 +3895,7 @@
</span><span class="cx"> 'runtime/wtf_move',
</span><span class="cx"> 'whitespace/blank_line',
</span><span class="cx"> 'whitespace/braces',
</span><ins>+ 'whitespace/brackets',
</ins><span class="cx"> 'whitespace/colon',
</span><span class="cx"> 'whitespace/comma',
</span><span class="cx"> 'whitespace/comments',
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (183566 => 183567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-04-29 19:23:04 UTC (rev 183566)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-04-29 19:32:54 UTC (rev 183567)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> # This class works as an error collector and replaces cpp_style.Error
</span><span class="cx"> # function for the unit tests. We also verify each category we see
</span><del>-# is in STYLE_CATEGORIES, to help keep that list up to date.
</del><ins>+# is in CppChecker.categories, to help keep that list up to date.
</ins><span class="cx"> class ErrorCollector:
</span><span class="cx"> _all_style_categories = CppChecker.categories
</span><span class="cx"> # This is a list including all categories seen in any unit test.
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> def __call__(self, line_number, category, confidence, message):
</span><span class="cx"> self._assert_fn(category in self._all_style_categories,
</span><span class="cx"> 'Message "%s" has category "%s",'
</span><del>- ' which is not in STYLE_CATEGORIES' % (message, category))
</del><ins>+ ' which is not in CppChecker.categories' % (message, category))
</ins><span class="cx">
</span><span class="cx"> if self._lines_to_check and not line_number in self._lines_to_check:
</span><span class="cx"> return False
</span><span class="lines">@@ -1730,6 +1730,14 @@
</span><span class="cx"> self.assert_lint(' {}', 'Missing space inside { }. [whitespace/braces] [5]')
</span><span class="cx"> self.assert_lint(' { }', 'Too many spaces inside { }. [whitespace/braces] [5]')
</span><span class="cx">
</span><ins>+ def test_spacing_before_brackets(self):
+ self.assert_lint('delete [] base;', '')
+ # See SOFT_LINK_CLASS_FOR_HEADER() macro in SoftLinking.h.
+ self.assert_lint(' return [get_##framework##_##className##Class() alloc]; \\', '')
+ self.assert_lint(' m_taskFunction = [callee, method, arguments...] {', '')
+ self.assert_lint('int main(int argc, char* agrv [])', 'Extra space before [. [whitespace/brackets] [5]')
+ self.assert_lint(' str [strLength] = \'\\0\';', 'Extra space before [. [whitespace/brackets] [5]')
+
</ins><span class="cx"> def test_spacing_around_else(self):
</span><span class="cx"> self.assert_lint('}else {', 'Missing space before else'
</span><span class="cx"> ' [whitespace/braces] [5]')
</span></span></pre>
</div>
</div>
</body>
</html>