Minor tweaks to naming

rbuckton · rbuckton · commit fe7ad5fde3ec · 2016-02-29T15:39:38.000-08:00
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -153,7 +153,21 @@ namespace ts {
      * Creates a shallow, memberwise clone of a node for mutation.
      */
     export function getMutableNode<T extends Node>(node: T): T {
-        return cloneNode<T>(node, node, node.flags, node.parent, node);
+        return cloneNode(node, /*location*/ node, node.flags, /*parent*/ undefined, /*original*/ node);
+    }
+
+    /**
+     * Creates a shallow, memberwise clone of a node with no source map location.
+     */
+    export function getSynthesizedClone<T extends Node>(node: T): T {
+        return nodeIsSynthesized(node) ? node : cloneNode(node, /*location*/ undefined, node.flags, /*parent*/ undefined, /*original*/ node);
+    }
+
+    /**
+     * Creates a shallow, memberwise clone of a node at the specified source map location.
+     */
+    export function getRelocatedClone<T extends Node>(node: T, location: TextRange): T {
+        return cloneNode(node, location, node.flags, /*parent*/ undefined, /*original*/ node);
     }
 
     export function createNodeArrayNode<T extends Node>(elements: T[]): NodeArrayNode<T> {
@@ -1340,8 +1354,4 @@ namespace ts {
         node.flags = flags;
         return node;
     }
-
-    export function getSynthesizedNode<T extends Node>(node: T): T {
-        return nodeIsSynthesized(node) ? node : cloneNode(node, /*location*/ undefined, node.flags, /*parent*/ undefined, /*original*/ node);
-    }
 }
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -1644,7 +1644,7 @@ namespace ts {
                 return createLiteral(name.text);
             }
             else {
-                return getSynthesizedNode(name);
+                return getSynthesizedClone(name);
             }
         }
 
@@ -1813,7 +1813,7 @@ namespace ts {
             if (isNamespaceExport(node)) {
                 return createNodeArrayNode([
                     func,
-                    createNamespaceExport(getSynthesizedNode(node.name), getSynthesizedNode(node.name))
+                    createNamespaceExport(getSynthesizedClone(node.name), getSynthesizedClone(node.name))
                 ]);
             }
 
@@ -2420,7 +2420,7 @@ namespace ts {
                 // exports.${name} = ${moduleReference};
                 return setOriginalNode(
                     createNamespaceExport(
-                        getSynthesizedNode(node.name),
+                        getSynthesizedClone(node.name),
                         moduleReference,
                         node
                     ),
@@ -2520,14 +2520,14 @@ namespace ts {
         }
 
         function getNamespaceMemberName(name: Identifier): Expression {
-            name = getSynthesizedNode(name);
+            name = getSynthesizedClone(name);
             return currentNamespaceLocalName
                 ? createPropertyAccess(currentNamespaceLocalName, name)
                 : name;
         }
 
         function getDeclarationName(node: ClassExpression | ClassDeclaration | FunctionDeclaration) {
-            return node.name ? getSynthesizedNode(node.name) : getGeneratedNameForNode(node);
+            return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node);
         }
 
         function getClassPrototype(node: ClassExpression | ClassDeclaration) {

Original file line number	Diff line number	Diff line change
`@@ -1644,7 +1644,7 @@ namespace ts {`
`1644`	`1644`	`return createLiteral(name.text);`
`1645`	`1645`	`}`
`1646`	`1646`	`else {`
`1647`		`- return getSynthesizedNode(name);`
	`1647`	`+ return getSynthesizedClone(name);`
`1648`	`1648`	`}`
`1649`	`1649`	`}`
`1650`	`1650`
`@@ -1813,7 +1813,7 @@ namespace ts {`
`1813`	`1813`	`if (isNamespaceExport(node)) {`
`1814`	`1814`	`return createNodeArrayNode([`
`1815`	`1815`	`func,`
`1816`		`- createNamespaceExport(getSynthesizedNode(node.name), getSynthesizedNode(node.name))`
	`1816`	`+ createNamespaceExport(getSynthesizedClone(node.name), getSynthesizedClone(node.name))`
`1817`	`1817`	`]);`
`1818`	`1818`	`}`
`1819`	`1819`
`@@ -2420,7 +2420,7 @@ namespace ts {`
`2420`	`2420`	`// exports.${name} = ${moduleReference};`
`2421`	`2421`	`return setOriginalNode(`
`2422`	`2422`	`createNamespaceExport(`
`2423`		`- getSynthesizedNode(node.name),`
	`2423`	`+ getSynthesizedClone(node.name),`
`2424`	`2424`	`moduleReference,`
`2425`	`2425`	`node`
`2426`	`2426`	`),`
`@@ -2520,14 +2520,14 @@ namespace ts {`
`2520`	`2520`	`}`
`2521`	`2521`
`2522`	`2522`	`function getNamespaceMemberName(name: Identifier): Expression {`
`2523`		`- name = getSynthesizedNode(name);`
	`2523`	`+ name = getSynthesizedClone(name);`
`2524`	`2524`	`return currentNamespaceLocalName`
`2525`	`2525`	`? createPropertyAccess(currentNamespaceLocalName, name)`
`2526`	`2526`	`: name;`
`2527`	`2527`	`}`
`2528`	`2528`
`2529`	`2529`	`function getDeclarationName(node: ClassExpression \| ClassDeclaration \| FunctionDeclaration) {`
`2530`		`- return node.name ? getSynthesizedNode(node.name) : getGeneratedNameForNode(node);`
	`2530`	`+ return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node);`
`2531`	`2531`	`}`
`2532`	`2532`
`2533`	`2533`	`function getClassPrototype(node: ClassExpression \| ClassDeclaration) {`