Merge pull request #1112 from ethanjgoldberg/method-annotations-are-not-prop-types

Fix required prop types for classes with annotated methods.

Author: ljharb

lib/rules/prop-types.js

@@ -868,7 +868,12 @@ module.exports = {
 
       ArrowFunctionExpression: handleStatelessComponent,
 
-      FunctionExpression: handleStatelessComponent,
+      FunctionExpression: function(node) {
+        if (node.parent.type === 'MethodDefinition') {
+          return;
+        }
+        handleStatelessComponent(node);
+      },
 
       MemberExpression: function(node) {
         var type;

tests/lib/rules/prop-types.js

@@ -1115,6 +1115,20 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    }, {
+      code: [
+        'type Props = {',
+        '  name: string,',
+        '};',
+        'class Hello extends React.Component {',
+        '  props: Props;',
+        '  render() {',
+        '    const {name} = this.props;',
+        '    return name;',
+        '  }',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }, {
       code: [
         'Card.propTypes = {',
@@ -1405,6 +1419,25 @@ ruleTester.run('prop-types', rule, {
 
   invalid: [
     {
+      code: [
+        'type Props = {',
+        '  name: string,',
+        '};',
+        'class Hello extends React.Component {',
+        '  foo(props: Props) {}',
+        '  render() {',
+        '    return this.props.name;',
+        '  }',
+        '}'
+      ].join('\n'),
+      errors: [{
+        message: '\'name\' is missing in props validation',
+        line: 7,
+        column: 23,
+        type: 'Identifier'
+      }],
+      parser: 'babel-eslint'
+    }, {
       code: [
         'var Hello = createReactClass({',
         '  render: function() {',