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

WhitespaceAround deals with 'return;'

This commit is contained in:
Lars Kühne 2002-09-22 13:29:57 +00:00
parent 0fdfc2f360
commit 8313819dcb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
View File

@ -65,7 +65,7 @@ public class WhitespaceAroundCheck extends Check implements Java14TokenTypes
LITERAL_else,
LITERAL_for,
LITERAL_do,
// LITERAL_return, // TODO: "return;" is OK, return(2) is not
LITERAL_return,
LITERAL_try,
LITERAL_catch,
LITERAL_finally,
@ -88,7 +88,8 @@ public class WhitespaceAroundCheck extends Check implements Java14TokenTypes
}
if ((after < line.length())
&& !Character.isWhitespace(line.charAt(after)))
&& !Character.isWhitespace(line.charAt(after))
&& !(aAST.getType() == LITERAL_return && aAST.getFirstChild() == null))
{
log(aAST.getLineNo(), aAST.getColumnNo() + aAST.getText().length(),
"ws.notFollowed", new Object[]{aAST.getText()});

4
src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java
View File

@ -25,7 +25,7 @@ public class WhitespaceAroundTest
final String fname = CheckerTest.getPath("InputWhitespace.java");
final String[] lines = getLines(fname);
walker.walk(getAST(fname, lines), lines, fname);
assertEquals(28, msgs.getMessages().length);
assertEquals(29, msgs.getMessages().length);
int idx = 0;
verifyMessage(msgs, idx++, 16, 22, "'=' is not preceeded with whitespace.");
verifyMessage(msgs, idx++, 16, 23, "'=' is not followed by whitespace.");
@ -46,7 +46,7 @@ public class WhitespaceAroundTest
verifyMessage(msgs, idx++, 39, 12, "'try' is not followed by whitespace.");
verifyMessage(msgs, idx++, 41, 14, "'catch' is not followed by whitespace.");
verifyMessage(msgs, idx++, 58, 11, "'if' is not followed by whitespace.");
// verifyMessage(msgs, idx++, 76, 19, "'return' is not followed by whitespace.");
verifyMessage(msgs, idx++, 76, 19, "'return' is not followed by whitespace.");
verifyMessage(msgs, idx++, 97, 29, "'?' is not preceeded with whitespace.");
verifyMessage(msgs, idx++, 97, 30, "'?' is not followed by whitespace.");
verifyMessage(msgs, idx++, 98, 15, "'==' is not preceeded with whitespace.");