Fix comment handling in jsx-curly-spacing

Author: yannickcr

lib/rules/jsx-curly-spacing.js

@@ -34,16 +34,6 @@ module.exports = function(context) {
     return left.loc.start.line !== right.loc.start.line;
   }
 
-  /**
-   * Determines whether two adjacent tokens have whitespace between them.
-   * @param {Object} left - The left token object.
-   * @param {Object} right - The right token object.
-   * @returns {boolean} Whether or not there is space between the tokens.
-   */
-  function isSpaced(left, right) {
-    return left.range[1] < right.range[0];
-  }
-
   /**
   * Reports that there shouldn't be a newline after the first token
   * @param {ASTNode} node - The node to report in the event of an error.
@@ -161,13 +151,13 @@ module.exports = function(context) {
    */
   function validateBraceSpacing(node, first, second, penultimate, last) {
     if (spaced) {
-      if (!isSpaced(first, second)) {
+      if (!sourceCode.isSpaceBetweenTokens(first, second)) {
         reportRequiredBeginningSpace(node, first);
       } else if (!multiline && isMultiline(first, second)) {
         reportNoBeginningNewline(node, first);
       }
 
-      if (!isSpaced(penultimate, last)) {
+      if (!sourceCode.isSpaceBetweenTokens(penultimate, last)) {
         reportRequiredEndingSpace(node, last);
       } else if (!multiline && isMultiline(penultimate, last)) {
         reportNoEndingNewline(node, last);
@@ -177,11 +167,11 @@ module.exports = function(context) {
     }
 
     // "never" setting if we get here.
-    if (isSpaced(first, second) && !(multiline && isMultiline(first, second))) {
+    if (sourceCode.isSpaceBetweenTokens(first, second) && !(multiline && isMultiline(first, second))) {
       reportNoBeginningSpace(node, first);
     }
 
-    if (isSpaced(penultimate, last) && !(multiline && isMultiline(penultimate, last))) {
+    if (sourceCode.isSpaceBetweenTokens(penultimate, last) && !(multiline && isMultiline(penultimate, last))) {
       reportNoEndingSpace(node, last);
     }
   }
@@ -193,13 +183,9 @@ module.exports = function(context) {
   return {
     JSXExpressionContainer: function(node) {
       var first = context.getFirstToken(node);
-      var second = context.getFirstToken(node, 1);
-      var penultimate = sourceCode.getLastToken(node, 1);
       var last = sourceCode.getLastToken(node);
-
-      if (first === penultimate && second === last) {
-        return;
-      }
+      var second = context.getTokenAfter(first);
+      var penultimate = sourceCode.getTokenBefore(last);
 
       validateBraceSpacing(node, first, second, penultimate, last);
     }