Merge pull request #2225 from dwelle/display_name_nested

[Fix] `display-name`: fix false negative around nested functions
jsx-eslint · Apr 3, 2019 · 35de81b · 35de81b
2 parents 91c38fa + 8b1a64f
commit 35de81b
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 3 deletions.
diff --git a/lib/rules/display-name.js b/lib/rules/display-name.js
@@ -160,21 +160,27 @@ module.exports = {
         if (ignoreTranspilerName || !hasTranspilerName(node)) {
           return;
         }
-        markDisplayNameAsDeclared(node);
+        if (components.get(node)) {
+          markDisplayNameAsDeclared(node);
+        }
       },
 
       FunctionDeclaration: function(node) {
         if (ignoreTranspilerName || !hasTranspilerName(node)) {
           return;
         }
-        markDisplayNameAsDeclared(node);
+        if (components.get(node)) {
+          markDisplayNameAsDeclared(node);
+        }
       },
 
       ArrowFunctionExpression: function(node) {
         if (ignoreTranspilerName || !hasTranspilerName(node)) {
           return;
         }
-        markDisplayNameAsDeclared(node);
+        if (components.get(node)) {
+          markDisplayNameAsDeclared(node);
+        }
       },
 
       MethodDefinition: function(node) {

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
@@ -693,5 +693,65 @@ ruleTester.run('display-name', rule, {
     errors: [{
       message: 'Component definition is missing display name'
     }]
+  }, {
+    code: `
+      module.exports = function () {
+        function a () {}
+        const b = function b () {}
+        const c = function () {}
+        const d = () => {}
+        const obj = {
+          a: function a () {},
+          b: function b () {},
+          c () {},
+          d: () => {},
+        }
+        return React.createElement("div", {}, "text content");
+      }
+    `,
+    errors: [{
+      message: 'Component definition is missing display name'
+    }]
+  }, {
+    code: `
+      module.exports = () => {
+        function a () {}
+        const b = function b () {}
+        const c = function () {}
+        const d = () => {}
+        const obj = {
+          a: function a () {},
+          b: function b () {},
+          c () {},
+          d: () => {},
+        }
+
+        return React.createElement("div", {}, "text content");
+      }
+    `,
+    errors: [{
+      message: 'Component definition is missing display name'
+    }]
+  }, {
+    code: `
+      export default class extends React.Component {
+        render() {
+          function a () {}
+          const b = function b () {}
+          const c = function () {}
+          const d = () => {}
+          const obj = {
+            a: function a () {},
+            b: function b () {},
+            c () {},
+            d: () => {},
+          }
+          return <div>Hello {this.props.name}</div>;
+        }
+      }
+    `,
+    errors: [{
+      message: 'Component definition is missing display name'
+    }]
   }]
 });