From fe7ad5fde3ec24e8caeb7a5ed712119e5606d541 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 29 Feb 2016 15:39:38 -0800
Subject: [PATCH] Minor tweaks to naming

---
 src/compiler/factory.ts         | 20 +++++++++++++++-----
 src/compiler/transformers/ts.ts | 10 +++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index ef908c40a9b..0ad04c0a092 100644
--- 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);
-    }
 }
\ No newline at end of file
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index e672a0a79cd..b7a180aab92 100644
--- 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) {