Fix props handling when destructured in constructor (fixes #639)

Author: yannickcr

lib/rules/prop-types.js

@@ -545,11 +545,14 @@ module.exports = Components.detect(function(context, components, utils) {
             node.id.properties[i].value.type === 'ObjectPattern'
           );
           // let {firstname} = props
-          var statelessDestructuring = node.init.name === 'props' && utils.getParentStatelessComponent();
+          var directDestructuring =
+            node.init.name === 'props' &&
+            (utils.getParentStatelessComponent() || inConstructor())
+          ;
 
           if (thisDestructuring) {
             properties = node.id.properties[i].value.properties;
-          } else if (statelessDestructuring) {
+          } else if (directDestructuring) {
             properties = node.id.properties;
           } else {
             continue;
@@ -784,9 +787,13 @@ module.exports = Components.detect(function(context, components, utils) {
       // let {props: {firstname}} = this
       var thisDestructuring = destructuring && node.init.type === 'ThisExpression';
       // let {firstname} = props
-      var statelessDestructuring = destructuring && node.init.name === 'props' && utils.getParentStatelessComponent();
+      var directDestructuring =
+        destructuring &&
+        node.init.name === 'props' &&
+        (utils.getParentStatelessComponent() || inConstructor())
+      ;
 
-      if (!thisDestructuring && !statelessDestructuring) {
+      if (!thisDestructuring && !directDestructuring) {
         return;
       }
       markPropTypesAsUsed(node);

tests/lib/rules/prop-types.js

@@ -2120,6 +2120,25 @@ ruleTester.run('prop-types', rule, {
       errors: [{
         message: '\'lastname\' is missing in props validation'
       }]
+    }, {
+      code: [
+        'class Hello extends React.Component {',
+        '  constructor(props, context) {',
+        '    super(props, context)',
+        '    const firstname = props.firstname;',
+        '    const {lastname} = props;',
+        '    this.state = {',
+        '      firstname,',
+        '      lastname',
+        '    }',
+        '  }',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint',
+      errors: [
+        {message: '\'firstname\' is missing in props validation'},
+        {message: '\'lastname\' is missing in props validation'}
+      ]
     }
   ]
 });