checkParamNames: out of order case and tests

Alexej Yaroshevich · Alexej Yaroshevich · commit ed2f0f1c3d54 · 2014-11-11T07:32:44.000+04:00
Fixes #33
diff --git a/lib/rules/validate-jsdoc/check-param-names.js b/lib/rules/validate-jsdoc/check-param-names.js
@@ -14,6 +14,19 @@ function validateCheckParamNames(node, err) {
         return;
     }
 
+    // outOfOrder
+    var paramsByName = {};
+    node.params.forEach(function(param) {
+        paramsByName[param.name] = param;
+    });
+    var paramTagsByName = {};
+    node.jsdoc.iterateByType(['param', 'arg', 'argument'], function(tag) {
+        if (tag.name && tag.name.value) {
+            paramTagsByName[tag.name.value] = tag;
+        }
+    });
+    var outOfOrder = {};
+
     node.jsdoc.iterateByType(['param', 'arg', 'argument'],
         /**
          * tag checker
@@ -33,9 +46,19 @@ function validateCheckParamNames(node, err) {
             }
 
             // checking name
-            if (tag.name.value !== param.name) {
-                return err('expected ' + param.name + ' but got ' + tag.name.value,
-                    tag.name.loc || node.jsdoc.loc.start);
+            var msg;
+            if (tag.name.value !== param.name && !outOfOrder[tag.name.value]) {
+                if (paramsByName[tag.name.value] && paramTagsByName[param.name]) {
+                    outOfOrder[tag.name.value] = outOfOrder[param.name] = true;
+                    msg = 'parameters ' + tag.name.value + ' and ' + param.name + ' are out of order';
+                } else if (paramsByName[tag.name.value]) {
+                    outOfOrder[tag.name.value] = true;
+                    msg = 'parameter ' + tag.name.value + ' is out of order';
+                } else {
+                    msg = 'expected ' + param.name + ' but got ' + tag.name.value;
+                }
+
+                return err(msg, tag.name.loc || node.jsdoc.loc.start);
             }
         });
 }
diff --git a/test/lib/rules/validate-jsdoc/check-param-names.js b/test/lib/rules/validate-jsdoc/check-param-names.js
@@ -127,6 +127,90 @@ describe('lib/rules/validate-jsdoc/check-param-names', function () {
             /* jshint ignore:end */
         ]);
 
+        // out-of-order. issue #33
+        checker.cases([
+            /* jshint ignore:start */
+            {
+                it: 'should report out of order',
+                code: function () {
+                    /**
+                     * @param xxx
+                     * @param yyy
+                     */
+                    function funcName(yyy, xxx) {
+                    }
+                },
+                errors: [
+                    {message: 'parameters xxx and yyy are out of order', column: 10, line: 2, rule: "jsDoc"}
+                ]
+            }, {
+                it: 'should report out of order many times',
+                code: function () {
+                    Cls.prototype = {
+                        /**
+                         * @param xxx
+                         * @param yyy
+                         * @param zzz
+                         */
+                        run: function(zzz, xxx, yyy) {
+                        }
+                    };
+                },
+                errors: [
+                    {message: 'parameters xxx and zzz are out of order', column: 14, line: 3, rule: "jsDoc"},
+                    {message: 'parameters yyy and xxx are out of order', column: 14, line: 4, rule: "jsDoc"}
+                ]
+            }, {
+                it: 'should report out of order and expected',
+                code: function () {
+                    Cls.prototype = {
+                        /**
+                         * @param xxx
+                         * @param yyy
+                         */
+                        run: function(zzz, xxx) {
+                        }
+                    };
+                },
+                errors: [
+                    {message: 'parameter xxx is out of order', column: 14, line: 3, rule: "jsDoc"},
+                    {message: 'expected xxx but got yyy', column: 14, line: 4, rule: "jsDoc"}
+                ]
+            }, {
+                it: 'should report out of order and expected v2',
+                code: function () {
+                    Cls.prototype = {
+                        /**
+                         * @param xxx
+                         * @param yyy
+                         */
+                        run: function(yyy, zzz) {
+                        }
+                    };
+                },
+                errors: [
+                    {message: 'expected yyy but got xxx', column: 14, line: 3, rule: "jsDoc"},
+                    {message: 'parameter yyy is out of order', column: 14, line: 4, rule: "jsDoc"}
+                ]
+            }, {
+                it: 'should not report out of order but expected',
+                code: function () {
+                    Cls.prototype = {
+                        /**
+                         * @param xxx
+                         * @param yyy
+                         */
+                        run: function(zzz, yyy) {
+                        }
+                    };
+                },
+                errors: [
+                    {message: 'expected zzz but got xxx', column: 14, line: 3, rule: "jsDoc"}
+                ]
+            }
+            /* jshint ignore:end */
+        ]);
+
     });
 
 });
