Index: tools/android/checkstyle/chromium-style-5.0.xml |
diff --git a/tools/android/checkstyle/chromium-style-5.0.xml b/tools/android/checkstyle/chromium-style-5.0.xml |
index 6ddd2301e1e922da07622f9e69bcf55edee52161..383c9fccbee5753385ee808b14bda67cf9c07fff 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"/> |