From ae0e7def779cddabf1e93ee744b9b341ef27647f Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Sat, 13 Jun 2015 18:32:24 -0700 Subject: [PATCH] LeftCurlyCheck updated to follow Cyclomatic Complexity rule. #954 --- .../checks/blocks/LeftCurlyCheck.java | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) 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 ce9f7f7f8..9c7394ec8 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 @@ -315,25 +315,39 @@ public class LeftCurlyCheck } else if (getAbstractOption() == LeftCurlyOption.NLOW && startToken.getLineNo() != brace.getLineNo()) { - // not on the same line - if (startToken.getLineNo() + 1 == brace.getLineNo()) { - if (!Utils.whitespaceBefore(brace.getColumnNo(), braceLine)) { - log(brace.getLineNo(), brace.getColumnNo(), - MSG_KEY_LINE_NEW, "{"); - } - else if (prevLineLen + 2 <= maxLineLength) { - log(brace.getLineNo(), brace.getColumnNo(), - MSG_KEY_LINE_PREVIOUS, "{"); - } - } - else if (!Utils.whitespaceBefore(brace.getColumnNo(), braceLine)) { - log(brace.getLineNo(), brace.getColumnNo(), - MSG_KEY_LINE_NEW, "{"); - } + + validateNewLinePosion(brace, startToken, braceLine, prevLineLen); + } } } + /** + * validate token on new Line position + * @param brace brace AST + * @param startToken start Token + * @param braceLine content of line with Brace + * @param prevLineLen previous Line length + */ + private void validateNewLinePosion(DetailAST brace, DetailAST startToken, + String braceLine, int prevLineLen) { + // not on the same line + if (startToken.getLineNo() + 1 == brace.getLineNo()) { + if (!Utils.whitespaceBefore(brace.getColumnNo(), braceLine)) { + log(brace.getLineNo(), brace.getColumnNo(), + MSG_KEY_LINE_NEW, "{"); + } + else if (prevLineLen + 2 <= maxLineLength) { + log(brace.getLineNo(), brace.getColumnNo(), + MSG_KEY_LINE_PREVIOUS, "{"); + } + } + else if (!Utils.whitespaceBefore(brace.getColumnNo(), braceLine)) { + log(brace.getLineNo(), brace.getColumnNo(), + MSG_KEY_LINE_NEW, "{"); + } + } + /** * Checks if left curly has line break after. * @param leftCurly