Indentation check fails for switch statements #341

src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java

@@ -125,9 +125,20 @@ public class SlistHandler extends BlockParentHandler
     {
         // only need to check this if parent is not
         // an if, else, while, do, ctor, method
-        if (hasBlockParent()) {
+        if (hasBlockParent() || isSameLineCaseGroup()) {
             return;
         }
         super.checkIndentation();
     }
+
+    /**
+     * Checks if SLIST node is placed at the same line as CASE_GROUP node.
+     * @return true, if SLIST node is places at the same line as CASE_GROUP node.
+     */
+    private boolean isSameLineCaseGroup()
+    {
+        final DetailAST parentNode = getMainAst().getParent();
+        return parentNode.getType() == TokenTypes.CASE_GROUP
+            && getMainAst().getLineNo() == parentNode.getLineNo();
+    }
 }

src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java

@@ -866,4 +866,17 @@ public class IndentationCheckTest extends BaseCheckTestSupport
         verify(checkConfig, getPath("indentation/InputValidTryResourcesIndent.java"),
                expected);
     }
+
+    @Test
+    public void testSwitchCustom() throws Exception
+    {
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(IndentationCheck.class);
+        checkConfig.addAttribute("basicOffset", "4");
+        checkConfig.addAttribute("throwsIndent", "8");
+        checkConfig.addAttribute("lineWrappingIndentation", "8");
+        final String[] expected = {};
+        verify(checkConfig, getPath("indentation/InputSwitchCustom.java"),
+               expected);
+    }
 }

src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSwitchCustom.java

@@ -0,0 +1,22 @@
+public class MyClass {
+    public int getValue(int value) {
+        switch (value) {
+            case 0: return ABC1;
+            case 1: return ABC2;
+            case 2: return ABC3;
+        }
+        return 0;
+    }
+
+    public int getValue1(int value) {
+        switch (value) {
+            case 0:
+                return ABC1;
+            case 1:
+                return ABC2;
+            case 2:
+                return ABC3;
+        }
+        return 0;
+    }
+}