<!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>[167350] 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/167350">167350</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 10:17:11 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-webkit-style doesn't check code style in .mm or .m files
https://bugs.webkit.org/show_bug.cgi?id=131708
Reviewed by Darin Adler.
* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checker_unittest.py:
(CheckerDispatcherDispatchTest.test_cpp_paths):
(CheckerDispatcherDispatchTest.test_text_paths):
Check .mm and .m files as C++.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_spacing):
Add an override for our ordinary "missing spaces around =" for @synthesize,
which should look like "@synthesize propertyName=_varName;"
Add an override for "missing space before {" for blocks' "^{".
Don't follow the "extra space before [" rule for Objective-C, because
it breaks this rule in a multitude of ways because of method calls.
(check_braces):
Don't complain about { not being on the end of the previous line if
the previous line starts with "- (" or "+ (", which would indicate a
Objective-C method definition.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylechecker_unittestpy">trunk/Tools/Scripts/webkitpy/style/checker_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpppy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167349 => 167350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-16 16:52:31 UTC (rev 167349)
+++ trunk/Tools/ChangeLog 2014-04-16 17:17:11 UTC (rev 167350)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-04-16 Tim Horton <timothy_horton@apple.com>
+
+ check-webkit-style doesn't check code style in .mm or .m files
+ https://bugs.webkit.org/show_bug.cgi?id=131708
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/style/checker.py:
+ * Scripts/webkitpy/style/checker_unittest.py:
+ (CheckerDispatcherDispatchTest.test_cpp_paths):
+ (CheckerDispatcherDispatchTest.test_text_paths):
+ Check .mm and .m files as C++.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_spacing):
+ Add an override for our ordinary "missing spaces around =" for @synthesize,
+ which should look like "@synthesize propertyName=_varName;"
+
+ Add an override for "missing space before {" for blocks' "^{".
+
+ Don't follow the "extra space before [" rule for Objective-C, because
+ it breaks this rule in a multitude of ways because of method calls.
+
+ (check_braces):
+ Don't complain about { not being on the end of the previous line if
+ the previous line starts with "- (" or "+ (", which would indicate a
+ Objective-C method definition.
+
</ins><span class="cx"> 2014-04-16 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Make Vector::takeLast work with move-only types (and optimize for types where move is faster)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (167349 => 167350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker.py 2014-04-16 16:52:31 UTC (rev 167349)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2014-04-16 17:17:11 UTC (rev 167350)
</span><span class="lines">@@ -257,6 +257,8 @@
</span><span class="cx"> 'c',
</span><span class="cx"> 'cpp',
</span><span class="cx"> 'h',
</span><ins>+ 'mm',
+ 'm',
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> _JS_FILE_EXTENSION = 'js'
</span><span class="lines">@@ -277,7 +279,6 @@
</span><span class="cx"> 'html',
</span><span class="cx"> 'idl',
</span><span class="cx"> 'in',
</span><del>- 'mm',
</del><span class="cx"> 'php',
</span><span class="cx"> 'pl',
</span><span class="cx"> 'pm',
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylechecker_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker_unittest.py (167349 => 167350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2014-04-16 16:52:31 UTC (rev 167349)
+++ trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2014-04-16 17:17:11 UTC (rev 167350)
</span><span class="lines">@@ -442,6 +442,8 @@
</span><span class="cx"> "foo.c",
</span><span class="cx"> "foo.cpp",
</span><span class="cx"> "foo.h",
</span><ins>+ "foo.mm",
+ "foo.m",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> for path in paths:
</span><span class="lines">@@ -537,7 +539,6 @@
</span><span class="cx"> "foo.html",
</span><span class="cx"> "foo.idl",
</span><span class="cx"> "foo.in",
</span><del>- "foo.mm",
</del><span class="cx"> "foo.php",
</span><span class="cx"> "foo.pl",
</span><span class="cx"> "foo.pm",
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (167349 => 167350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-04-16 16:52:31 UTC (rev 167349)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-04-16 17:17:11 UTC (rev 167350)
</span><span class="lines">@@ -1848,13 +1848,21 @@
</span><span class="cx"> error(line_number, 'whitespace/property', 4,
</span><span class="cx"> 'Should not have spaces around = in property attributes.')
</span><span class="cx">
</span><ins>+ # Objective-C @synthesize lines.
+ is_objective_c_synthesize = search(r'^@synthesize', line)
+ if is_objective_c_synthesize:
+ # "prop=_varName" not "prop = _varName"
+ if search(r'(\s+=|=\s+)', line):
+ error(line_number, 'whitespace/property', 4,
+ 'Should not have spaces around = in property synthesis.')
+
</ins><span class="cx"> # Don't try to do spacing checks for operator methods
</span><span class="cx"> line = sub(r'operator(==|!=|<|<<|<=|>=|>>|>|\+=|-=|\*=|/=|%=|&=|\|=|^=|<<=|>>=|/)\(', 'operator\(', line)
</span><span class="cx"> # Don't try to do spacing checks for #include, #import, or #if statements at
</span><span class="cx"> # minimum because it messes up checks for spacing around /
</span><span class="cx"> if match(r'\s*#\s*(?:include|import|if)', line):
</span><span class="cx"> return
</span><del>- if not is_objective_c_property and search(r'[\w.]=[\w.]', line):
</del><ins>+ if not is_objective_c_property and not is_objective_c_synthesize and search(r'[\w.]=[\w.]', line):
</ins><span class="cx"> error(line_number, 'whitespace/operators', 4,
</span><span class="cx"> 'Missing spaces around =')
</span><span class="cx">
</span><span class="lines">@@ -1950,10 +1958,10 @@
</span><span class="cx"> # Next we will look for issues with function calls.
</span><span class="cx"> check_spacing_for_function_call(line, line_number, error)
</span><span class="cx">
</span><del>- # Except after an opening paren, you should have spaces before your braces.
- # And since you should never have braces at the beginning of a line, this is
- # an easy test.
- if search(r'[^ ({]{', line):
</del><ins>+ # Except after an opening paren (or ^, for blocks), you should have spaces
+ # before your braces. And since you should never have braces at the
+ # beginning of a line, this is an easy test.
+ if search(r'[^ ({\^]{', line):
</ins><span class="cx"> error(line_number, 'whitespace/braces', 5,
</span><span class="cx"> 'Missing space before {')
</span><span class="cx">
</span><span class="lines">@@ -1963,10 +1971,12 @@
</span><span class="cx"> 'Missing space before else')
</span><span class="cx">
</span><span class="cx"> # You shouldn't have spaces before your brackets, except maybe after
</span><del>- # 'delete []' or 'new char * []'.
- if search(r'\w\s+\[', line) and not search(r'delete\s+\[', line):
- error(line_number, 'whitespace/braces', 5,
- 'Extra space before [')
</del><ins>+ # 'delete []' or 'new char * []'. Objective-C can't follow this rule
+ # because of method calls.
+ if file_extension != 'mm' and file_extension != 'm':
+ if search(r'\w\s+\[', line) and not search(r'delete\s+\[', line):
+ error(line_number, 'whitespace/braces', 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">@@ -2163,7 +2173,6 @@
</span><span class="cx"> initial_spaces += 1
</span><span class="cx"> return initial_spaces
</span><span class="cx">
</span><del>-
</del><span class="cx"> def check_indentation_amount(clean_lines, line_number, error):
</span><span class="cx"> line = clean_lines.elided[line_number]
</span><span class="cx"> initial_spaces = get_initial_spaces_for_line(line)
</span><span class="lines">@@ -2372,11 +2381,14 @@
</span><span class="cx"> # perfectly: we just don't complain if the last non-whitespace
</span><span class="cx"> # character on the previous non-blank line is ';', ':', '{', '}',
</span><span class="cx"> # ')', or ') const' and doesn't begin with 'if|for|while|switch|else'.
</span><del>- # We also allow '#' for #endif and '=' for array initialization.
</del><ins>+ # We also allow '#' for #endif and '=' for array initialization,
+ # and '- (' and '+ (' for Objective-C methods.
</ins><span class="cx"> previous_line = get_previous_non_blank_line(clean_lines, line_number)[0]
</span><span class="cx"> if ((not search(r'[;:}{)=]\s*$|\)\s*((const|override)\s*)?(->\s*\S+)?\s*$', previous_line)
</span><span class="cx"> or search(r'\b(if|for|while|switch|else|NS_ENUM)\b', previous_line))
</span><del>- and previous_line.find('#') < 0):
</del><ins>+ and previous_line.find('#') < 0
+ and previous_line.find('- (') != 0
+ and previous_line.find('+ (') != 0):
</ins><span class="cx"> error(line_number, 'whitespace/braces', 4,
</span><span class="cx"> 'This { should be at the end of the previous line')
</span><span class="cx"> elif (search(r'\)\s*(((const|override)\s*)*\s*)?{\s*$', line)
</span></span></pre>
</div>
</div>
</body>
</html>