Fix jsx-indent for arrays (fixes #897, fixes #898)

Author: yannickcr

lib/rules/jsx-indent.js

@@ -219,7 +219,8 @@ module.exports = {
         if (!prevToken) {
           return;
         }
-        if (prevToken.type === 'JSXText') {
+        // Use the parent in a list or an array
+        if (prevToken.type === 'JSXText' || prevToken.type === 'Punctuator' && prevToken.value === ',') {
           prevToken = sourceCode.getNodeByRangeIndex(prevToken.start).parent;
         }
         var parentElementIndent = getNodeIndent(prevToken);

tests/lib/rules/jsx-indent.js

@@ -167,6 +167,15 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     parserOptions: parserOptions,
     options: [2]
+  }, {
+    code: [
+      '[',
+      '  <div />,',
+      '  <div />',
+      ']'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2]
   }],
 
   invalid: [{
@@ -320,6 +329,24 @@ ruleTester.run('jsx-indent', rule, {
     errors: [
       {message: 'Expected indentation of 1 tab character but found 0.'}
     ]
+  }, {
+    code: [
+      '[',
+      '  <div />,',
+      '    <div />',
+      ']'
+    ].join('\n'),
+    output: [
+      '[',
+      '  <div />,',
+      '  <div />',
+      ']'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2],
+    errors: [
+      {message: 'Expected indentation of 2 space characters but found 4.'}
+    ]
   }
   // Tests for future work. See the comment on line 42-43 in the rule near to fixable: 'whitespace' meta property,
   // Right now fixer function doesn't support replacing tabs with whitespaces and vice-versa.