Merge pull request #324 from carbonrobot/master

Support revealing module pattern fixes #323

Author: tmcw

Diff for: lib/infer/membership.js

@@ -110,7 +110,7 @@ module.exports = function () {
       comment.name = inferModuleName(currentModule || comment);
       return;
     }
-
+    
     /*
      * Test whether identifiers start with a module export (`exports` or `module.exports`),
      * and if so replace those identifiers with the name of the current module.
@@ -150,7 +150,7 @@ module.exports = function () {
 
     var path = comment.context.ast;
     var identifiers;
-
+    
     /*
      * Deal with an oddity of espree: the jsdoc comment is attached to a different
      * node in the two expressions `a.b = c` vs `a.b = function () {}`.
@@ -238,6 +238,13 @@ module.exports = function () {
       }
       inferMembershipFromIdentifiers(comment, identifiers, scope);
     }
+    
+    // var function Foo(){ function bar(){} return { bar: bar }; }
+    if (n.FunctionDeclaration.check(path.node) &&
+        n.BlockStatement.check(path.parent.node) &&
+        n.FunctionDeclaration.check(path.parent.parent.node)) {
+      inferMembershipFromIdentifiers(comment, [path.parent.parent.value.id.name]);
+    }
 
     return comment;
   });

Diff for: test/lib/infer/membership.js

@@ -162,7 +162,21 @@ test('inferMembership - explicit', function (t) {
     memberof: 'Foo',
     scope: 'instance'
   }, 'inferMembership - lends, instance, function');
-
+  
+  t.deepEqual(_.pick(evaluate(function () {
+    /** Foo */
+    function Foo() {
+      /** Test */
+      function bar() {}
+      return {
+        bar: bar
+      };
+    }
+  })[1], ['memberof', 'scope']), {
+    memberof: 'Foo',
+    scope: 'static'
+  }, 'inferMembership - revealing, static, function');
+  
   t.equal(evaluate(function () {
     lend(/** @lends Foo */{});
     /** Test */