Issue sevntu-checkstyle#464: Simplify check for illegal token

kariem · Oct 21, 2018 · be8be03 · be8be03
1 parent 4a30256
commit be8be03
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/...ecks/src/main/java/com/github/sevntu/checkstyle/checks/coding/EnumTrailingCommaCheck.java b/...ecks/src/main/java/com/github/sevntu/checkstyle/checks/coding/EnumTrailingCommaCheck.java
@@ -140,21 +140,11 @@ public void visitToken(DetailAST enumDef) {
      * {@code false otherwise}
      */
     private boolean isIllegalTokenAfterComma(DetailAST lastComma, DetailAST nextAst) {
-        boolean illegalToken = false;
-
         final int nextAstType = nextAst.getType();
 
-        if (nextAstType == TokenTypes.SEMI) {
-            if (nextAst.getLineNo() == lastComma.getLineNo()) {
-                // semi on the same line as last comma
-                illegalToken = true;
-            }
-        }
-        else if (nextAstType == TokenTypes.ENUM_CONSTANT_DEF) {
-            // next enum constant on the same line after comma
-            illegalToken = true;
-        }
-        return illegalToken;
+        // semi on the same line as last comma, or followed by enum constant
+        return (nextAstType == TokenTypes.SEMI && nextAst.getLineNo() == lastComma.getLineNo())
+                || nextAstType == TokenTypes.ENUM_CONSTANT_DEF;
     }
 
     /**