Merge pull request #13825 from Microsoft/publicNodeFactories

Make most current Node factory functions public

Author: rbuckton

src/compiler/emitter.ts

@@ -2565,7 +2565,7 @@ namespace ts {
                 // Node names generate unique names based on their original node
                 // and are cached based on that node's id.
                 const node = getNodeForGeneratedName(name);
-                return generateNameCached(node, getTextOfNode);
+                return generateNameCached(node);
             }
             else {
                 // Auto, Loop, and Unique names are cached based on their unique
@@ -2575,9 +2575,9 @@ namespace ts {
             }
         }
 
-        function generateNameCached(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+        function generateNameCached(node: Node) {
             const nodeId = getNodeId(node);
-            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node, getTextOfNode)));
+            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node)));
         }
 
         /**
@@ -2659,7 +2659,7 @@ namespace ts {
         /**
          * Generates a unique name for a ModuleDeclaration or EnumDeclaration.
          */
-        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
             const name = getTextOfNode(node.name);
             // Use module/enum name itself if it is unique, otherwise make a unique variation
             return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
@@ -2689,23 +2689,23 @@ namespace ts {
             return makeUniqueName("class");
         }
 
-        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration) {
             if (isIdentifier(node.name)) {
-                return generateNameCached(node.name, getTextOfNode);
+                return generateNameCached(node.name);
             }
             return makeTempVariableName(TempFlags.Auto);
         }
 
         /**
          * Generates a unique name from a node.
          */
-        function generateNameForNode(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string): string {
+        function generateNameForNode(node: Node): string {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
                     return makeUniqueName(getTextOfNode(node));
                 case SyntaxKind.ModuleDeclaration:
                 case SyntaxKind.EnumDeclaration:
-                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node, getTextOfNode);
+                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node);
                 case SyntaxKind.ImportDeclaration:
                 case SyntaxKind.ExportDeclaration:
                     return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
@@ -2718,7 +2718,7 @@ namespace ts {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
-                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node, getTextOfNode);
+                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node);
                 default:
                     return makeTempVariableName(TempFlags.Auto);
             }
@@ -2734,7 +2734,7 @@ namespace ts {
                 case GeneratedIdentifierKind.Loop:
                     return makeTempVariableName(TempFlags._i);
                 case GeneratedIdentifierKind.Unique:
-                    return makeUniqueName(name.text);
+                    return makeUniqueName(unescapeIdentifier(name.text));
             }
 
             Debug.fail("Unsupported GeneratedIdentifierKind.");