requireNewlineBeforeSingleStatementsInIf: correct it for 2.x branch

jscs-dev · Feb 27, 2016 · f9f203b · f9f203b
1 parent 703cad3
commit f9f203b
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/lib/rules/require-newline-before-single-statements-in-if.js b/lib/rules/require-newline-before-single-statements-in-if.js
@@ -73,21 +73,32 @@ module.exports.prototype = {
         function getToken(entity, tokenType, tokenProperty) {
             if (entity.type === tokenType || !entity[tokenProperty]) {
                 return entity;
-            } else {
-                return getToken(entity[tokenProperty], tokenType, tokenProperty);
             }
+
+            return getToken(entity[tokenProperty], tokenType, tokenProperty);
         }
 
         file.iterateNodesByType('IfStatement', function(node) {
+            var token;
             var consequentNode = node.consequent;
             var alternateNode = node.alternate;
 
             if (isExpressionStatement(consequentNode)) {
-                assertDifferentLine(consequentNode, getToken(consequentNode, 'Keyword', 'previousSibling'));
+                token = file.getFirstNodeToken(consequentNode);
+
+                assertDifferentLine(
+                    consequentNode,
+                    file.findPrevToken(token, 'Keyword')
+                );
             }
 
             if (isExpressionStatement(alternateNode)) {
-                assertDifferentLine(alternateNode, getToken(alternateNode, 'Keyword', 'previousSibling'));
+                token = file.getFirstNodeToken(alternateNode);
+
+                assertDifferentLine(
+                    alternateNode,
+                    file.findPrevToken(token, 'Keyword')
+                );
             }
         });
     }