Rename option to 'first', align with first prop

Author: ThiefMaster

lib/rules/jsx-indent-props.js

@@ -47,7 +47,7 @@ module.exports = {
 
     schema: [{
       oneOf: [{
-        enum: ['tab', 'aligned']
+        enum: ['tab', 'first']
       }, {
         type: 'integer'
       }]
@@ -64,8 +64,8 @@ module.exports = {
     const sourceCode = context.getSourceCode();
 
     if (context.options.length) {
-      if (context.options[0] === 'aligned') {
-        indentSize = 'aligned';
+      if (context.options[0] === 'first') {
+        indentSize = 'first';
         indentType = 'space';
       } else if (context.options[0] === 'tab') {
         indentSize = 1;
@@ -167,24 +167,9 @@ module.exports = {
           return;
         }
         let propIndent;
-        if (indentSize === 'aligned') {
+        if (indentSize === 'first') {
           const firstPropNode = node.attributes[0];
-          // '<' and any space following it
-          const beforeNameLength = node.name.range[0] - node.range[0];
-          // the name itself
-          const nameLength = node.name.range[1] - node.name.range[0];
-          // any space between the name and the first attribute
-          const afterNameLength = Math.max(1, firstPropNode.loc.start.column - node.name.loc.end.column);
-          if (afterNameLength !== 1) {
-            // this is not easily fixable, so we just report another error for it.
-            // it should be unlikely enough to be triggered anyway
-            context.report({
-              node: node,
-              message: 'Found too much whitespace between tag name and first attribute.'
-            });
-          }
-          // use the indentation of the element relative to the beginning of the line
-          propIndent = node.loc.start.column + beforeNameLength + nameLength + afterNameLength;
+          propIndent = firstPropNode.loc.start.column;
         } else {
           const elementIndent = getNodeIndent(node);
           propIndent = elementIndent + indentSize;

tests/lib/rules/jsx-indent-props.js

@@ -63,39 +63,47 @@ ruleTester.run('jsx-indent-props', rule, {
     code: [
       '<App/>'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
   }, {
     code: [
       '<App aaa',
       '     b',
       '     cc',
       '/>'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
+  }, {
+    code: [
+      '<App   aaa',
+      '       b',
+      '       cc',
+      '/>'
+    ].join('\n'),
+    options: ['first']
   }, {
     code: [
       'const test = <App aaa',
       '                  b',
       '                  cc',
       '             />'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
   }, {
     code: [
       '<App aaa x',
       '     b y',
       '     cc',
       '/>'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
   }, {
     code: [
       'const test = <App aaa x',
       '                  b y',
       '                  cc',
       '             />'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
   }, {
     code: [
       '<App aaa',
@@ -105,7 +113,7 @@ ruleTester.run('jsx-indent-props', rule, {
       '           d/>',
       '</App>'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
   }, {
     code: [
       '<Fragment>',
@@ -119,7 +127,15 @@ ruleTester.run('jsx-indent-props', rule, {
       '  />',
       '</Fragment>'
     ].join('\n'),
-    options: ['aligned']
+    options: ['first']
+  }, {
+    code: [
+      '<App',
+      '  a',
+      '  b',
+      '/>'
+    ].join('\n'),
+    options: ['first']
   }],
 
   invalid: [{
@@ -184,20 +200,7 @@ ruleTester.run('jsx-indent-props', rule, {
       '     b',
       '/>'
     ].join('\n'),
-    options: ['aligned'],
-    errors: [{message: 'Expected indentation of 5 space characters but found 2.'}]
-  }, {
-    code: [
-      '<App a x',
-      '  b y',
-      '/>'
-    ].join('\n'),
-    output: [
-      '<App a x',
-      '     b y',
-      '/>'
-    ].join('\n'),
-    options: ['aligned'],
+    options: ['first'],
     errors: [{message: 'Expected indentation of 5 space characters but found 2.'}]
   }, {
     code: [
@@ -210,11 +213,8 @@ ruleTester.run('jsx-indent-props', rule, {
       '      b',
       '/>'
     ].join('\n'),
-    options: ['aligned'],
-    errors: [
-      {message: 'Found too much whitespace between tag name and first attribute.'},
-      {message: 'Expected indentation of 6 space characters but found 3.'}
-    ]
+    options: ['first'],
+    errors: [{message: 'Expected indentation of 6 space characters but found 3.'}]
   }, {
     code: [
       '<App',
@@ -228,28 +228,27 @@ ruleTester.run('jsx-indent-props', rule, {
       '      b',
       '/>'
     ].join('\n'),
-    options: ['aligned'],
-    errors: [
-      {message: 'Found too much whitespace between tag name and first attribute.'},
-      {message: 'Expected indentation of 6 space characters but found 3.'}
-    ]
+    options: ['first'],
+    errors: [{message: 'Expected indentation of 6 space characters but found 3.'}]
   }, {
     code: [
       '<App',
       '  a',
-      '  b',
+      ' b',
+      '   c',
       '/>'
     ].join('\n'),
     output: [
       '<App',
-      '     a',
-      '     b',
+      '  a',
+      '  b',
+      '  c',
       '/>'
     ].join('\n'),
-    options: ['aligned'],
+    options: ['first'],
     errors: [
-      {message: 'Expected indentation of 5 space characters but found 2.'},
-      {message: 'Expected indentation of 5 space characters but found 2.'}
+      {message: 'Expected indentation of 2 space characters but found 1.'},
+      {message: 'Expected indentation of 2 space characters but found 3.'}
     ]
   }]
 });