[Fix] jsx-indent: avoid checking returns sans jsx

Fixes #3218
jsx-eslint · Feb 25, 2022 · c605fd8 · c605fd8
1 parent 13d8df6
commit c605fd8
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange
 
 ### Fixed
 * [`jsx-key`]: prevent false "missing array key" warning ([#3215][] @ljharb)
+* [`jsx-indent`]: avoid checking returns sans jsx ([#3218][] @ljharb)
 
+[#3218]: https://github.com/yannickcr/eslint-plugin-react/issues/3218
 [#3215]: https://github.com/yannickcr/eslint-plugin-react/issues/3215
 
 ## [7.29.0] - 2022.02.24

diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -35,6 +35,8 @@ const matchAll = require('string.prototype.matchall');
 const astUtil = require('../util/ast');
 const docsUrl = require('../util/docsUrl');
 const reportC = require('../util/report');
+const jsxUtil = require('../util/jsx');
+const isCreateElement = require('../util/isCreateElement');
 
 // ------------------------------------------------------------------------------
 // Rule Definition
@@ -417,6 +419,17 @@ module.exports = {
           return;
         }
 
+        let fn = node.parent;
+        while (fn && fn.type !== 'FunctionDeclaration' && fn.type !== 'FunctionExpression') {
+          fn = fn.parent;
+        }
+        if (
+          !fn
+          || !jsxUtil.isReturningJSX((n) => isCreateElement(n, context), node, context)
+        ) {
+          return;
+        }
+
         const openingIndent = getNodeIndent(node);
         const closingIndent = getNodeIndent(node, true);
 

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -1177,6 +1177,38 @@ const Component = () => (
       `,
       options: [2],
     },
+    {
+      code: `
+        export default class App extends React.Component {
+          state = {
+            name: '',
+          }
+        
+          componentDidMount() {
+            this.fetchName()
+              .then(name => {
+                this.setState({name})
+              });
+          }
+        
+          fetchName = () => {
+            const url = 'https://api.github.com/users/job13er'
+            return fetch(url)
+              .then(resp => resp.json())
+              .then(json => json.name)
+          }
+        
+          render() {
+            const {name} = this.state
+            return (
+              <h1>Hello, {name}</h1>
+            )
+          }
+        }
+      `,
+      features: ['class fields'],
+      options: [2],
+    },
   ]),
 
   invalid: parsers.all([].concat(