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

Issue #1566: ReturnCount violation fixed for LeftCurlyCheck

This commit is contained in:
Ruslan Diachenko 2015-08-27 23:12:48 +01:00 committed by Roman Ivanov
parent 46378dadb5
commit 9ddad74e48
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java
View File

@ -233,33 +233,38 @@ public class LeftCurlyCheck
* @return {@code DetailAST}.
*/
private static DetailAST skipAnnotationOnlyLines(DetailAST ast) {
DetailAST resultNode = ast;
final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
if (modifiers == null) {
return ast;
}
DetailAST lastAnnotation = findLastAnnotation(modifiers);
if (lastAnnotation == null) {
// There are no annotations.
return ast;
}
final DetailAST tokenAfterLast;
if (lastAnnotation.getNextSibling() == null) {
tokenAfterLast = modifiers.getNextSibling();
}
else {
tokenAfterLast = lastAnnotation.getNextSibling();
}
if (modifiers != null) {
DetailAST lastAnnotation = findLastAnnotation(modifiers);
if (tokenAfterLast.getLineNo() > lastAnnotation.getLineNo()) {
return tokenAfterLast;
if (lastAnnotation != null) {
final DetailAST tokenAfterLast;
if (lastAnnotation.getNextSibling() == null) {
tokenAfterLast = modifiers.getNextSibling();
}
else {
tokenAfterLast = lastAnnotation.getNextSibling();
}
if (tokenAfterLast.getLineNo() > lastAnnotation.getLineNo()) {
resultNode = tokenAfterLast;
}
else {
final int lastAnnotationLineNumber = lastAnnotation.getLineNo();
while (lastAnnotation.getPreviousSibling() != null
&& lastAnnotation.getPreviousSibling().getLineNo()
== lastAnnotationLineNumber) {
lastAnnotation = lastAnnotation.getPreviousSibling();
}
resultNode = lastAnnotation;
}
}
}
final int lastAnnotationLineNumber = lastAnnotation.getLineNo();
while (lastAnnotation.getPreviousSibling() != null
&& lastAnnotation.getPreviousSibling().getLineNo() == lastAnnotationLineNumber) {
lastAnnotation = lastAnnotation.getPreviousSibling();
}
return lastAnnotation;
return resultNode;
}
/**