summaryrefslogtreecommitdiffstats
path: root/tools/android/checkstyle
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2014-09-04 15:08:45 -0700
committerAurimas Liutikas <aurimas@google.com>2014-09-04 22:13:40 +0000
commitb278b52d9e92ad44cbdc9a4258bb0fd04d603eb6 (patch)
treef6aa7c69b49f205d2dfc998beaf39b3630044ab5 /tools/android/checkstyle
parent3976a3f8509145051ff2865ccba0fffe79fe32e6 (diff)
downloadchromium_src-b278b52d9e92ad44cbdc9a4258bb0fd04d603eb6.zip
chromium_src-b278b52d9e92ad44cbdc9a4258bb0fd04d603eb6.tar.gz
chromium_src-b278b52d9e92ad44cbdc9a4258bb0fd04d603eb6.tar.bz2
[Checkstyle] Enable additional name checks for Java.
Start checking the following names: - Method names - Method parameter names - Local variables BUG=318404 TRB=qinmin@chromium.org R=boliu@chromium.org, qinmin@chromium.org, tedchoc@chromium.org Review URL: https://codereview.chromium.org/543553002 Cr-Commit-Position: refs/heads/master@{#293354}
Diffstat (limited to 'tools/android/checkstyle')
-rw-r--r--tools/android/checkstyle/chromium-style-5.0.xml21
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/android/checkstyle/chromium-style-5.0.xml b/tools/android/checkstyle/chromium-style-5.0.xml
index 6ddd230..383c9fc 100644
--- a/tools/android/checkstyle/chromium-style-5.0.xml
+++ b/tools/android/checkstyle/chromium-style-5.0.xml
@@ -42,7 +42,7 @@
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9_]{1,})*$"/>
</module>
<module name="TypeName">
- <property name="severity" value="warning"/>
+ <property name="severity" value="error"/>
</module>
<module name="ConstantName">
<property name="severity" value="error"/>
@@ -63,15 +63,23 @@
<property name="applyToPublic" value="false"/>
<message key="name.invalidPattern" value="Static field names start with s."/>
</module>
- <module name="MethodName" />
+ <module name="MethodName">
+ <property name="severity" value="error"/>
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <message key="name.invalidPattern" value="Method names should start with a lower case letter (e.g. getWidth())"/>
+ </module>
<module name="ParameterName">
- <property name="severity" value="warning"/>
+ <property name="severity" value="error"/>
</module>
<module name="LocalFinalVariableName">
- <property name="severity" value="warning"/>
+ <property name="severity" value="error"/>
+ <property name="format" value="^m|s|((([ms][a-z0-9])|([a-ln-rt-z]))[a-zA-Z0-9]*)$"/>
+ <message key="name.invalidPattern" value="Local variables should be camel-cased (e.g. int minWidth = 4)."/>
</module>
<module name="LocalVariableName">
- <property name="severity" value="warning"/>
+ <property name="severity" value="error"/>
+ <property name="format" value="^m|s|((([ms][a-z0-9])|([a-ln-rt-z]))[a-zA-Z0-9]*)$"/>
+ <message key="name.invalidPattern" value="Local variables should be camel-cased (e.g. int minWidth = 4)."/>
</module>
<module name="LineLength">
<property name="severity" value="error"/>
@@ -135,8 +143,11 @@
<property name="option" value="top"/>
<property name="separated" value="true"/>
</module>
+ <!-- TODO(aurimas): make indentation an error once https://github.com/checkstyle/checkstyle/issues/255 is fixed. -->
<module name="Indentation">
+ <property name="severity" value="warning"/>
<property name="basicOffset" value="4"/>
+ <property name="throwsIndent" value="8"/>
</module>
</module>
<module name="FileTabCharacter"/>