Add support for static methods in display-name and prop-types (fixes #48)

Author: yannickcr

lib/rules/display-name.js

@@ -83,6 +83,13 @@ module.exports = function(context) {
       markDisplayNameAsDeclared(component.node);
     },
 
+    MethodDefinition: function(node) {
+      if (!isDisplayNameDeclaration(node.key)) {
+        return;
+      }
+      markDisplayNameAsDeclared(node);
+    },
+
     ObjectExpression: function(node) {
       // Search for the displayName declaration
       node.properties.forEach(function(property) {

lib/rules/prop-types.js

@@ -220,6 +220,21 @@ module.exports = function(context) {
       }
     },
 
+    MethodDefinition: function(node) {
+      if (!isPropTypesDeclaration(node.key)) {
+        return;
+      }
+
+      var i = node.value.body.body.length - 1;
+      for (; i >= 0; i--) {
+        if (node.value.body.body[i].type === 'ReturnStatement') {
+          break;
+        }
+      }
+
+      markPropTypesAsDeclared(node, node.value.body.body[i].argument);
+    },
+
     ObjectExpression: function(node) {
       // Search for the displayName declaration
       node.properties.forEach(function(property) {

tests/lib/rules/display-name.js

@@ -55,6 +55,21 @@ eslintTester.addRuleTest('lib/rules/display-name', {
       classes: true,
       jsx: true
     }
+  }, {
+    code: [
+      'class Hello extends React.Component {',
+      '  static get displayName() {',
+      '    return \'Hello\';',
+      '  }',
+      '  render() {',
+      '    return <div>Hello {this.props.name}</div>;',
+      '  }',
+      '}'
+    ].join('\n'),
+    ecmaFeatures: {
+      classes: true,
+      jsx: true
+    }
   }],
 
   invalid: [{

tests/lib/rules/prop-types.js

@@ -165,6 +165,59 @@ eslintTester.addRuleTest('lib/rules/prop-types', {
         classes: true,
         jsx: true
       }
+    }, {
+      code: [
+        'class Hello extends React.Component {',
+        '  static get propTypes() {',
+        '    return {',
+        '      name: React.PropTypes.string',
+        '    };',
+        '  }',
+        '  render() {',
+        '    return <div>Hello {this.props.name}</div>;',
+        '  }',
+        '}'
+      ].join('\n'),
+      ecmaFeatures: {
+        classes: true,
+        destructuring: true,
+        jsx: true
+      }
+/*    }, {
+      code: [
+        'class Hello extends React.Component {',
+        '  render() {',
+        '    var { firstname, ...other } = this.props;',
+        '    return <div>Hello {firstname}</div>;',
+        '  }',
+        '}',
+        'Hello.propTypes = {',
+        '  firstname: React.PropTypes.string',
+        '};'
+      ].join('\n'),
+      parser: 'babel-eslint',
+      ecmaFeatures: {
+        classes: true,
+        destructuring: true,
+        jsx: true
+      }
+    }, {
+      code: [
+        'class Hello extends React.Component {',
+        '  static propTypes = {',
+        '    name: React.PropTypes.string',
+        '  }',
+        '  render() {',
+        '    return <div>Hello {this.props.name}</div>;',
+        '  }',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint',
+      ecmaFeatures: {
+        classes: true,
+        destructuring: true,
+        jsx: true
+      }*/
     }
   ],