Merge pull request #8068 from Microsoft/transform-function-and-import-conflict

[Transforms] Set LocalName flag for exported local then skip it
This commit is contained in:
Nathan Shively-Sanders 2016-04-13 14:18:13 -07:00
commit da72357562

View File

@ -553,7 +553,7 @@ namespace ts {
}
else {
statements.push(
createExportStatement(node.name, node.name, /*location*/ node)
createExportStatement(node.name, setNodeEmitFlags(getSynthesizedClone(node.name), NodeEmitFlags.LocalName), /*location*/ node)
);
}
}
@ -713,6 +713,10 @@ namespace ts {
}
function substituteExpressionIdentifier(node: Identifier): Expression {
if (getNodeEmitFlags(node) & NodeEmitFlags.LocalName) {
return node;
}
const container = resolver.getReferencedExportContainer(node, (getNodeEmitFlags(node) & NodeEmitFlags.ExportName) !== 0);
if (container) {
if (container.kind === SyntaxKind.SourceFile) {