From fb79716cfa182271d66a00b2a0fb894df4929584 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Wed, 1 Nov 2017 18:32:44 +0100
Subject: [PATCH] [javascript] Move rule AvoidTrailingComma to errorprone

---
 .../category/ecmascript/codestyle.xml         | 36 -------------------
 .../category/ecmascript/errorprone.xml        | 36 +++++++++++++++++++
 .../resources/rulesets/ecmascript/basic.xml   |  2 +-
 .../rule/codestyle/CodeStyleRulesTest.java    |  1 -
 .../rule/errorprone/ErrorProneRulesTest.java  |  1 +
 .../xml/AvoidTrailingComma.xml                |  0
 6 files changed, 38 insertions(+), 38 deletions(-)
 rename pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/{codestyle => errorprone}/xml/AvoidTrailingComma.xml (100%)

diff --git a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
index 9a57701e45..7a2b58acdd 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
@@ -61,42 +61,6 @@ function getX() {
         </example>
     </rule>
 
-    <rule name="AvoidTrailingComma"
-          message="Avoid trailing commas in object or array literals"
-          language="ecmascript"
-          since="5.1"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_codestyle.html#avoidtrailingcomma">
-        <description>
-This rule helps improve code portability due to differences in browser treatment of trailing commas in object or array literals.
-        </description>
-        <priority>1</priority>
-        <properties>
-            <property name="xpath">
-                <value>
-<![CDATA[
-//ObjectLiteral[$allowObjectLiteral = "false" and @TrailingComma = 'true']
-|
-//ArrayLiteral[$allowArrayLiteral = "false" and @TrailingComma = 'true']
-]]>
-                </value>
-            </property>
-            <property name="allowObjectLiteral" type="Boolean" value="false" description="Allow a trailing comma within an object literal" />
-            <property name="allowArrayLiteral" type="Boolean" value="false" description="Allow a trailing comma within an array literal" />
-        </properties>
-        <example>
-<![CDATA[
-function(arg) {
-    var obj1 = { a : 1 };   // Ok
-    var arr1 = [ 1, 2 ];    // Ok
-
-    var obj2 = { a : 1, };  // Syntax error in some browsers!
-    var arr2 = [ 1, 2, ];   // Length 2 or 3 depending on the browser!
-}
-]]>
-        </example>
-    </rule>
-
     <rule name="ForLoopsMustUseBraces"
           language="ecmascript"
           since="5.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml b/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml
index 8cb15a8f3f..d814f6911b 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml
@@ -9,6 +9,42 @@
 
     </description>
 
+    <rule name="AvoidTrailingComma"
+          message="Avoid trailing commas in object or array literals"
+          language="ecmascript"
+          since="5.1"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_ecmascript_errorprone.html#avoidtrailingcomma">
+        <description>
+This rule helps improve code portability due to differences in browser treatment of trailing commas in object or array literals.
+        </description>
+        <priority>1</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+<![CDATA[
+//ObjectLiteral[$allowObjectLiteral = "false" and @TrailingComma = 'true']
+|
+//ArrayLiteral[$allowArrayLiteral = "false" and @TrailingComma = 'true']
+]]>
+                </value>
+            </property>
+            <property name="allowObjectLiteral" type="Boolean" value="false" description="Allow a trailing comma within an object literal" />
+            <property name="allowArrayLiteral" type="Boolean" value="false" description="Allow a trailing comma within an array literal" />
+        </properties>
+        <example>
+<![CDATA[
+function(arg) {
+    var obj1 = { a : 1 };   // Ok
+    var arr1 = [ 1, 2 ];    // Ok
+
+    var obj2 = { a : 1, };  // Syntax error in some browsers!
+    var arr2 = [ 1, 2, ];   // Length 2 or 3 depending on the browser!
+}
+]]>
+        </example>
+    </rule>
+
     <rule name="EqualComparison"
           language="ecmascript"
           since="5.0"
diff --git a/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml b/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml
index ea1afaa85c..2f83f3561a 100644
--- a/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml
+++ b/pmd-javascript/src/main/resources/rulesets/ecmascript/basic.xml
@@ -8,9 +8,9 @@
     <description>Rules concerning basic ECMAScript guidelines.</description>
 
     <rule ref="category/ecmascript/codestyle.xml/AssignmentInOperand" deprecated="true" />
-    <rule ref="category/ecmascript/codestyle.xml/AvoidTrailingComma" deprecated="true" />"
     <rule ref="category/ecmascript/codestyle.xml/UnreachableCode" deprecated="true" />
 
+    <rule ref="category/ecmascript/errorprone.xml/AvoidTrailingComma" deprecated="true" />"
     <rule ref="category/ecmascript/errorprone.xml/EqualComparison" deprecated="true" />
     <rule ref="category/ecmascript/errorprone.xml/InnaccurateNumericLiteral" deprecated="true" />
 
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/CodeStyleRulesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/CodeStyleRulesTest.java
index 32e923dc5f..adeebcd13b 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/CodeStyleRulesTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/CodeStyleRulesTest.java
@@ -13,7 +13,6 @@ public class CodeStyleRulesTest extends SimpleAggregatorTst {
     @Override
     public void setUp() {
         addRule(RULESET, "AssignmentInOperand");
-        addRule(RULESET, "AvoidTrailingComma");
         addRule(RULESET, "ForLoopsMustUseBraces");
         addRule(RULESET, "IfElseStmtsMustUseBraces");
         addRule(RULESET, "IfStmtsMustUseBraces");
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/ErrorProneRulesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/ErrorProneRulesTest.java
index 23f7b9724b..c52accf858 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/ErrorProneRulesTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/ErrorProneRulesTest.java
@@ -12,6 +12,7 @@ public class ErrorProneRulesTest extends SimpleAggregatorTst {
 
     @Override
     public void setUp() {
+        addRule(RULESET, "AvoidTrailingComma");
         addRule(RULESET, "EqualComparison");
         addRule(RULESET, "InnaccurateNumericLiteral");
     }
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/xml/AvoidTrailingComma.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/xml/AvoidTrailingComma.xml
similarity index 100%
rename from pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/xml/AvoidTrailingComma.xml
rename to pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/xml/AvoidTrailingComma.xml