Fix variables detection when searching for related components (fixes #…

…303)
jsx-eslint · Nov 16, 2015 · 48f67ad · 48f67ad
1 parent 4787aa0
commit 48f67ad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -5,6 +5,7 @@
 'use strict';
 
 var util = require('util');
+var variableUtil = require('./variable');
 
 /**
  * Components
@@ -265,7 +266,7 @@ function componentRule(rule, context) {
         return null;
       }
       var variableInScope;
-      var variables = context.getScope().variables;
+      var variables = variableUtil.variablesInScope(context);
       for (i = 0, j = variables.length; i < j; i++) {
         if (variables[i].name === variableName) {
           variableInScope = variables[i];

diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
@@ -904,6 +904,19 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    }, {
+      code: [
+        'export default function FooBar(props) {',
+        '  const bar = props.bar;',
+        '  return (<div bar={bar}><div {...props}/></div>);',
+        '}',
+        'if (process.env.NODE_ENV !== \'production\') {',
+        '  FooBar.propTypes = {',
+        '    bar: React.PropTypes.string',
+        '  }',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }
   ],