From f0c6c6ad7c33dc8af5a46c6ae2ecdff24f13a70b Mon Sep 17 00:00:00 2001 From: ychulovskyy Date: Sun, 21 Dec 2014 21:35:30 +0100 Subject: [PATCH] Issue #131 AnnotationUseStyle closingParens check failed --- .../checks/annotation/AnnotationUseStyleCheck.java | 2 ++ .../tools/checkstyle/annotation/DifferentUseStyles.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java index f086f35b8..753747929 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java @@ -416,6 +416,8 @@ public final class AnnotationUseStyleCheck extends Check } else if (ClosingParens.NEVER.equals(this.mParens) && !aAST.branchContains(TokenTypes.EXPR) + && !aAST.branchContains(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR) + && !aAST.branchContains(TokenTypes.ANNOTATION_ARRAY_INIT) && parenExists) { this.log(aAST.getLineNo(), "annotation.parens.present"); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/DifferentUseStyles.java b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/DifferentUseStyles.java index 675d326a1..f0e013647 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/DifferentUseStyles.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/DifferentUseStyles.java @@ -58,3 +58,8 @@ enum E { @Another({"foo", "bar"}) //compact style String value1() default ""; } + +@SomeArrays(pooches = {}) +@Another({}) +class Closing { +} \ No newline at end of file