diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java index f7feb429d..223d6356d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java @@ -361,17 +361,15 @@ public class LeftCurlyCheck nextToken = leftCurly.getFirstChild(); } else { - if (leftCurly.getParent().getParent().getType() == TokenTypes.ENUM_DEF) + if (leftCurly.getParent().getParent().getType() == TokenTypes.ENUM_DEF && !ignoreEnums) { - if (!ignoreEnums) { - nextToken = leftCurly.getNextSibling(); - } + nextToken = leftCurly.getNextSibling(); } } - if (nextToken != null && nextToken.getType() != TokenTypes.RCURLY) { - if (leftCurly.getLineNo() == nextToken.getLineNo()) { - return false; - } + if (nextToken != null && nextToken.getType() != TokenTypes.RCURLY + && leftCurly.getLineNo() == nextToken.getLineNo()) + { + return false; } return true; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java index 290dc59be..5fc4fb8ce 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java @@ -171,28 +171,27 @@ public class FinalLocalVariableCheck extends Check case TokenTypes.IDENT: final int parentType = ast.getParent().getType(); - if (TokenTypes.POST_DEC == parentType - || TokenTypes.DEC == parentType - || TokenTypes.POST_INC == parentType - || TokenTypes.INC == parentType - || TokenTypes.ASSIGN == parentType - || TokenTypes.PLUS_ASSIGN == parentType - || TokenTypes.MINUS_ASSIGN == parentType - || TokenTypes.DIV_ASSIGN == parentType - || TokenTypes.STAR_ASSIGN == parentType - || TokenTypes.MOD_ASSIGN == parentType - || TokenTypes.SR_ASSIGN == parentType - || TokenTypes.BSR_ASSIGN == parentType - || TokenTypes.SL_ASSIGN == parentType - || TokenTypes.BXOR_ASSIGN == parentType - || TokenTypes.BOR_ASSIGN == parentType - || TokenTypes.BAND_ASSIGN == parentType) + // TODO: is there better way to check is ast + // in left part of assignment? + if ((TokenTypes.POST_DEC == parentType + || TokenTypes.DEC == parentType + || TokenTypes.POST_INC == parentType + || TokenTypes.INC == parentType + || TokenTypes.ASSIGN == parentType + || TokenTypes.PLUS_ASSIGN == parentType + || TokenTypes.MINUS_ASSIGN == parentType + || TokenTypes.DIV_ASSIGN == parentType + || TokenTypes.STAR_ASSIGN == parentType + || TokenTypes.MOD_ASSIGN == parentType + || TokenTypes.SR_ASSIGN == parentType + || TokenTypes.BSR_ASSIGN == parentType + || TokenTypes.SL_ASSIGN == parentType + || TokenTypes.BXOR_ASSIGN == parentType + || TokenTypes.BOR_ASSIGN == parentType + || TokenTypes.BAND_ASSIGN == parentType) + && ast.getParent().getFirstChild() == ast) { - // TODO: is there better way to check is ast - // in left part of assignment? - if (ast.getParent().getFirstChild() == ast) { - removeVariable(ast); - } + removeVariable(ast); } break;