Fix comment deletion in jsx-curly-spacing autofix (fixes #648)

Author: Yannick Croissant

lib/rules/jsx-curly-spacing.js

@@ -85,7 +85,7 @@ module.exports = {
         loc: token.loc.start,
         message: 'There should be no newline after \'' + token.value + '\'',
         fix: function(fixer) {
-          var nextToken = context.getSourceCode().getTokenAfter(token);
+          var nextToken = sourceCode.getTokenAfter(token);
           return fixer.replaceTextRange([token.range[1], nextToken.range[0]], spaced ? ' ' : '');
         }
       });
@@ -103,7 +103,7 @@ module.exports = {
         loc: token.loc.start,
         message: 'There should be no newline before \'' + token.value + '\'',
         fix: function(fixer) {
-          var previousToken = context.getSourceCode().getTokenBefore(token);
+          var previousToken = sourceCode.getTokenBefore(token);
           return fixer.replaceTextRange([previousToken.range[1], token.range[0]], spaced ? ' ' : '');
         }
       });
@@ -121,8 +121,10 @@ module.exports = {
         loc: token.loc.start,
         message: 'There should be no space after \'' + token.value + '\'',
         fix: function(fixer) {
-          var nextToken = context.getSourceCode().getTokenAfter(token);
-          return fixer.removeRange([token.range[1], nextToken.range[0]]);
+          var nextToken = sourceCode.getTokenAfter(token);
+          var leadingComments = sourceCode.getNodeByRangeIndex(nextToken.range[0]).leadingComments;
+          var rangeEndRef = leadingComments ? leadingComments[0] : nextToken;
+          return fixer.removeRange([token.range[1], rangeEndRef.range[0]]);
         }
       });
     }
@@ -139,8 +141,10 @@ module.exports = {
         loc: token.loc.start,
         message: 'There should be no space before \'' + token.value + '\'',
         fix: function(fixer) {
-          var previousToken = context.getSourceCode().getTokenBefore(token);
-          return fixer.removeRange([previousToken.range[1], token.range[0]]);
+          var previousToken = sourceCode.getTokenBefore(token);
+          var trailingComments = sourceCode.getNodeByRangeIndex(previousToken.range[0]).trailingComments;
+          var rangeStartRef = trailingComments ? trailingComments[trailingComments.length - 1] : previousToken;
+          return fixer.removeRange([rangeStartRef.range[1], token.range[0]]);
         }
       });
     }
@@ -194,6 +198,12 @@ module.exports = {
       var second = context.getTokenAfter(first);
       var penultimate = sourceCode.getTokenBefore(last);
 
+      var leadingComments = sourceCode.getNodeByRangeIndex(second.range[0]).leadingComments;
+      second = leadingComments ? leadingComments[0] : second;
+
+      var trailingComments = sourceCode.getNodeByRangeIndex(penultimate.range[0]).trailingComments;
+      penultimate = trailingComments ? trailingComments[trailingComments.length - 1] : penultimate;
+
       var isObjectLiteral = first.value === second.value;
       if (isObjectLiteral) {
         if (objectLiteralSpacing === SPACING.never) {

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

@@ -574,5 +574,43 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }],
     parserOptions: parserOptions
+  }, {
+    code: '<div foo={ foo /* comment */ } />',
+    output: '<div foo={foo /* comment */} />',
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }],
+    parserOptions: parserOptions
+  }, {
+    code: '<div foo={foo /* comment */} />',
+    output: '<div foo={ foo /* comment */ } />',
+    options: ['always'],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }],
+    parserOptions: parserOptions
+  }, {
+    code: '<div foo={ /* comment */ foo } />',
+    output: '<div foo={/* comment */ foo} />',
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }],
+    parserOptions: parserOptions
+  }, {
+    code: '<div foo={/* comment */ foo} />',
+    output: '<div foo={ /* comment */ foo } />',
+    options: ['always'],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }],
+    parserOptions: parserOptions
   }]
 });