From b4141d801dd7b22268c687feaa9b7b2477e91180 Mon Sep 17 00:00:00 2001
From: Andreas Opferkuch <andreas.opferkuch@greentube.com>
Date: Wed, 6 Sep 2017 18:18:14 +0200
Subject: [PATCH 1/3] [Tests] Added tests for jsx-curly-spacing that deal with
 comments in children.

See also:
https://github.com/yannickcr/eslint-plugin-react/issues/648#issuecomment-327519650
---
 tests/lib/rules/jsx-curly-spacing.js | 76 ++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/tests/lib/rules/jsx-curly-spacing.js b/tests/lib/rules/jsx-curly-spacing.js
index d42ce7b0fd..eaff650519 100644
--- a/tests/lib/rules/jsx-curly-spacing.js
+++ b/tests/lib/rules/jsx-curly-spacing.js
@@ -2148,6 +2148,40 @@ ruleTester.run('jsx-curly-spacing', rule, {
     }, {
       message: 'A space is required before \'}\''
     }]
+  }, {
+    code: [
+      '<App>',
+      '{ /* comment */ }',
+      '</App>;'
+    ].join('\n'),
+    output: [
+      '<App>',
+      '{/* comment */}',
+      '</App>;'
+    ].join('\n'),
+    options: [{when: 'never', children: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: [
+      '<App>',
+      '{/* comment */}',
+      '</App>;'
+    ].join('\n'),
+    output: [
+      '<App>',
+      '{ /* comment */ }',
+      '</App>;'
+    ].join('\n'),
+    options: [{when: 'always', children: true}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
   }, {
     code: [
       '<App>',
@@ -2180,5 +2214,47 @@ ruleTester.run('jsx-curly-spacing', rule, {
     errors: [{
       message: 'There should be no newline after \'{\''
     }]
+  }, {
+    code: [
+      '<App>{ /* comment */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment */ }</App>;'
+    ].join('\n'),
+    output: [
+      '<App>{/* comment */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment */}</App>;'
+    ].join('\n'),
+    options: [{when: 'never', children: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: [
+      '<App>{/* comment */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment */}</App>;'
+    ].join('\n'),
+    output: [
+      '<App>{ /* comment */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment */ }</App>;'
+    ].join('\n'),
+    options: [{when: 'always', children: true}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
   }]
 });

From a2764d9e235a4aab89116ba5899a29b78c45aff4 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Tue, 19 Dec 2017 16:40:10 -0800
Subject: [PATCH 2/3] [Tests] number comments to more easily locate failures

---
 tests/lib/rules/jsx-curly-spacing.js | 102 +++++++++++++--------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/tests/lib/rules/jsx-curly-spacing.js b/tests/lib/rules/jsx-curly-spacing.js
index eaff650519..18078f9538 100644
--- a/tests/lib/rules/jsx-curly-spacing.js
+++ b/tests/lib/rules/jsx-curly-spacing.js
@@ -59,9 +59,9 @@ ruleTester.run('jsx-curly-spacing', rule, {
       '</App>;'
     ].join('\n')
   }, {
-    code: '<App>{ foo /* comment */ }</App>'
+    code: '<App>{ foo /* comment 1 */ }</App>'
   }, {
-    code: '<App>{ /* comment */ foo }</App>'
+    code: '<App>{ /* comment 1 */ foo }</App>'
   }, {
     code: '<App foo={bar} />;',
     options: [{attributes: true}]
@@ -264,7 +264,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{attributes: {when: 'never', allowMultiline: true}}]
   }, {
-    code: '<App foo={bar/* comment */} />;',
+    code: '<App foo={bar/* comment 2 */} />;',
     options: [{attributes: {when: 'never'}}]
   }, {
     code: '<App foo={ bar } />;',
@@ -345,11 +345,11 @@ ruleTester.run('jsx-curly-spacing', rule, {
     options: [{children: {when: 'never', allowMultiline: true}}]
   }, {
     code: [
-      '<App>{/* comment */}</App>;'
+      '<App>{/* comment 3 */}</App>;'
     ].join('\n'),
     options: [{children: {when: 'never'}}]
   }, {
-    code: '<App>{bar/* comment */}</App>;',
+    code: '<App>{bar/* comment 4 */}</App>;',
     options: [{children: {when: 'never'}}]
   }, {
     code: '<App>{ bar }</App>;',
@@ -411,7 +411,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{attributes: {when: 'never', allowMultiline: true}}]
   }, {
-    code: '<App {...bar/* comment */} />;',
+    code: '<App {...bar/* comment 5 */} />;',
     options: [{attributes: {when: 'never'}}]
   }, {
     code: '<App foo={bar} {...baz} />;'
@@ -440,13 +440,13 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{attributes: {when: 'always'}}]
   }, {
-    code: '<App foo={bar/* comment */} {...baz/* comment */} />;',
+    code: '<App foo={bar/* comment 6 */} {...baz/* comment 7 */} />;',
     options: [{attributes: {when: 'never'}}]
   }, {
     code: '<App foo={3} bar={ {a: 2} } />',
     options: [{attributes: {when: 'never', spacing: {objectLiterals: 'always'}}}]
   }, {
-    code: '<App>{bar/* comment */}</App>;',
+    code: '<App>{bar/* comment 8 */}</App>;',
     options: [{children: {when: 'never'}}]
   }, {
     code: '<App>{bar} {baz}</App>;'
@@ -475,7 +475,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{children: {when: 'always'}}]
   }, {
-    code: '<App>{bar/* comment */} {baz/* comment */}</App>;',
+    code: '<App>{bar/* comment 9 */} {baz/* comment 10 */}</App>;',
     options: [{children: {when: 'never'}}]
   }, {
     code: '<App>{3} { {a: 2} }</App>',
@@ -572,11 +572,11 @@ ruleTester.run('jsx-curly-spacing', rule, {
     options: ['never']
   }, {
     code: [
-      '<App>{/* comment */}</App>;'
+      '<App>{/* comment 11 */}</App>;'
     ].join('\n'),
     options: ['never']
   }, {
-    code: '<App foo={bar/* comment */} />;',
+    code: '<App foo={bar/* comment 12 */} />;',
     options: ['never']
   }, {
     code: '<App foo={ bar } />;',
@@ -636,7 +636,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: ['never']
   }, {
-    code: '<App {...bar/* comment */} />;',
+    code: '<App {...bar/* comment 13 */} />;',
     options: ['never']
   }, {
     code: '<App foo={bar} {...baz} />;',
@@ -663,7 +663,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: ['always']
   }, {
-    code: '<App foo={bar/* comment */} {...baz/* comment */} />;',
+    code: '<App foo={bar/* comment 14 */} {...baz/* comment 15 */} />;',
     options: ['never']
   }, {
     code: '<App foo={3} bar={ {a: 2} } />',
@@ -1514,16 +1514,16 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={ foo /* comment */ } />',
-    output: '<App foo={foo /* comment */} />',
+    code: '<App foo={ foo /* comment 16 */ } />',
+    output: '<App foo={foo /* comment 16 */} />',
     errors: [{
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
     }]
   }, {
-    code: '<App foo={foo /* comment */} />',
-    output: '<App foo={ foo /* comment */ } />',
+    code: '<App foo={foo /* comment 17 */} />',
+    output: '<App foo={ foo /* comment 17 */ } />',
     options: [{attributes: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -1531,16 +1531,16 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={ /* comment */ foo } />',
-    output: '<App foo={/* comment */ foo} />',
+    code: '<App foo={ /* comment 18 */ foo } />',
+    output: '<App foo={/* comment 18 */ foo} />',
     errors: [{
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
     }]
   }, {
-    code: '<App foo={/* comment */ foo} />',
-    output: '<App foo={ /* comment */ foo } />',
+    code: '<App foo={/* comment 19 */ foo} />',
+    output: '<App foo={ /* comment 19 */ foo } />',
     options: [{attributes: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -1687,8 +1687,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App>{foo /* comment */}</App>',
-    output: '<App>{ foo /* comment */ }</App>',
+    code: '<App>{foo /* comment 20 */}</App>',
+    output: '<App>{ foo /* comment 20 */ }</App>',
     options: [{children: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -1696,8 +1696,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App>{/* comment */ foo}</App>',
-    output: '<App>{ /* comment */ foo }</App>',
+    code: '<App>{/* comment 21 */ foo}</App>',
+    output: '<App>{ /* comment 21 */ foo }</App>',
     options: [{children: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2108,8 +2108,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={foo /* comment */} />',
-    output: '<App foo={ foo /* comment */ } />',
+    code: '<App foo={foo /* comment 22 */} />',
+    output: '<App foo={ foo /* comment 22 */ } />',
     options: ['always'],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2117,8 +2117,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={/* comment */ foo} />',
-    output: '<App foo={ /* comment */ foo } />',
+    code: '<App foo={/* comment 23 */ foo} />',
+    output: '<App foo={ /* comment 23 */ foo } />',
     options: ['always'],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2126,22 +2126,22 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App>{/*comment*/ }</App>',
-    output: '<App>{/*comment*/}</App>',
+    code: '<App>{/*comment24*/ }</App>',
+    output: '<App>{/*comment24*/}</App>',
     options: [{children: {when: 'never'}}],
     errors: [{
       message: 'There should be no space before \'}\''
     }]
   }, {
-    code: '<App>{ /*comment*/}</App>',
-    output: '<App>{/*comment*/}</App>',
+    code: '<App>{ /*comment25*/}</App>',
+    output: '<App>{/*comment25*/}</App>',
     options: [{children: {when: 'never'}}],
     errors: [{
       message: 'There should be no space after \'{\''
     }]
   }, {
-    code: '<App>{/*comment*/}</App>',
-    output: '<App>{ /*comment*/ }</App>',
+    code: '<App>{/*comment26*/}</App>',
+    output: '<App>{ /*comment26*/ }</App>',
     options: [{children: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2151,12 +2151,12 @@ ruleTester.run('jsx-curly-spacing', rule, {
   }, {
     code: [
       '<App>',
-      '{ /* comment */ }',
+      '{ /* comment 27 */ }',
       '</App>;'
     ].join('\n'),
     output: [
       '<App>',
-      '{/* comment */}',
+      '{/* comment 27 */}',
       '</App>;'
     ].join('\n'),
     options: [{when: 'never', children: true}],
@@ -2168,12 +2168,12 @@ ruleTester.run('jsx-curly-spacing', rule, {
   }, {
     code: [
       '<App>',
-      '{/* comment */}',
+      '{/* comment 28 */}',
       '</App>;'
     ].join('\n'),
     output: [
       '<App>',
-      '{ /* comment */ }',
+      '{ /* comment 28 */ }',
       '</App>;'
     ].join('\n'),
     options: [{when: 'always', children: true}],
@@ -2185,13 +2185,13 @@ ruleTester.run('jsx-curly-spacing', rule, {
   }, {
     code: [
       '<App>',
-      '{/*comment*/',
+      '{/*comment29*/',
       '}',
       '</App>'
     ].join('\n'),
     output: [
       '<App>',
-      '{/*comment*/}',
+      '{/*comment29*/}',
       '</App>'
     ].join('\n'),
     options: [{children: {when: 'never', allowMultiline: false}}],
@@ -2202,12 +2202,12 @@ ruleTester.run('jsx-curly-spacing', rule, {
     code: [
       '<App>',
       '{',
-      '/*comment*/}',
+      '/*comment30*/}',
       '</App>'
     ].join('\n'),
     output: [
       '<App>',
-      '{/*comment*/}',
+      '{/*comment30*/}',
       '</App>'
     ].join('\n'),
     options: [{children: {when: 'never', allowMultiline: false}}],
@@ -2216,18 +2216,18 @@ ruleTester.run('jsx-curly-spacing', rule, {
     }]
   }, {
     code: [
-      '<App>{ /* comment */',
+      '<App>{ /* comment 31 */',
       'bar',
       '} {',
       'baz',
-      '/* comment */ }</App>;'
+      '/* comment 32 */ }</App>;'
     ].join('\n'),
     output: [
-      '<App>{/* comment */',
+      '<App>{/* comment 31 */',
       'bar',
       '} {',
       'baz',
-      '/* comment */}</App>;'
+      '/* comment 32 */}</App>;'
     ].join('\n'),
     options: [{when: 'never', children: true}],
     errors: [{
@@ -2237,18 +2237,18 @@ ruleTester.run('jsx-curly-spacing', rule, {
     }]
   }, {
     code: [
-      '<App>{/* comment */',
+      '<App>{/* comment 33 */',
       'bar',
       '} {',
       'baz',
-      '/* comment */}</App>;'
+      '/* comment 33 */}</App>;'
     ].join('\n'),
     output: [
-      '<App>{ /* comment */',
+      '<App>{ /* comment 33 */',
       'bar',
       '} {',
       'baz',
-      '/* comment */ }</App>;'
+      '/* comment 33 */ }</App>;'
     ].join('\n'),
     options: [{when: 'always', children: true}],
     errors: [{

From e4de3600c281c87bcb18d62c10ce279374ddcde4 Mon Sep 17 00:00:00 2001
From: Andreas Opferkuch <s-h-a-d-o-w@users.noreply.github.com>
Date: Fri, 16 Feb 2018 01:24:43 +0100
Subject: [PATCH 3/3] [Fix] jsx-curly-spacing problem in new tests, fixes #1414

Before this, spaces before/after braces when there should be none resulted in two overlapping fixes for the full brace content.
And so they required two passes. But the tester does only one pass, so only one white space was fixed and the test failed.

By including comments in the range calculation for the fix, the range is now properly limited, making it possible to have start and end fixes in one pass.
---
 lib/rules/jsx-curly-spacing.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/rules/jsx-curly-spacing.js b/lib/rules/jsx-curly-spacing.js
index d9db3c2fb3..9aaa4d3520 100644
--- a/lib/rules/jsx-curly-spacing.js
+++ b/lib/rules/jsx-curly-spacing.js
@@ -228,6 +228,13 @@ module.exports = {
         message: `There should be no space after '${token.value}'`,
         fix: function(fixer) {
           const nextToken = sourceCode.getTokenAfter(token);
+          const nextComment = sourceCode.getCommentsAfter(token);
+
+          // Take comments into consideration to narrow the fix range to what is actually affected. (See #1414)
+          if (nextComment.length > 0) {
+            return fixByTrimmingWhitespace(fixer, token.range[1], Math.min(nextToken.range[0], nextComment[0].start), 'start');
+          }
+
           return fixByTrimmingWhitespace(fixer, token.range[1], nextToken.range[0], 'start');
         }
       });
@@ -246,6 +253,13 @@ module.exports = {
         message: `There should be no space before '${token.value}'`,
         fix: function(fixer) {
           const previousToken = sourceCode.getTokenBefore(token);
+          const previousComment = sourceCode.getCommentsBefore(token);
+
+          // Take comments into consideration to narrow the fix range to what is actually affected. (See #1414)
+          if (previousComment.length > 0) {
+            return fixByTrimmingWhitespace(fixer, Math.max(previousToken.range[1], previousComment[0].end), token.range[0], 'end');
+          }
+
           return fixByTrimmingWhitespace(fixer, previousToken.range[1], token.range[0], 'end');
         }
       });