Refactor to avoid crawling up tree on every converted token

Author: Kai Cataldo

lib/node-utils.js

@@ -250,26 +250,9 @@ function isComma(token) {
  * @returns {boolean}       is commment
  */
 function isComment(token) {
-    return (token.kind === SyntaxKind.SingleLineCommentTrivia || token.kind === SyntaxKind.MultiLineCommentTrivia) || (token.kind >= SyntaxKind.JSDocTypeExpression && token.kind <= SyntaxKind.JSDocTypeLiteral);
+    return token.kind === SyntaxKind.SingleLineCommentTrivia || token.kind === SyntaxKind.MultiLineCommentTrivia || (token.kind >= SyntaxKind.JSDocTypeExpression && token.kind <= SyntaxKind.JSDocTypeLiteral);
 }
 
-/**
- * Returns true if the given TSToken is inside a comment
- * Non-comment type tokens are generated for types in JSDoc Blocks
- * @param  {TSToken}  token the TypeScript token
- * @returns {boolean}       is inside a commment
- */
-function isInsideComment(token) {
-    if (token.kind === SyntaxKind.SourceFile) {
-        return false;
-    }
-    if (isComment(token)) {
-        return true;
-    }
-    return isInsideComment(token.parent);
-}
-
-
 /**
  * Returns the binary expression type of the given TSToken
  * @param  {TSToken} operator the operator token
@@ -719,7 +702,13 @@ function convertTokens(ast) {
      * @returns {undefined}
      */
     function walk(node) {
-        if (isToken(node) && !isInsideComment(node) && node.kind !== SyntaxKind.EndOfFileToken) {
+        // TypeScript generates tokens for types in JSDoc blocks. Comment tokens
+        // and their children should not be walked or added to the resulting tokens list.
+        if (isComment(node)) {
+            return;
+        }
+
+        if (isToken(node) && node.kind !== SyntaxKind.EndOfFileToken) {
             const converted = convertToken(node, ast);
 
             if (converted) {