diff --git a/docs/config_whitespace.html b/docs/config_whitespace.html index 6ca9d50eb..ece002e83 100644 --- a/docs/config_whitespace.html +++ b/docs/config_whitespace.html @@ -461,9 +461,7 @@ RPAREN, SUPER_CTOR_CALL, - TYPECAST + href="api/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">SUPER_CTOR_CALL CTOR_CALL, @@ -474,9 +472,7 @@ RPAREN, SUPER_CTOR_CALL, - TYPECAST + href="api/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#SUPER_CTOR_CALL">SUPER_CTOR_CALL diff --git a/docs/releasenotes.html b/docs/releasenotes.html index 4801bcd73..77cbfa211 100644 --- a/docs/releasenotes.html +++ b/docs/releasenotes.html @@ -101,6 +101,9 @@
  • NumberFormatException in MagicNumberCheck (bug 748913)
  • +
  • Removed broken support for checking typecasts from + ParenPadCheck (bug 750348)
  • + diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java index 2e21dba2c..1f1666722 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java @@ -43,7 +43,6 @@ import com.puppycrawl.tools.checkstyle.checks.AbstractOptionCheck; * {@link TokenTypes#METHOD_CALL METHOD_CALL}, * {@link TokenTypes#RPAREN RPAREN}, * {@link TokenTypes#SUPER_CTOR_CALL SUPER_CTOR_CALL}, - * {@link TokenTypes#TYPECAST TYPECAST}. *

    *

    * An example of how to configure the check is: @@ -83,7 +82,6 @@ public class ParenPadCheck TokenTypes.LPAREN, TokenTypes.CTOR_CALL, TokenTypes.SUPER_CTOR_CALL, - TokenTypes.TYPECAST, // TODO: treat this? TokenTypes.METHOD_CALL, }; } @@ -91,12 +89,16 @@ public class ParenPadCheck /** @see com.puppycrawl.tools.checkstyle.api.Check */ public void visitToken(DetailAST aAST) { - if (aAST.getType() == TokenTypes.RPAREN) { - processRight(aAST); - } - else { + // Strange logic in this method to guard against checking RPAREN tokens + // that are associated with a TYPECAST token. + if (aAST.getType() != TokenTypes.RPAREN) { processLeft(aAST); } + else if ((aAST.getParent() == null) + || (aAST.getParent().getType() != TokenTypes.TYPECAST)) + { + processRight(aAST); + } } /**