#1521: Override some Google rules for our codebase

NCI-Agency · Jul 9, 2019 · d8c26f4 · d8c26f4
1 parent 4e10230
commit d8c26f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/config/eclipse-java-google-style.xml b/config/eclipse-java-google-style.xml
@@ -291,7 +291,8 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<!-- Non-Google: changed from "0" to "16" to allow wrapping of long lists of enums -->
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>

diff --git a/config/google_checks.xml b/config/google_checks.xml
@@ -31,6 +31,8 @@
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
     </module>
+    <!-- Non-Google: allow @SuppressWarnings("checkstyle:somecheck") in code -->
+    <module name="SuppressWarningsFilter"/>
 
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
@@ -244,6 +246,8 @@
             <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="allowThrowsTagsForSubclasses" value="true"/>
+            <!-- Non-Google: allow missing Javadoc -->
+            <property name="allowMissingJavadoc" value="true"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -257,5 +261,7 @@
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation"/>
+        <!-- Non-Google: allow @SuppressWarnings("checkstyle:somecheck") in code -->
+	<module name="SuppressWarningsHolder"/>
     </module>
 </module>