Refactor to avoid crawling up tree on every converted token

Author: Kai Cataldo

lib/node-utils.js

@@ -253,23 +253,6 @@ function isComment(token) {
     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
@@ -716,17 +699,24 @@ function convertTokens(ast) {
     const result = [];
     /**
      * @param  {TSNode} node the TSNode
+     * @param  {Object} meta additional metadata
      * @returns {undefined}
      */
-    function walk(node) {
-        if (isToken(node) && !isInsideComment(node) && node.kind !== SyntaxKind.EndOfFileToken) {
+    function walk(node, meta) {
+        const isInsideComment = meta && meta.isInsideComment;
+
+        if (isToken(node) && !isInsideComment && node.kind !== SyntaxKind.EndOfFileToken) {
             const converted = convertToken(node, ast);
 
             if (converted) {
                 result.push(converted);
             }
         } else {
-            node.getChildren().forEach(walk);
+            // Non-comment type tokens are generated for types in JSDoc blocks.
+            // These should not be added to the token list for ESTree.
+            node.getChildren().forEach(childNode => walk(childNode, {
+                isInsideComment: isInsideComment || isComment(node)
+            }));
         }
     }
     walk(ast);