You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/05/14 04:25:33 UTC

[shardingsphere] branch master updated: Synchronize the configuration of Checkstyle and Spotless regarding the line breaks in annotation parameters. (#25649)

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

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new c2dae530c29 Synchronize the configuration of Checkstyle and Spotless regarding the line breaks in annotation parameters. (#25649)
c2dae530c29 is described below

commit c2dae530c291ef3e95302f424870b10f51f3bf07
Author: Cong Hu <ia...@qq.com>
AuthorDate: Sun May 14 12:25:26 2023 +0800

    Synchronize the configuration of Checkstyle and Spotless regarding the line breaks in annotation parameters. (#25649)
---
 src/resources/checkstyle.xml    | 2 --
 src/resources/spotless/java.xml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index 88122a64740..a23cfda3aa8 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -33,8 +33,6 @@
     <module name="LineLength">
         <property name="fileExtensions" value="java" />
         <property name="max" value="200" />
-        <!-- TODO remove ignorePattern when fix spotless format bug -->
-        <property name="ignorePattern" value="@ExternalCaseSettings"/>
     </module>
     <module name="NewlineAtEndOfFile">
         <property name="lineSeparator" value="lf" />
diff --git a/src/resources/spotless/java.xml b/src/resources/spotless/java.xml
index 6c8f2bbc221..b552ef9e084 100644
--- a/src/resources/spotless/java.xml
+++ b/src/resources/spotless/java.xml
@@ -45,5 +45,6 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="106" />
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="106" />
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80" />
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16" />
     </profile>
 </profiles>