Don't wrap single-annotations on fields (#192)

palantir · Jun 27, 2017 · 590511f · 590511f
1 parent bec3ed4
commit 590511f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/gradle-baseline-java-config/resources/eclipse/org.eclipse.jdt.core.prefs b/gradle-baseline-java-config/resources/eclipse/org.eclipse.jdt.core.prefs
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

diff --git a/gradle-baseline-java-config/resources/idea/intellij-java-palantir-style.xml b/gradle-baseline-java-config/resources/idea/intellij-java-palantir-style.xml
@@ -91,6 +91,7 @@
           <option name="DOWHILE_BRACE_FORCE" value="3" />
           <option name="EXTENDS_KEYWORD_WRAP" value="1" />
           <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="FIELD_ANNOTATION_WRAP" value="1" />
           <option name="FOR_BRACE_FORCE" value="3" />
           <option name="FOR_STATEMENT_WRAP" value="1" />
           <option name="IF_BRACE_FORCE" value="3" />