Minor tweaks to naming

This commit is contained in:
Ron Buckton 2016-02-29 15:39:38 -08:00
parent 359875b67d
commit fe7ad5fde3
2 changed files with 20 additions and 10 deletions

View File

@ -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);
}
}

View File

@ -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) {