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

Fixed bug where for-each statements caused a NPE when checking special case for for statements with empty iterator clauses in ParenPadCheck.

This commit is contained in:
Michael Studman 2004-12-19 23:44:21 +00:00
parent 9bcd88cf20
commit fee0ec8258
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java
View File

@ -103,8 +103,10 @@ public class ParenPadCheck
{
boolean followsEmptyForIterator = false;
final DetailAST parent = aAST.getParent();
//Only traditional for statements are examined, not for-each statements
if ((parent != null)
&& (parent.getType() == TokenTypes.LITERAL_FOR))
&& (parent.getType() == TokenTypes.LITERAL_FOR)
&& (parent.findFirstToken(TokenTypes.FOR_EACH_CLAUSE) == null))
{
final DetailAST forIterator =
parent.findFirstToken(TokenTypes.FOR_ITERATOR);
@ -122,8 +124,10 @@ public class ParenPadCheck
{
boolean preceedsEmptyForInintializer = false;
final DetailAST parent = aAST.getParent();
//Only traditional for statements are examined, not for-each statements
if ((parent != null)
&& (parent.getType() == TokenTypes.LITERAL_FOR))
&& (parent.getType() == TokenTypes.LITERAL_FOR)
&& (parent.findFirstToken(TokenTypes.FOR_EACH_CLAUSE) == null))
{
final DetailAST forIterator =
parent.findFirstToken(TokenTypes.FOR_INIT);

3
src/testinputs/com/puppycrawl/tools/checkstyle/InputWhitespace.java
View File

@ -229,5 +229,8 @@ class SpecialCasesInForLoop
for ( ; i < 5; i++ ) {
// ^ whitespace
}
for (int anInt : getSomeInts()) {
//Should be ignored
}
}
}

2
src/tests/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
View File

@ -51,6 +51,8 @@ public class ParenPadCheckTest
"178:14: '(' is not followed by whitespace.",
"178:36: ')' is not preceded with whitespace.",
"222:14: '(' is not followed by whitespace.",
"232:14: '(' is not followed by whitespace.",
"232:39: ')' is not preceded with whitespace.",
};
verify(checkConfig, getPath("InputWhitespace.java"), expected);
}