Issue #11666: Added LITERAL_CASE support for WhitespaceAfter check

checkstyle · May 29, 2022 · cddf6a5 · cddf6a5
1 parent 3ca6f75
commit cddf6a5
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 2 deletions.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java
@@ -72,6 +72,8 @@
  * LITERAL_SYNCHRONIZED</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
  * LITERAL_TRY</a>,
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
+ * LITERAL_CASE</a>,
  * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
  * LAMBDA</a>.
  * </li>
@@ -210,6 +212,7 @@ public int[] getAcceptableTokens() {
             TokenTypes.LITERAL_SWITCH,
             TokenTypes.LITERAL_SYNCHRONIZED,
             TokenTypes.LITERAL_TRY,
+            TokenTypes.LITERAL_CASE,
             TokenTypes.LAMBDA,
         };
     }

diff --git a/...resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/WhitespaceAfterCheck.xml b/...resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/WhitespaceAfterCheck.xml
@@ -11,7 +11,7 @@
  EmptyForIteratorPad&lt;/a&gt; to validate empty for iterators.
  &lt;/p&gt;</description>
          <properties>
-            <property default-value="COMMA,SEMI,TYPECAST,LITERAL_IF,LITERAL_ELSE,LITERAL_WHILE,LITERAL_DO,LITERAL_FOR,LITERAL_FINALLY,LITERAL_RETURN,LITERAL_YIELD,LITERAL_CATCH,DO_WHILE,ELLIPSIS,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LAMBDA"
+            <property default-value="COMMA,SEMI,TYPECAST,LITERAL_IF,LITERAL_ELSE,LITERAL_WHILE,LITERAL_DO,LITERAL_FOR,LITERAL_FINALLY,LITERAL_RETURN,LITERAL_YIELD,LITERAL_CATCH,DO_WHILE,ELLIPSIS,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_CASE,LAMBDA"
                        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
@@ -107,7 +107,7 @@
                value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
                     LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
                     LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
-                    LITERAL_YIELD"/>
+                    LITERAL_YIELD, LITERAL_CASE"/>
     </module>
     <module name="WhitespaceAround">
       <property name="allowEmptyConstructors" value="true"/>

diff --git a/...test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java b/...test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
@@ -215,6 +215,26 @@ public void testLiteralCatch() throws Exception {
             expected);
     }
 
+    @Test
+    public void testLiteralCase() throws Exception {
+        final String[] expected = {
+            "15:13: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "case"),
+        };
+        verifyWithInlineConfigParser(
+            getPath("InputWhitespaceAfterLiteralCase.java"),
+            expected);
+    }
+
+    @Test
+    public void testLiteralCase2() throws Exception {
+        final String[] expected = {
+            "13:13: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "case"),
+        };
+        verifyWithInlineConfigParser(
+            getPath("InputWhitespaceAfterLiteralCase2.java"),
+            expected);
+    }
+
     @Test
     public void testEmptyForIterator() throws Exception {
         final String[] expected = {

diff --git a/...l/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCase.java b/...l/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCase.java
@@ -0,0 +1,21 @@
+/*
+WhitespaceAfter
+tokens = LITERAL_CASE
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter;
+
+public class InputWhitespaceAfterLiteralCase {
+    public static void main(String... args) {
+        switch(args[0]) {
+            case "123": // OK
+                return;
+            case"1": // violation ''case' is not followed by whitespace'
+                return;
+            default:
+                return;
+        }
+    }
+}
diff --git a/.../tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCase2.java b/.../tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLiteralCase2.java
@@ -0,0 +1,21 @@
+/*
+WhitespaceAfter
+tokens = LITERAL_CASE
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter;
+
+public class InputWhitespaceAfterLiteralCase2 {
+    public static void main(String... args) {
+        switch(args[0]) {
+            case"123": // violation ''case' is not followed by whitespace'
+                return;
+            case "1": // OK
+                return;
+            default:
+                return;
+        }
+    }
+}
diff --git a/src/xdocs/config_whitespace.xml b/src/xdocs/config_whitespace.xml
@@ -2991,6 +2991,8 @@ class Bar {
                   LITERAL_SYNCHRONIZED</a>
                 , <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
                   LITERAL_TRY</a>
+                , <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
+                  LITERAL_CASE</a>
                 , <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
                   LAMBDA</a>
                   .
@@ -3031,6 +3033,8 @@ class Bar {
                   LITERAL_SYNCHRONIZED</a>
                 , <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_TRY">
                   LITERAL_TRY</a>
+                  , <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_CASE">
+                  LITERAL_CASE</a>
                 , <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LAMBDA">
                   LAMBDA</a>
                   .