Issue #13675: add constructor call token to MethodParamPadCheck

checkstyle · May 23, 2024 · 7e41632 · 7e41632
1 parent c5a873b
commit 7e41632
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java
@@ -59,6 +59,8 @@
  * Default value is:
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
  * CTOR_DEF</a>,
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
+ * CTOR_CALL</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
  * LITERAL_NEW</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
@@ -133,6 +135,7 @@ public int[] getDefaultTokens() {
     public int[] getAcceptableTokens() {
         return new int[] {
             TokenTypes.CTOR_DEF,
+            TokenTypes.CTOR_CALL,
             TokenTypes.LITERAL_NEW,
             TokenTypes.METHOD_CALL,
             TokenTypes.METHOD_DEF,

diff --git a/.../resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/MethodParamPadCheck.xml b/.../resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/MethodParamPadCheck.xml
@@ -25,7 +25,7 @@
                       type="com.puppycrawl.tools.checkstyle.checks.whitespace.PadOption">
                <description>Specify policy on how to pad method parameter.</description>
             </property>
-            <property default-value="CTOR_DEF,LITERAL_NEW,METHOD_CALL,METHOD_DEF,SUPER_CTOR_CALL,ENUM_CONSTANT_DEF,RECORD_DEF"
+            <property default-value="CTOR_DEF,CTOR_CALL,LITERAL_NEW,METHOD_CALL,METHOD_DEF,SUPER_CTOR_CALL,ENUM_CONSTANT_DEF,RECORD_DEF"
                       name="tokens"
                       type="java.lang.String[]"
                       validation-type="tokenSet">

diff --git a/src/main/resources/google_checks.xml b/src/main/resources/google_checks.xml
@@ -277,7 +277,7 @@
     </module>
     <module name="MethodParamPad">
       <property name="tokens"
-               value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+               value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF, CTOR_CALL,
                     SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
     </module>
     <module name="NoWhitespaceBefore">

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheckTest.java
@@ -128,6 +128,7 @@ public void testMethodParamPadRecords() throws Exception {
             "20:34: " + getCheckMessage(MSG_WS_PRECEDED, "("),
             "31:17: " + getCheckMessage(MSG_WS_PRECEDED, "("),
             "32:14: " + getCheckMessage(MSG_WS_PRECEDED, "("),
+            "33:18: " + getCheckMessage(MSG_WS_PRECEDED, "("),
             "37:17: " + getCheckMessage(MSG_WS_PRECEDED, "("),
             "38:33: " + getCheckMessage(MSG_WS_PRECEDED, "("),
             "44:17: " + getCheckMessage(MSG_WS_PRECEDED, "("),
@@ -141,7 +142,9 @@ public void testMethodParamPadRecords() throws Exception {
 
     @Test
     public void test1322879() throws Exception {
-        final String[] expected = CommonUtil.EMPTY_STRING_ARRAY;
+        final String[] expected = {
+            "28:13: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "("),
+        };
         verifyWithInlineConfigParser(
                 getPath("InputMethodParamPadWhitespaceAround.java"),
                expected);
@@ -170,6 +173,7 @@ public void testGetAcceptableTokens() {
         final int[] actual = methodParamPadCheckObj.getAcceptableTokens();
         final int[] expected = {
             TokenTypes.CTOR_DEF,
+            TokenTypes.CTOR_CALL,
             TokenTypes.LITERAL_NEW,
             TokenTypes.METHOD_CALL,
             TokenTypes.METHOD_DEF,

diff --git a/...pycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadRecords.java b/...pycrawl/tools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadRecords.java
@@ -30,7 +30,7 @@ private boolean inRecord (Object obj) { // violation ''(' is preceded with white
     //in ctor
     record Mtr2 () { // violation ''(' is preceded with whitespace'
         Mtr2 (String s1, String s2, String s3){ // violation ''(' is preceded with whitespace'
-            this ();
+            this (); // violation ''(' is preceded with whitespace'
         }
     }
 

diff --git a/...ools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadWhitespaceAround.java b/...ools/checkstyle/checks/whitespace/methodparampad/InputMethodParamPadWhitespaceAround.java
@@ -25,8 +25,7 @@ protected InputMethodParamPadWhitespaceAround ()
 
     protected InputMethodParamPadWhitespaceAround ( String s)
     {
-        // ok, until https://github.com/checkstyle/checkstyle/issues/13675
-        this();
+        this(); // violation ''(' is not preceded with whitespace'
     }
 
     public void enhancedFor ()

diff --git a/src/xdocs/checks/whitespace/methodparampad.xml b/src/xdocs/checks/whitespace/methodparampad.xml
@@ -52,6 +52,8 @@
               <td>subset of tokens
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
                     CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
+                    CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
                     LITERAL_NEW</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">
@@ -69,6 +71,8 @@
               <td>
                 <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_DEF">
                     CTOR_DEF</a>
+                , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#CTOR_CALL">
+                    CTOR_CALL</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_NEW">
                     LITERAL_NEW</a>
                 , <a href="../../apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#METHOD_CALL">