TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #2421: Cyclomatic Complexity and ReturnCount violations are resovled

This commit is contained in:
Roman Ivanov 2015-10-25 07:33:15 -07:00
parent a2ae6fa3a8
commit d1a6a43710
2 changed files with 77 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/suppressions.xml
View File

@ -60,9 +60,6 @@
<suppress checks="ReturnCount" files=".*[\\/]src[\\/]it[\\/]"/>
<suppress checks="SeparatorWrap" files=".*[\\/]src[\\/]it[\\/]"/>
<!-- quesionable suppressions, should be permanent ? -->
<suppress checks="CyclomaticComplexity" files=".*[\\/]src[\\/]it[\\/]"/>
<!--
Turn off all checks for Generated and Test code. Fixes issues with using
Eclipse plug-in.

101
src/it/java/com/google/checkstyle/test/base/IndentationConfigurationBuilder.java
View File

@ -64,6 +64,10 @@ public class IndentationConfigurationBuilder extends ConfigurationBuilder {
return getLinesWithWarnAndCheckComments(aFileName, TAB_WIDTH);
}
private enum CommentType {
MULTILEVEL, SINGLE_LEVEL, NON_STRICT_LEVEL, UNKNOWN
}
private static Integer[] getLinesWithWarnAndCheckComments(String aFileName,
final int tabWidth)
throws IOException {
@ -127,34 +131,83 @@ public class IndentationConfigurationBuilder extends ConfigurationBuilder {
final int indentInComment = getIndentFromComment(comment);
final boolean isWarnComment = isWarnComment(comment);
boolean result;
CommentType type = getCommentType(comment);
switch (type) {
case MULTILEVEL:
result = isMultiLevelCommentConsistent(comment, indentInComment, isWarnComment);
break;
case SINGLE_LEVEL:
result = isSingleLevelCommentConsistent(comment, indentInComment, isWarnComment);
break;
case NON_STRICT_LEVEL:
result = isNonStrictCommentConsistent(comment, indentInComment, isWarnComment);
break;
case UNKNOWN:
throw new IllegalArgumentException("Cannot determine comment consistent");
default:
throw new IllegalStateException("Cannot determine comment is consistent");
}
return result;
}
private static boolean isNonStrictCommentConsistent(String comment
, int indentInComment, boolean isWarnComment) {
Matcher nonStrictLevelMatch = NON_STRICT_LEVEL_COMMENT_REGEX.matcher(comment);
nonStrictLevelMatch.matches();
final int expectedMinimalIndent = Integer.parseInt(nonStrictLevelMatch.group(1));
return indentInComment >= expectedMinimalIndent && !isWarnComment
|| indentInComment < expectedMinimalIndent && isWarnComment;
}
private static boolean isSingleLevelCommentConsistent(String comment
, int indentInComment, boolean isWarnComment) {
Matcher singleLevelMatch = SINGLE_LEVEL_COMMENT_REGEX.matcher(comment);
singleLevelMatch.matches();
final int expectedLevel = Integer.parseInt(singleLevelMatch.group(1));
return expectedLevel == indentInComment && !isWarnComment
|| expectedLevel != indentInComment && isWarnComment;
}
private static boolean isMultiLevelCommentConsistent(String comment
, int indentInComment, boolean isWarnComment) {
Matcher multilevelMatch = MULTILEVEL_COMMENT_REGEX.matcher(comment);
multilevelMatch.matches();
final String[] levels = multilevelMatch.group(1).split(",");
final String indentInCommentStr = String.valueOf(indentInComment);
final boolean containsActualLevel =
Arrays.asList(levels).contains(indentInCommentStr);
return containsActualLevel && !isWarnComment
|| !containsActualLevel && isWarnComment;
}
private static CommentType getCommentType(String comment) {
CommentType result = CommentType.UNKNOWN;
Matcher multilevelMatch = MULTILEVEL_COMMENT_REGEX.matcher(comment);
if (multilevelMatch.matches()) {
final String[] levels = multilevelMatch.group(1).split(",");
final String indentInCommentStr = String.valueOf(indentInComment);
final boolean containsActualLevel =
Arrays.asList(levels).contains(indentInCommentStr);
return containsActualLevel && !isWarnComment
|| !containsActualLevel && isWarnComment;
result = CommentType.MULTILEVEL;
}
Matcher singleLevelMatch = SINGLE_LEVEL_COMMENT_REGEX.matcher(comment);
if (singleLevelMatch.matches()) {
final int expectedLevel = Integer.parseInt(singleLevelMatch.group(1));
return expectedLevel == indentInComment && !isWarnComment
|| expectedLevel != indentInComment && isWarnComment;
else {
Matcher singleLevelMatch = SINGLE_LEVEL_COMMENT_REGEX.matcher(comment);
if (singleLevelMatch.matches()) {
result = CommentType.SINGLE_LEVEL;
}
else {
Matcher nonStrictLevelMatch = NON_STRICT_LEVEL_COMMENT_REGEX.matcher(comment);
if (nonStrictLevelMatch.matches()) {
result = CommentType.NON_STRICT_LEVEL;
}
}
}
Matcher nonStrictLevelMatch = NON_STRICT_LEVEL_COMMENT_REGEX.matcher(comment);
if (nonStrictLevelMatch.matches()) {
final int expectedMinimalIndent = Integer.parseInt(nonStrictLevelMatch.group(1));
return indentInComment >= expectedMinimalIndent && !isWarnComment
|| indentInComment < expectedMinimalIndent && isWarnComment;
}
throw new IllegalArgumentException("Cannot determine if commit is consistent");
return result;
}
private static int getLineStart(String line, final int tabWidth) {