[Performance] Fix spaces between assert

jscs-dev · Apr 12, 2016 · b4bf41a · b4bf41a
1 parent 83a1647
commit b4bf41a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/lib/js-file.js b/lib/js-file.js
@@ -632,8 +632,8 @@ JsFile.prototype = {
         if (tokenBefore === tokenAfter) {
             return true;
         }
-        tokenBefore = tokenBefore.getLastToken();
-        tokenAfter = tokenAfter.getFirstToken();
+        tokenBefore = tokenBefore instanceof Token ? tokenBefore : tokenBefore.getLastToken();
+        tokenAfter = tokenAfter instanceof Token ? tokenAfter : tokenAfter.getFirstToken();
         var currentToken = tokenBefore;
         while (currentToken) {
             if (currentToken === tokenAfter) {
@@ -647,6 +647,25 @@ JsFile.prototype = {
         return false;
     },
 
+    getDistanceBetween(tokenBefore, tokenAfter) {
+        if (tokenBefore === tokenAfter) {
+            return 0;
+        }
+        tokenBefore = tokenBefore instanceof Token ? tokenBefore : tokenBefore.getLastToken();
+        tokenAfter = tokenAfter instanceof Token ? tokenAfter : tokenAfter.getFirstToken();
+        var currentToken = tokenBefore.getNextToken();
+        var distance = 0;
+        while (currentToken) {
+            if (currentToken === tokenAfter) {
+                break;
+            }
+
+            distance += currentToken.getSourceCodeLength();
+            currentToken = currentToken.getNextToken();
+        }
+        return distance;
+    },
+
     /**
      * Returns array of source lines for the file with comments removed.
      *

diff --git a/lib/token-assert.js b/lib/token-assert.js
@@ -107,7 +107,7 @@ TokenAssert.prototype.spacesBetween = function(options) {
         });
     }.bind(this);
 
-    var spacesBetween = Math.abs(nextToken.getRange()[0] - token.getRange()[1]);
+    var spacesBetween = this._file.getDistanceBetween(token, nextToken);
     if (atLeast !== undefined && spacesBetween < atLeast) {
         emitError('at least', atLeast);
     } else if (atMost !== undefined && spacesBetween > atMost) {