fixup bug in matching logic for custom classes

Fixes #32
jscs-dev · Nov 10, 2014 · 8cfebde · 8cfebde
1 parent 3266c9e
commit 8cfebde
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/jsdoc.js b/lib/jsdoc.js
@@ -268,6 +268,9 @@ function _simplifyType(node) {
     return res;
 }
 
+var jsPrimitives = 'String Number Boolean Object Array Date Null Undefined Function Array RegExp'
+    .toLowerCase().split(' ');
+
 /**
  * Compare parsed jsDocTypes with esprima node
  * @param {SimplifiedType[]} variants - result of jsDocParseType
@@ -278,6 +281,7 @@ function jsDocMatchType (variants, argument) {
     var l;
     var variant;
     var type;
+    var primitive;
     var result = null;
 
     for (i = 0, l = variants.length; i < l; i += 1) {
@@ -288,6 +292,7 @@ function jsDocMatchType (variants, argument) {
         }
 
         type = variant.type.toLowerCase();
+        primitive = jsPrimitives.indexOf(type) !== -1;
 
         if (argument.type === 'Literal') {
             if (argument.value === null) {
@@ -307,7 +312,8 @@ function jsDocMatchType (variants, argument) {
             }
 
         } else if (argument.type === 'ObjectExpression') {
-            result = result || (type === 'object' || type === 'class');
+            result = result || (type === 'object');
+            result = result || (!primitive);
 
         } else if (argument.type === 'ArrayExpression') {
             result = result || (type === 'array');

diff --git a/test/lib/rules/validate-jsdoc/check-return-types.js b/test/lib/rules/validate-jsdoc/check-return-types.js
@@ -267,11 +267,13 @@ describe('rules/validate-jsdoc', function () {
                 it: 'should not report on `@returns {Class}` for {}. issue #32',
                 code: function () {
                     /**
-                     * @return {Class}
+                     * @return {SomeObject}
                      */
                     Users.prototype.getState = function()
                     {
-                        return {};
+                        return {
+                            id: "main"
+                        };
                     };
                 }
             }