From 2b32b003ab81c9bfcb8205b512eb4ea313e529af Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Sat, 13 Jun 2015 18:49:45 -0700 Subject: [PATCH] LeftCurlyCheck updated to follow Cyclomatic Complexity rule. #954 --- .../checks/blocks/LeftCurlyCheck.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 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 9c7394ec8..d04dd5ae5 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 @@ -304,14 +304,8 @@ public class LeftCurlyCheck } } else if (getAbstractOption() == LeftCurlyOption.EOL) { - if (Utils.whitespaceBefore(brace.getColumnNo(), braceLine) - && prevLineLen + 2 <= maxLineLength) { - log(brace.getLineNo(), brace.getColumnNo(), - MSG_KEY_LINE_PREVIOUS, "{"); - } - if (!hasLineBreakAfter(brace)) { - log(brace.getLineNo(), brace.getColumnNo(), MSG_KEY_LINE_BREAK_AFTER); - } + + validateEol(brace, braceLine, prevLineLen); } else if (getAbstractOption() == LeftCurlyOption.NLOW && startToken.getLineNo() != brace.getLineNo()) { @@ -322,6 +316,23 @@ public class LeftCurlyCheck } } + /** + * validate EOL case + * @param brace brase AST + * @param braceLine line content + * @param prevLineLen previous line length + */ + private void validateEol(DetailAST brace, String braceLine, int prevLineLen) { + if (Utils.whitespaceBefore(brace.getColumnNo(), braceLine) + && prevLineLen + 2 <= maxLineLength) { + log(brace.getLineNo(), brace.getColumnNo(), + MSG_KEY_LINE_PREVIOUS, "{"); + } + if (!hasLineBreakAfter(brace)) { + log(brace.getLineNo(), brace.getColumnNo(), MSG_KEY_LINE_BREAK_AFTER); + } + } + /** * validate token on new Line position * @param brace brace AST