fix(jsx-indent): conflict between indent and jsx-indent (#368)

Co-authored-by: Anthony Fu <github@antfu.me>
eslint-stylistic · Apr 29, 2024 · 7313184 · 7313184
1 parent c329a86
commit 7313184
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/packages/eslint-plugin-jsx/rules/jsx-indent/jsx-indent.test.ts b/packages/eslint-plugin-jsx/rules/jsx-indent/jsx-indent.test.ts
@@ -1170,6 +1170,36 @@ const Component = () => (
       `,
       options: [2],
     },
+    {
+      options: [2, { checkAttributes: true, indentLogicalExpressions: true }],
+      code: `
+      <>
+        <div
+          foo={
+            condition
+              ? [
+                'bar'
+              ]
+              : [
+                'baz',
+                'qux'
+              ]
+          }
+        />
+        <div
+          style={
+            true
+              ? {
+                  color: 'red',
+                }
+              : {
+                  height: 1,
+                }
+          }
+        />
+      </>
+      `,
+    },
   ),
 
   invalid: invalids(

diff --git a/packages/eslint-plugin-jsx/rules/jsx-indent/jsx-indent.ts b/packages/eslint-plugin-jsx/rules/jsx-indent/jsx-indent.ts
@@ -380,6 +380,9 @@ export default createRule<MessageIds, RuleOptions>({
       const nameIndent = getNodeIndent(node.name)
       const lastToken = context.sourceCode.getLastToken(node.value)!
       const firstInLine = getFirstNodeInLine(context, lastToken)
+      // leave this for `indent` rule to handle
+      if (firstInLine.loc.start.line !== lastToken.loc.start.line)
+        return
       const indent = node.name.loc.start.line === firstInLine.loc.start.line ? 0 : nameIndent
       checkNodesIndent(firstInLine as unknown as ASTNode, indent)
     }