Fix jsx-indent for parenthesized ternary (fixes #945)

Author: voxpelli

lib/rules/jsx-indent.js

@@ -193,7 +193,8 @@ module.exports = {
  node.parent &&
  node.parent.parent &&
  node.parent.parent.type === 'ConditionalExpression' &&
- node.parent.parent.alternate === node.parent
+ node.parent.parent.alternate === node.parent &&
+ sourceCode.getTokenBefore(node).value !== '('
  );
  }
 

tests/lib/rules/jsx-indent.js

@@ -215,6 +215,30 @@ ruleTester.run('jsx-indent', rule, {
  '</div>'
  ].join('\n'),
  parserOptions: parserOptions
+ }, {
+ code: [
+ '<div>',
+ ' { this.props.asd.length > 0 ? <Button className="bacon-yay">{this.props.asd.length}</Button> : (',
+ ' <span className="bacon-no-trigger">0</span>',
+ ' ) }',
+ '</div>'
+ ].join('\n'),
+ parserOptions: parserOptions
+ }, {
+ code: [
+ '<div>',
+ ' {',
+ ' this.props.asd.length > 0',
+ ' ? (',
+ ' <Button className="bacon-yay">{this.props.asd.length}</Button>',
+ ' )',
+ ' : (',
+ ' <span className="bacon-no-trigger">0</span>',
+ ' )',
+ ' }',
+ '</div>'
+ ].join('\n'),
+ parserOptions: parserOptions
  }],
 
  invalid: [{
@@ -504,5 +528,63 @@ ruleTester.run('jsx-indent', rule, {
  line: 4,
  column: 5
  }]
+ }, {
+ code: [
+ '<div>',
+ ' {this.props.asd.length > 0 ? <Button className="bacon-yay">{this.props.asd.length}</Button> : (',
+ ' <span className="bacon-no-trigger">0</span>',
+ ' )}',
+ '</div>'
+ ].join('\n'),
+ output: [
+ '<div>',
+ ' {this.props.asd.length > 0 ? <Button className="bacon-yay">{this.props.asd.length}</Button> : (',
+ ' <span className="bacon-no-trigger">0</span>',
+ ' )}',
+ '</div>'
+ ].join('\n'),
+ parserOptions: parserOptions,
+ errors: [{
+ message: 'Expected indentation of 8 space characters but found 4.',
+ line: 3,
+ column: 5
+ }]
+ }, {
+ code: [
+ '<div>',
+ ' {',
+ ' this.props.asd.length > 0',
+ ' ? (',
+ ' <Button className="bacon-yay">{this.props.asd.length}</Button>',
+ ' )',
+ ' : (',
+ ' <span className="bacon-no-trigger">0</span>',
+ ' )',
+ ' }',
+ '</div>'
+ ].join('\n'),
+ output: [
+ '<div>',
+ ' {',
+ ' this.props.asd.length > 0',
+ ' ? (',
+ ' <Button className="bacon-yay">{this.props.asd.length}</Button>',
+ ' )',
+ ' : (',
+ ' <span className="bacon-no-trigger">0</span>',
+ ' )',
+ ' }',
+ '</div>'
+ ].join('\n'),
+ parserOptions: parserOptions,
+ errors: [{
+ message: 'Expected indentation of 12 space characters but found 8.',
+ line: 5,
+ column: 9
+ }, {
+ message: 'Expected indentation of 12 space characters but found 14.',
+ line: 8,
+ column: 15
+ }]
  }]
 });