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

Issue #2530: Refactoring of CommentsIndentationCheck

This commit is contained in:
Andrei Selkin 2015-11-18 21:07:38 +03:00 committed by Roman Ivanov
parent d58096b2b6
commit 2959d83ed2
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
View File

@ -262,16 +262,19 @@ public class CommentsIndentationCheck extends Check {
* @param comment single line comment.
* @return the first token of the destributed previous statement of single line comment.
*/
private static DetailAST getDistributedPreviousStatementOfSingleLineComment(
DetailAST comment) {
DetailAST previousStatement = comment.getPreviousSibling();
if (previousStatement.getType() == TokenTypes.LITERAL_RETURN
|| previousStatement.getType() == TokenTypes.LITERAL_THROW) {
return previousStatement;
private static DetailAST getDistributedPreviousStatementOfSingleLineComment(DetailAST comment) {
final DetailAST previousStatement;
DetailAST currentToken = comment.getPreviousSibling();
if (currentToken.getType() == TokenTypes.LITERAL_RETURN
|| currentToken.getType() == TokenTypes.LITERAL_THROW) {
previousStatement = currentToken;
}
previousStatement = previousStatement.getPreviousSibling();
while (previousStatement.getFirstChild() != null) {
previousStatement = previousStatement.getFirstChild();
else {
currentToken = currentToken.getPreviousSibling();
while (currentToken.getFirstChild() != null) {
currentToken = currentToken.getFirstChild();
}
previousStatement = currentToken;
}
return previousStatement;
}
@ -493,6 +496,7 @@ public class CommentsIndentationCheck extends Check {
* statement.
*/
private static DetailAST getOneLinePreviousStatementOfSingleLineComment(DetailAST comment) {
DetailAST previousStatement = null;
final Stack<DetailAST> stack = new Stack<>();
DetailAST root = comment.getParent();
@ -501,10 +505,11 @@ public class CommentsIndentationCheck extends Check {
root = stack.pop();
}
while (root != null) {
final DetailAST previousStatement =
findPreviousStatementOfSingleLineComment(comment, root);
previousStatement = findPreviousStatementOfSingleLineComment(comment, root);
if (previousStatement != null) {
return previousStatement;
root = null;
stack.clear();
break;
}
if (root.getNextSibling() != null) {
stack.push(root.getNextSibling());
@ -512,7 +517,7 @@ public class CommentsIndentationCheck extends Check {
root = root.getFirstChild();
}
}
return null;
return previousStatement;
}
/**