Move forEachFreeIdentifier to compiler/utilities.ts

Author: agentcooper

src/compiler/transformers/es2015.ts

@@ -4422,25 +4422,6 @@ namespace ts {
         }
     }
 
-    function forEachFreeIdentifier(node: Node, cb: (id: Identifier) => void): void {
-        if (isIdentifier(node) && isFreeIdentifier(node)) cb(node);
-        forEachChild(node, child => forEachFreeIdentifier(child, cb));
-    }
-
-    function isFreeIdentifier(node: Identifier): boolean {
-        const { parent } = node;
-        switch (parent.kind) {
-            case SyntaxKind.PropertyAccessExpression:
-                return (parent as PropertyAccessExpression).name !== node;
-            case SyntaxKind.BindingElement:
-                return (parent as BindingElement).propertyName !== node;
-            case SyntaxKind.ImportSpecifier:
-                return (parent as ImportSpecifier).propertyName !== node;
-            default:
-                return true;
-        }
-    }
-
     function createNonCollidingName(name: string, node: Node): string {
         const identifiers = new Set<string>();
         forEachFreeIdentifier(node, (identifier) => {

src/compiler/utilities.ts

@@ -7418,4 +7418,27 @@ namespace ts {
         const declaration = symbol.valueDeclaration && getRootDeclaration(symbol.valueDeclaration);
         return !!declaration && (isParameter(declaration) || isCatchClauseVariableDeclaration(declaration));
     }
+
+    /**
+     * A free identifier is an identifier that can be accessed through name lookup as a local variable.
+     * In the expression `x.y`, `x` is a free identifier, but `y` is not.
+     */
+    export function forEachFreeIdentifier(node: Node, cb: (id: Identifier) => void): void {
+        if (isIdentifier(node) && isFreeIdentifier(node)) cb(node);
+        forEachChild(node, child => forEachFreeIdentifier(child, cb));
+    }
+
+    export function isFreeIdentifier(node: Identifier): boolean {
+        const { parent } = node;
+        switch (parent.kind) {
+            case SyntaxKind.PropertyAccessExpression:
+                return (parent as PropertyAccessExpression).name !== node;
+            case SyntaxKind.BindingElement:
+                return (parent as BindingElement).propertyName !== node;
+            case SyntaxKind.ImportSpecifier:
+                return (parent as ImportSpecifier).propertyName !== node;
+            default:
+                return true;
+        }
+    }
 }

src/services/codefixes/convertToEs6Module.ts

@@ -519,29 +519,6 @@ namespace ts.codefix {
         return map;
     }
 
-    /**
-     * A free identifier is an identifier that can be accessed through name lookup as a local variable.
-     * In the expression `x.y`, `x` is a free identifier, but `y` is not.
-     */
-    function forEachFreeIdentifier(node: Node, cb: (id: Identifier) => void): void {
-        if (isIdentifier(node) && isFreeIdentifier(node)) cb(node);
-        node.forEachChild(child => forEachFreeIdentifier(child, cb));
-    }
-
-    function isFreeIdentifier(node: Identifier): boolean {
-        const { parent } = node;
-        switch (parent.kind) {
-            case SyntaxKind.PropertyAccessExpression:
-                return (parent as PropertyAccessExpression).name !== node;
-            case SyntaxKind.BindingElement:
-                return (parent as BindingElement).propertyName !== node;
-            case SyntaxKind.ImportSpecifier:
-                return (parent as ImportSpecifier).propertyName !== node;
-            default:
-                return true;
-        }
-    }
-
     // Node helpers
 
     function functionExpressionToDeclaration(name: string | undefined, additionalModifiers: readonly Modifier[], fn: FunctionExpression | ArrowFunction | MethodDeclaration, useSitesToUnqualify: ESMap<Node, Node> | undefined): FunctionDeclaration {