Issue checkstyle#3839: Added special checks for LITERAL_CASE to detec…

…t related empty blocks
voidfist · Mar 4, 2017 · 472efcd · 472efcd
1 parent cac09c4
commit 472efcd
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java
@@ -138,8 +138,8 @@ public int[] getRequiredTokens() {
 
     @Override
     public void visitToken(DetailAST ast) {
-        final DetailAST slistToken = ast.findFirstToken(TokenTypes.SLIST);
-        final DetailAST leftCurly;
+        DetailAST slistToken = ast.findFirstToken(TokenTypes.SLIST);
+        DetailAST leftCurly;
 
         if (slistToken == null) {
             leftCurly = ast.findFirstToken(TokenTypes.LCURLY);
@@ -148,6 +148,19 @@ public void visitToken(DetailAST ast) {
             leftCurly = slistToken;
         }
 
+        // special check for TokenTypes.LITERAL_CASE
+        if(leftCurly == null && ast.getType() == TokenTypes.LITERAL_CASE)
+        {
+            slistToken = ast.getParent().findFirstToken(TokenTypes.SLIST);
+
+            if(slistToken == null){
+                leftCurly = ast.getParent().findFirstToken(TokenTypes.LCURLY);
+            }
+            else{
+                leftCurly = slistToken;
+            }
+        }
+
         if (leftCurly != null) {
             if (option == BlockOption.STMT) {
                 final boolean emptyBlock;