Fix the behavior of the boolean "attributes"

jsx-eslint · Jun 11, 2017 · 65135b8 · 65135b8
1 parent 7b9d9ad
commit 65135b8
Show file tree

Hide file tree

Showing 2 changed files with 145 additions and 3 deletions.
diff --git a/lib/rules/jsx-curly-spacing.js b/lib/rules/jsx-curly-spacing.js
@@ -239,11 +239,23 @@ module.exports = {
      * @returns {void}
      */
     function validateBraceSpacing(node) {
-      // Only validate attributes
-      if (node.parent.type === 'JSXElement') {
+      var config;
+      switch (node.parent.type) {
+        case 'JSXAttribute':
+        case 'JSXOpeningElement':
+          config = attributesConfig;
+          break;
+
+        case 'JSXElement':
+          return;
+
+        default:
+          return;
+      }
+      if (config === null) {
         return;
       }
-      var config = attributesConfig;
+
       var first = context.getFirstToken(node);
       var last = sourceCode.getLastToken(node);
       var second = context.getTokenAfter(first, {includeComments: true});

diff --git a/tests/lib/rules/jsx-curly-spacing.js b/tests/lib/rules/jsx-curly-spacing.js
@@ -42,6 +42,38 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n')
   }, {
     code: '<App foo={{ bar: true, baz: true }} />;'
+  }, {
+    code: '<App foo={bar} />;',
+    options: [{attributes: true}]
+  }, {
+    code: [
+      '<App foo={',
+      'bar',
+      '} />;'
+    ].join('\n'),
+    options: [{attributes: true}]
+  }, {
+    code: '<App foo={{ bar: true, baz: true }} />;',
+    options: [{attributes: true}]
+  }, {
+    code: '<App foo={bar} />;',
+    options: [{attributes: false}]
+  }, {
+    code: [
+      '<App foo={',
+      'bar',
+      '} />;'
+    ].join('\n'),
+    options: [{attributes: false}]
+  }, {
+    code: '<App foo={{ bar: true, baz: true }} />;',
+    options: [{attributes: false}]
+  }, {
+    code: '<App foo={ bar } />;',
+    options: [{attributes: false}]
+  }, {
+    code: '<App foo={ { bar: true, baz: true } } />;',
+    options: [{attributes: false}]
   }, {
     code: '<App foo={bar} />;',
     options: [{when: 'never'}]
@@ -281,6 +313,24 @@ ruleTester.run('jsx-curly-spacing', rule, {
     }, {
       message: 'There should be no space before \'}\''
     }]
+  }, {
+    code: '<App foo={ bar } />;',
+    output: '<App foo={bar} />;',
+    options: [{attributes: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: '<App foo={ { bar: true, baz: true } } />;',
+    output: '<App foo={{ bar: true, baz: true }} />;',
+    options: [{attributes: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
   }, {
     code: '<App foo={ bar } />;',
     output: '<App foo={bar} />;',
@@ -413,6 +463,86 @@ ruleTester.run('jsx-curly-spacing', rule, {
     }, {
       message: 'A space is required before \'}\''
     }]
+  }, {
+    code: '<App foo={ bar } />;',
+    output: '<App foo={bar} />;',
+    options: [{attributes: true, when: 'never'}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: [
+      '<App foo={',
+      'bar',
+      '} />;'
+    ].join('\n'),
+    output: '<App foo={bar} />;',
+    options: [{attributes: true, when: 'never', allowMultiline: false}],
+    errors: [{
+      message: 'There should be no newline after \'{\''
+    }, {
+      message: 'There should be no newline before \'}\''
+    }]
+  }, {
+    code: '<App foo={ { bar: true, baz: true } } />;',
+    output: '<App foo={{ bar: true, baz: true }} />;',
+    options: [{attributes: true, when: 'never', spacing: {objectLiterals: 'never'}}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: '<App foo={{ bar: true, baz: true }} />;',
+    output: '<App foo={ { bar: true, baz: true } } />;',
+    options: [{attributes: true, when: 'never', spacing: {objectLiterals: 'always'}}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
+  }, {
+    code: '<App foo={bar} />;',
+    output: '<App foo={ bar } />;',
+    options: [{attributes: true, when: 'always'}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
+  }, {
+    code: [
+      '<App foo={',
+      'bar',
+      '} />;'
+    ].join('\n'),
+    output: '<App foo={ bar } />;',
+    options: [{attributes: true, when: 'always', allowMultiline: false}],
+    errors: [{
+      message: 'There should be no newline after \'{\''
+    }, {
+      message: 'There should be no newline before \'}\''
+    }]
+  }, {
+    code: '<App foo={ { bar: true, baz: true } } />;',
+    output: '<App foo={{ bar: true, baz: true }} />;',
+    options: [{attributes: true, when: 'always', spacing: {objectLiterals: 'never'}}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: '<App foo={{ bar: true, baz: true }} />;',
+    output: '<App foo={ { bar: true, baz: true } } />;',
+    options: [{attributes: true, when: 'always', spacing: {objectLiterals: 'always'}}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
   }, {
     code: '<App foo={ bar } />;',
     output: '<App foo={bar} />;',