[Perf] Remove getRange() from rules

jscs-dev · Apr 12, 2016 · ff293c9 · ff293c9
1 parent 56a84ba
commit ff293c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/lib/rules/disallow-spaces-in-call-expression.js b/lib/rules/disallow-spaces-in-call-expression.js
@@ -42,16 +42,12 @@ module.exports.prototype = {
 
     check: function(file, errors) {
         file.iterateNodesByType(['CallExpression', 'NewExpression'], function(node) {
-            function doesTokenBelongToNode(token, node) {
-                return token.getRange()[1] <= node.getRange()[1];
-            }
-
             var lastCalleeToken = file.getLastNodeToken(node.callee);
             var roundBraceToken = file.findNextToken(lastCalleeToken, 'Punctuator', '(');
 
             // CallExpressions can't have missing parens, otherwise they're identifiers
             if (node.type === 'NewExpression') {
-                if (roundBraceToken === null || !doesTokenBelongToNode(roundBraceToken, node)) {
+                if (roundBraceToken === null || roundBraceToken.parentElement !== node) {
                     return;
                 }
             }

diff --git a/lib/rules/require-blocks-on-newline.js b/lib/rules/require-blocks-on-newline.js
@@ -157,14 +157,9 @@
 
 var assert = require('assert');
 
-function hasCommentInBlock(block, commentTokens) {
-    var count;
-    var comment;
-
-    for (count = 0; count < commentTokens.length; count++) {
-        comment = commentTokens[count];
-        if (comment.getRange()[0] >= block.getRange()[0] &&
-            comment.getRange()[1] <= block.getRange()[1]) {
+function hasCommentInBlock(block) {
+    for (var i = 0; i < block.childElements.length; i++) {
+        if (block.childElements[i].isComment) {
             return true;
         }
     }
@@ -215,16 +210,11 @@ module.exports.prototype = {
     check: function(file, errors) {
         var minLines = this._minLines;
         var includeComments = this._includeComments;
-        var commentTokens = [];
-
-        file.iterateTokensByType(['CommentLine', 'CommentBlock'], function(commentToken) {
-            commentTokens.push(commentToken);
-        });
 
         file.iterateNodesByType('BlockStatement', function(node) {
             var hasComment = false;
             if (includeComments === true) {
-                hasComment = hasCommentInBlock(node, commentTokens);
+                hasComment = hasCommentInBlock(node);
             }
 
             if (hasComment === false && node.body.length <= minLines) {