Fix: indent rule with JSX spread props (#12581)

nwoltman · btmills · commit b336fbedecd8 · 2019-11-22T12:48:35.000-05:00
diff --git a/lib/rules/indent.js b/lib/rules/indent.js
@@ -1492,6 +1492,17 @@ module.exports = {
                 );
             },
 
+            JSXSpreadAttribute(node) {
+                const openingCurly = sourceCode.getFirstToken(node);
+                const closingCurly = sourceCode.getLastToken(node);
+
+                offsets.setDesiredOffsets(
+                    [openingCurly.range[1], closingCurly.range[0]],
+                    openingCurly,
+                    1
+                );
+            },
+
             "*"(node) {
                 const firstToken = sourceCode.getFirstToken(node);
 
diff --git a/tests/lib/rules/indent.js b/tests/lib/rules/indent.js
@@ -4889,6 +4889,18 @@ ruleTester.run("indent", rule, {
                 <a>baz qux</a>.
             </small>
         `,
+        unIndent`
+            <div
+                {...props}
+            />
+        `,
+        unIndent`
+            <div
+                {
+                    ...props
+                }
+            />
+        `,
         {
             code: unIndent`
                 a(b
@@ -9754,6 +9766,36 @@ ruleTester.run("indent", rule, {
             `,
             errors: expectedErrors([3, 8, 6, "Block"])
         },
+        {
+            code: unIndent`
+                <div
+                {...props}
+                />
+            `,
+            output: unIndent`
+                <div
+                    {...props}
+                />
+            `,
+            errors: expectedErrors([2, 4, 0, "Punctuator"])
+        },
+        {
+            code: unIndent`
+                <div
+                    {
+                      ...props
+                    }
+                />
+            `,
+            output: unIndent`
+                <div
+                    {
+                        ...props
+                    }
+                />
+            `,
+            errors: expectedErrors([3, 8, 6, "Punctuator"])
+        },
         {
             code: unIndent`
                 <div>foo
