Fix displayName detection for class expressions (fixes #419)

jsx-eslint · Feb 22, 2016 · 3602f67 · 3602f67
1 parent 7105a01
commit 3602f67
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/rules/display-name.js b/lib/rules/display-name.js
@@ -90,8 +90,9 @@ module.exports = Components.detect(function(context, components, utils) {
         node.parent.parent.type === 'VariableDeclarator'
     );
     var namedClass = (
-      node.type === 'ClassDeclaration' &&
-      node.id && node.id.name
+      (node.type === 'ClassDeclaration' || node.type === 'ClassExpression') &&
+      node.id &&
+      node.id.name
     );
 
     var namedFunctionDeclaration = (
@@ -168,6 +169,13 @@ module.exports = Components.detect(function(context, components, utils) {
       markDisplayNameAsDeclared(node);
     },
 
+    ClassExpression: function(node) {
+      if (ignoreTranspilerName || !hasTranspilerName(node)) {
+        return;
+      }
+      markDisplayNameAsDeclared(node);
+    },
+
     ClassDeclaration: function(node) {
       if (ignoreTranspilerName || !hasTranspilerName(node)) {
         return;

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
@@ -337,6 +337,17 @@ ruleTester.run('display-name', rule, {
       ignoreTranspilerName: true
     }],
     parser: 'babel-eslint'
+  }, {
+    code: [
+      'import React, {Component} from "react";',
+      'function someDecorator(ComposedComponent) {',
+      '  return class MyDecorator extends Component {',
+      '    render() {return <ComposedComponent {...this.props} />;}',
+      '  };',
+      '}',
+      'module.exports = someDecorator;'
+    ].join('\n'),
+    parser: 'babel-eslint'
   }
 ],