[Fix]jsx-indent: don't check literals not within JSX

jsx-eslint · Feb 3, 2020 · 2be9f24 · 2be9f24
1 parent 37c4ef3
commit 2be9f24
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -374,6 +374,9 @@ module.exports = {
       if (!node.parent) {
         return;
       }
+      if (node.parent.type !== 'JSXElement' && node.parent.type !== 'JSXFragment') {
+        return;
+      }
       const parentNodeIndent = getNodeIndent(node.parent);
       checkLiteralNodeIndent(node, parentNodeIndent + indentSize);
     }

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -989,6 +989,14 @@ const Component = () => (
       '</App>'
     ].join('\n'),
     options: ['tab']
+  }, {
+    // don't check literals not within JSX. See #2563
+    code: [
+      'function foo() {',
+      'const a = `aa`;',
+      'const b = `b\nb`;',
+      '}'
+    ].join('\n')
   }],
 
   invalid: [{
@@ -2003,5 +2011,20 @@ const Component = () => (
     errors: [
       {message: 'Expected indentation of 1 tab character but found 2.'}
     ]
+  }, {
+    code: [
+      '<>',
+      'aaa',
+      '</>'
+    ].join('\n'),
+    parser: parsers.BABEL_ESLINT,
+    output: [
+      '<>',
+      '    aaa',
+      '</>'
+    ].join('\n'),
+    errors: [
+      {message: 'Expected indentation of 4 space characters but found 0.'}
+    ]
   }]
 });