Fix JSX return being assigned to the parent function is some cases (fixes #504)

Author: yannickcr

lib/util/Components.js

@@ -330,15 +330,15 @@ function componentRule(rule, context) {
       while (scope) {
         var node = scope.block;
         var isClass = node.type === 'ClassExpression';
-        var isFunction = /Function/.test(node.type); // Ignore non functions
-        var isNotMethod = !node.parent || node.parent.type !== 'MethodDefinition'; // Ignore classes methods
-        var isNotArgument = !node.parent || node.parent.type !== 'CallExpression'; // Ignore arguments (callback, etc.)
-        // Stop moving up if we reach a class
-        if (isClass) {
+        var isFunction = /Function/.test(node.type); // Functions
+        var isMethod = node.parent && node.parent.type === 'MethodDefinition'; // Classes methods
+        var isArgument = node.parent && node.parent.type === 'CallExpression'; // Arguments (callback, etc.)
+        // Stop moving up if we reach a class or an argument (like a callback)
+        if (isClass || isArgument) {
           return null;
         }
-        // Return the node if it is a function that is not a class method or an argument (like a callback)
-        if (isFunction && isNotMethod && isNotArgument) {
+        // Return the node if it is a function that is not a class method
+        if (isFunction && !isMethod) {
           return node;
         }
         scope = scope.upper;
@@ -534,6 +534,8 @@ function componentRule(rule, context) {
       }
       node = utils.getParentComponent();
       if (!node) {
+        var scope = context.getScope();
+        components.add(scope.block, 1);
         return;
       }
       components.add(node, 2);

tests/lib/rules/prop-types.js

@@ -1271,6 +1271,15 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parserOptions: parserOptions
+    }, {
+      code: [
+        'function Hello({names}) {',
+        '  return names.map((name) => {',
+        '    return <div>{name}</div>;',
+        '  });',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }
   ],