You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2022/11/18 15:05:12 UTC

[myfaces-tobago] 01/03: style(editorconfig): optimize autolayout

This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit a014ee5d6becf641a58066dd0fc78fbabff683a0
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Nov 17 13:55:22 2022 +0100

    style(editorconfig): optimize autolayout
    
    * adjust editorconfig
      * fix "indent size" and "and continuation size" in Java
      * remove >2 empty lines
      * remove empty parameter/return/throws in java doc
    * update checkstyle-rules
---
 .editorconfig | 14 +++++++++++---
 pom.xml       |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 6d778e907c..6360eeff01 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,11 +21,19 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
+tab_width = 2
+indent_size = tab
+ij_continuation_indent_size = 4
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
+ij_any_keep_blank_lines_in_declarations = 1
+ij_any_keep_blank_lines_in_code = 1
+ij_any_for_brace_force = always
+ij_any_if_brace_force = always
 
-# Ignore indent_size for java files
 [*.java]
-indent_size = unset
+ij_java_method_parameters_new_line_after_left_paren = true
+ij_java_doc_keep_empty_parameter_tag = false
+ij_java_doc_keep_empty_return_tag = false
+ij_java_doc_keep_empty_throws_tag = false
diff --git a/pom.xml b/pom.xml
index 30533068ed..937d76a7a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
     <junit-jupiter.version>5.9.1</junit-jupiter.version>
     <testcontainers.version>1.17.5</testcontainers.version>
-    <checkstyle-rules.version>19</checkstyle-rules.version>
+    <checkstyle-rules.version>20-SNAPSHOT</checkstyle-rules.version>
 
     <!-- Note: defined here in master pom, because of problems with enforcer plugin -->
     <jetty.version>9.4.49.v20220914</jetty.version>