Android: Remove checkstyle checks that overlap with clang-format
Bug: 768576
Change-Id: Iaec5ac6a8520c45d4d71e6f34f8d05f5d24b5106
Reviewed-on: https://chromium-review.googlesource.com/693516
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#505738}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 82795d9734f7a20188e55987ec3d5e7952be16b5diff --git a/checkstyle/chromium-style-5.0.xml b/checkstyle/chromium-style-5.0.xml
index 1af7385..dcba276 100644
--- a/checkstyle/chromium-style-5.0.xml
+++ b/checkstyle/chromium-style-5.0.xml
@@ -2,7 +2,7 @@
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<!--
- See installation instructions: https://sites.google.com/a/chromium.org/dev/checkstyle
+ See installation instructions: https://sites.google.com/a/chromium.org/dev/developers/checkstyle
-->
<module name="Checker">
<property name="severity" value="warning"/>
@@ -90,80 +90,13 @@
<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"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
- <property name="max" value="100"/>
- </module>
- <module name="LeftCurly">
- <property name="severity" value="error"/>
- </module>
- <module name="RightCurly">
- <property name="severity" value="error"/>
- </module>
- <module name="NeedBraces">
- <message key="needBraces" value="if, for, while, and do require curly braces unless they are single-line statements."/>
- <property name="severity" value="error"/>
- <property name="tokens" value="LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, LITERAL_IF"/>
- <property name="allowSingleLineStatement" value="true"/>
- </module>
- <module name="EmptyBlock">
- <property name="severity" value="error"/>
- <property name="option" value="text"/>
- <metadata name="altname" value="EmptyCatchBlock"/>
- </module>
- <module name="UpperEll">
- <property name="severity" value="error"/>
- </module>
<module name="FallThrough">
<property name="severity" value="error"/>
<property name="reliefPattern" value=".*"/>
</module>
- <module name="ModifierOrder">
- <property name="severity" value="error"/>
- </module>
- <module name="WhitespaceAround">
- <property name="severity" value="error"/>
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
- <property name="allowEmptyConstructors" value="true"/>
- <property name="allowEmptyMethods" value="true"/>
- </module>
- <module name="WhitespaceAfter">
- <property name="severity" value="error"/>
- <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
- </module>
- <module name="NoWhitespaceAfter">
- <property name="severity" value="error"/>
- <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
- </module>
- <module name="NoWhitespaceBefore">
- <property name="severity" value="error"/>
- <property name="allowLineBreaks" value="true"/>
- <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
- </module>
- <module name="GenericWhitespace">
- <property name="severity" value="error"/>
- <message key="ws.followed"
- value="GenericWhitespace ''{0}'' is followed by whitespace."/>
- <message key="ws.preceded"
- value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
- <message key="ws.illegalFollow"
- value="GenericWhitespace ''{0}'' should followed by whitespace."/>
- <message key="ws.notPreceded"
- value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
- </module>
- <module name="EmptyStatement">
- <property name="severity" value="error"/>
- </module>
<module name="NoFinalizer">
<property name="severity" value="info"/>
</module>
- <module name="ParenPad">
- <property name="severity" value="error"/>
- </module>
- <module name="MethodParamPad">
- <property name="severity" value="error"/>
- </module>
<module name="ImportOrder">
<property name="severity" value="error"/>
<message key="import.ordering" value="Wrong order for {0} import. Use :JavaImportOrganize (ECLIM), Ctrl+Shift+O (Eclipse), or Ctrl+Alt+O (Android Studio) to sort imports. An importorder file for configuring Eclipse can be found at //tools/android/eclipse/android.importorder. A style configuration file for Android Studio can be found at //tools/android/android_studio/ChromiumStyle.xml."/>
@@ -172,33 +105,6 @@
<property name="option" value="top"/>
<property name="separated" value="true"/>
</module>
- <module name="Indentation">
- <property name="severity" value="error"/>
- <property name="basicOffset" value="4"/>
- <property name="throwsIndent" value="8"/>
- <property name="lineWrappingIndentation" value="8"/>
- </module>
- <!-- TODO(aurimas): make OperatorWrap into an error once all the warnings are fixed. -->
- <module name="OperatorWrap">
- <property name="severity" value="error"/>
- <property name="option" value="NL" />
- <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR " />
- </module>
- <module name="OperatorWrap">
- <property name="severity" value="error"/>
- <property name="option" value="eol"/>
- <property name="tokens" value="ASSIGN"/>
- </module>
- <module name="SeparatorWrap">
- <property name="severity" value="error"/>
- <property name="tokens" value="DOT"/>
- <property name="option" value="nl"/>
- </module>
- <module name="SeparatorWrap">
- <property name="severity" value="error"/>
- <property name="tokens" value="COMMA"/>
- <property name="option" value="EOL"/>
- </module>
<module name="RegexpSinglelineJava">
<property name="severity" value="error"/>
<property name="format" value="StringBuffer"/>
@@ -220,18 +126,4 @@
<property name="message" value="Use ContextUtils.getAppSharedPreferences() instead to access app-wide SharedPreferences."/>
</module>
</module>
-
- <!-- Non-TreeWalker modules -->
- <module name="FileTabCharacter">
- <property name="severity" value="error"/>
- </module>
- <module name="RegexpSingleline">
- <property name="severity" value="error"/>
- <property name="format" value="[ \t]+$"/>
- <property name="message" value="Trailing whitespace"/>
- </module>
- <module name="RegexpHeader">
- <property name="severity" value="error"/>
- <property name="header" value="^// Copyright 20\d\d The Chromium Authors. All rights reserved.$\n^// Use of this source code is governed by a BSD-style license that can be$\n^// found in the LICENSE file.$"/>
- </module>
</module>
