Fix jsx-indent with multiline jsx in ternaries (fixes #966)

Author: Yannick Croissant

lib/rules/jsx-indent.js

@@ -233,6 +233,10 @@ module.exports = {
           do {
             prevToken = sourceCode.getTokenBefore(prevToken);
           } while (prevToken.type === 'Punctuator');
+          prevToken = sourceCode.getNodeByRangeIndex(prevToken.start);
+          while (prevToken.parent && prevToken.parent.type !== 'ConditionalExpression') {
+            prevToken = prevToken.parent;
+          }
         }
         prevToken = prevToken.type === 'JSXExpressionContainer' ? prevToken.expression : prevToken;
 

tests/lib/rules/jsx-indent.js

@@ -250,6 +250,21 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />'
     ].join('\n'),
     parserOptions: parserOptions
+  }, {
+    // Multiline ternary
+    // (multiline JSX, colon on its own line)
+    code: [
+      '{!foo ?',
+      '    <Foo',
+      '        onClick={this.onClick}',
+      '    />',
+      ':',
+      '    <Bar',
+      '        onClick={this.onClick}',
+      '    />',
+      '}'
+    ].join('\n'),
+    parserOptions: parserOptions
   }, {
     // Multiline ternary
     // (first expression on test line, colon at the end of the first expression)