(disallow|require)SpacesInForStatements: use tokenAssert

Author: hzoo

lib/rules/disallow-spaces-in-for-statement.js

@@ -58,24 +58,19 @@ module.exports.prototype = {
 
     check: function(file, errors) {
         file.iterateNodesByType('ForStatement', function(node) {
-            var prevToken;
             if (node.test) {
-                var testToken = file.getTokenByRangeStart(node.test.range[0]);
-                prevToken = file.getPrevToken(testToken);
-                errors.assert.whitespaceBetween({
-                    token: prevToken,
+                var testToken = file.getFirstNodeToken(node.test);
+                errors.assert.noWhitespaceBetween({
+                    token: file.getPrevToken(testToken),
                     nextToken: testToken,
-                    spaces: 0,
                     message: 'Space found after semicolon'
                 });
             }
             if (node.update) {
-                var updateToken = file.getTokenByRangeStart(node.update.range[0]);
-                prevToken = file.getPrevToken(updateToken);
-                errors.assert.whitespaceBetween({
-                    token: prevToken,
+                var updateToken = file.getFirstNodeToken(node.update);
+                errors.assert.noWhitespaceBetween({
+                    token: file.getPrevToken(updateToken),
                     nextToken: updateToken,
-                    spaces: 0,
                     message: 'Space found after semicolon'
                 });
             }

lib/rules/require-spaces-in-for-statement.js

@@ -58,22 +58,19 @@ module.exports.prototype = {
 
     check: function(file, errors) {
         file.iterateNodesByType('ForStatement', function(node) {
-            var prevToken;
             if (node.test) {
-                var testToken = file.getTokenByRangeStart(node.test.range[0]);
-                prevToken = file.getPrevToken(testToken);
+                var testToken = file.getFirstNodeToken(node.test);
                 errors.assert.whitespaceBetween({
-                    token: prevToken,
+                    token: file.getPrevToken(testToken),
                     nextToken: testToken,
                     spaces: 1,
                     message: 'One space required after semicolon'
                 });
             }
             if (node.update) {
-                var updateToken = file.getTokenByRangeStart(node.update.range[0]);
-                prevToken = file.getPrevToken(updateToken);
+                var updateToken = file.getFirstNodeToken(node.update);
                 errors.assert.whitespaceBetween({
-                    token: prevToken,
+                    token: file.getPrevToken(updateToken),
                     nextToken: updateToken,
                     spaces: 1,
                     message: 'One space required after semicolon'