Fix jsx-indent to not check lines starting by literals (fixes #900)

jsx-eslint · Oct 12, 2016 · 798f2ca · 798f2ca · ljharb · Oct 12, 2016
1 parent c056489
commit 798f2ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -84,7 +84,6 @@ module.exports = {
     function getFixerFunction(node, needed, gotten) {
       if (needed > gotten) {
         var spaces = indentChar.repeat(needed - gotten);
-
         return function(fixer) {
           return fixer.insertTextBeforeRange([node.range[0], node.range[0]], spaces);
         };
@@ -169,7 +168,7 @@ module.exports = {
       var token = node;
       do {
         token = sourceCode.getTokenBefore(token);
-      } while (token.type === 'JSXText');
+      } while (token.type === 'JSXText' && /^\s*$/.test(token.value));
       var startLine = node.loc.start.line;
       var endLine = token ? token.loc.end.line : -1;
 

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -187,6 +187,17 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     parserOptions: parserOptions,
     options: [2]
+  }, {
+    // Literals indentation is not touched
+    code: [
+      '<div>',
+      'bar <div>',
+      '   bar',
+      '   bar {foo}',
+      'bar </div>',
+      '</div>'
+    ].join('\n'),
+    parserOptions: parserOptions
   }],
 
   invalid: [{