Issue checkstyle#1509: Extra comma is required in multi-line array value

Vladlis · Apr 12, 2017 · 5f07415 · 5f07415
1 parent 73e8b21
commit 5f07415
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java
@@ -65,15 +65,14 @@ public int[] getRequiredTokens() {
     @Override
     public void visitToken(DetailAST arrayInit) {
         final DetailAST rcurly = arrayInit.findFirstToken(TokenTypes.RCURLY);
+        final DetailAST previousSibling = rcurly.getPreviousSibling();
 
-        // if curlies are on the same line
-        // or array is empty then check nothing
         if (arrayInit.getLineNo() != rcurly.getLineNo()
-            && arrayInit.getChildCount() != 1) {
-            final DetailAST prev = rcurly.getPreviousSibling();
-            if (prev.getType() != TokenTypes.COMMA) {
-                log(rcurly.getLineNo(), MSG_KEY);
-            }
+                && arrayInit.getChildCount() != 1
+                && rcurly.getLineNo() != previousSibling.getLineNo()
+                && arrayInit.getLineNo() != previousSibling.getLineNo()
+                && previousSibling.getType() != TokenTypes.COMMA) {
+            log(rcurly.getLineNo(), MSG_KEY);
         }
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheckTest.java
@@ -45,7 +45,6 @@ public void testDefault()
             createCheckConfig(ArrayTrailingCommaCheck.class);
         final String[] expected = {
             "17: " + getCheckMessage(MSG_KEY),
-            "34: " + getCheckMessage(MSG_KEY),
             "37: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputArrayTrailingComma.java"), expected);

diff --git a/...puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/InputArrayTrailingComma.java b/...puppycrawl/tools/checkstyle/checks/coding/arraytrailingcomma/InputArrayTrailingComma.java
@@ -38,4 +38,7 @@ public class InputArrayTrailingComma
 
     int[] e1 = new int[] {
     };
+
+    int[] f1 = new int[] {0, 1
+    };
 }