diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java index c936081bb..55a09e127 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java @@ -113,8 +113,12 @@ public class WhitespaceAroundCheck if ((after < line.length()) && !Character.isWhitespace(line.charAt(after)) + // Check for "return;" && !((aAST.getType() == TokenTypes.LITERAL_RETURN) - && (aAST.getFirstChild().getType() == TokenTypes.SEMI))) + && (aAST.getFirstChild().getType() == TokenTypes.SEMI)) + // Check for "})". Happens with anon-inners + && !((aAST.getType() == TokenTypes.RCURLY) + && (line.charAt(after) == ')'))) { log(aAST.getLineNo(), aAST.getColumnNo() + aAST.getText().length(), "ws.notFollowed", new Object[]{aAST.getText()}); diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputWhitespace.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputWhitespace.java index bc042a33b..c8a10f804 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputWhitespace.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputWhitespace.java @@ -155,4 +155,13 @@ class InputWhitespace // missing WS around colon assert true:"Whups"; } + + /** another check */ + void donBradman(Runnable aRun) + { + donBradman(new Runnable() { + public void run() { + } + }); + } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java index d86b9b01b..ae13e97ae 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java @@ -55,6 +55,8 @@ public class ParenPadCheckTest "150:32: ')' is not preceeded with whitespace.", "153:16: '(' is not followed by whitespace.", "153:20: ')' is not preceeded with whitespace.", + "162:20: '(' is not followed by whitespace.", + "165:10: ')' is not preceeded with whitespace.", }; verify(c, fname, expected); }