From 8313819dcbf3e9cc0700120014c78a99706d88bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20K=C3=BChne?= Date: Sun, 22 Sep 2002 13:29:57 +0000 Subject: [PATCH] WhitespaceAround deals with 'return;' --- .../tools/checkstyle/checks/WhitespaceAroundCheck.java | 5 +++-- .../puppycrawl/tools/checkstyle/WhitespaceAroundTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java index 9b541c497..bd19431a5 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java @@ -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()}); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java index f396ca292..56c6916bc 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java @@ -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.");