Add alternative option to jsx-curly-spacing (fixes #388, fixes #211)

Author: casesandberg

lib/rules/jsx-curly-spacing.js

@@ -19,6 +19,7 @@ module.exports = function(context) {
   var sourceCode = context.getSourceCode();
   var spaced = context.options[0] === 'always';
   var multiline = context.options[1] ? context.options[1].allowMultiline : true;
+  var alternative = context.options[1] ? context.options[1].alternative : false;
 
   // --------------------------------------------------------------------------
   // Helpers
@@ -149,18 +150,43 @@ module.exports = function(context) {
    * @param {Token} last The last token to check (should be closing brace)
    * @returns {void}
    */
-  function validateBraceSpacing(node, first, second, penultimate, last) {
+  function validateBraceSpacing(node, first, second, third, antepenultimate, penultimate, last) {
     if (spaced) {
-      if (!sourceCode.isSpaceBetweenTokens(first, second)) {
-        reportRequiredBeginningSpace(node, first);
-      } else if (!multiline && isMultiline(first, second)) {
-        reportNoBeginningNewline(node, first);
-      }
-
-      if (!sourceCode.isSpaceBetweenTokens(penultimate, last)) {
-        reportRequiredEndingSpace(node, last);
-      } else if (!multiline && isMultiline(penultimate, last)) {
-        reportNoEndingNewline(node, last);
+      if (!alternative) {
+        if (!sourceCode.isSpaceBetweenTokens(first, second)) {
+          reportRequiredBeginningSpace(node, first);
+        } else if (!multiline && isMultiline(first, second)) {
+          reportNoBeginningNewline(node, first);
+        }
+
+        if (!sourceCode.isSpaceBetweenTokens(penultimate, last)) {
+          reportRequiredEndingSpace(node, last);
+        } else if (!multiline && isMultiline(penultimate, last)) {
+          reportNoEndingNewline(node, last);
+        }
+
+      // Object literal
+      } else if (first.value === second.value) {
+        if (sourceCode.isSpaceBetweenTokens(first, second)) {
+          reportNoBeginningSpace(node, first);
+        }
+        if (sourceCode.isSpaceBetweenTokens(penultimate, last)) {
+          reportNoEndingSpace(node, last);
+        }
+        if (!sourceCode.isSpaceBetweenTokens(second, third)) {
+          reportRequiredBeginningSpace(node, second);
+        }
+        if (!sourceCode.isSpaceBetweenTokens(antepenultimate, penultimate)) {
+          reportRequiredEndingSpace(node, penultimate);
+        }
+
+      } else {
+        if (!sourceCode.isSpaceBetweenTokens(first, second)) {
+          reportRequiredBeginningSpace(node, first);
+        }
+        if (!sourceCode.isSpaceBetweenTokens(penultimate, last)) {
+          reportRequiredEndingSpace(node, last);
+        }
       }
 
       return;
@@ -186,8 +212,10 @@ module.exports = function(context) {
       var last = sourceCode.getLastToken(node);
       var second = context.getTokenAfter(first);
       var penultimate = sourceCode.getTokenBefore(last);
+      var third = context.getTokenAfter(second);
+      var antepenultimate = sourceCode.getTokenBefore(penultimate);
 
-      validateBraceSpacing(node, first, second, penultimate, last);
+      validateBraceSpacing(node, first, second, third, antepenultimate, penultimate, last);
     }
   };
 };
@@ -199,6 +227,9 @@ module.exports.schema = [{
   properties: {
     allowMultiline: {
       type: 'boolean'
+    },
+    alternative: {
+      type: 'boolean'
     }
   },
   additionalProperties: false

tests/lib/rules/jsx-curly-spacing.js

@@ -83,6 +83,22 @@ ruleTester.run('jsx-curly-spacing', rule, {
     options: ['never'],
     parserOptions: parserOptions,
     parser: 'babel-eslint'
+  }, {
+    code: '<App foo={ bar } />;',
+    options: ['always', {alternative: true}],
+    parserOptions: parserOptions
+  }, {
+    code: '<App foo={{ bar: true, baz: true }} />;',
+    options: ['always', {alternative: true}],
+    parserOptions: parserOptions
+  }, {
+    code: [
+      '<App foo={',
+      'bar',
+      '} />;'
+    ].join('\n'),
+    options: ['always', {alternative: true}],
+    parserOptions: parserOptions
   }],
 
   invalid: [{
@@ -185,5 +201,41 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline before \'}\''
     }],
     parserOptions: parserOptions
+  }, {
+    code: '<App foo={bar} />;',
+    options: ['always', {alternative: true}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }],
+    parserOptions: parserOptions
+  }, {
+    code: '<App foo={ bar} />;',
+    options: ['always', {alternative: true}],
+    errors: [{
+      message: 'A space is required before \'}\''
+    }],
+    parserOptions: parserOptions
+  }, {
+    code: '<App foo={bar } />;',
+    options: ['always', {alternative: true}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }],
+    parserOptions: parserOptions
+  }, {
+    code: '<App foo={ {bar: true, baz: true} } />;',
+    options: ['always', {alternative: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }],
+    parserOptions: parserOptions
   }]
 });